From c468a521b012b87914030a45f0fdced1be87de67 Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Wed, 14 Jun 2006 10:48:36 +0000 Subject: STR #1321: Calling Fl_Window::show() will exit from the current Fl_Tooltip. Changing window order or creating a new window is a pretty major action, so temporarily disabeling Tooltips seems beneficial. This avoids Tooltips interfering with popup menus. Of course, poping up a tooltip window does *not* disable further tooltips... . git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5200 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_mac.cxx | 2 ++ src/Fl_win32.cxx | 2 ++ src/Fl_x.cxx | 2 ++ 3 files changed, 6 insertions(+) (limited to 'src') diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx index 0a667a461..a943fd46f 100644 --- a/src/Fl_mac.cxx +++ b/src/Fl_mac.cxx @@ -56,6 +56,7 @@ extern "C" { #include #include #include +#include #include #include #include @@ -1972,6 +1973,7 @@ void Fl_Window::show() { } else { labeltype(FL_NO_LABEL); } + Fl_Tooltip::exit_(this); if (!shown() || !i) { Fl_X::make(this); } else { diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 6e380eb6f..3725b8dd7 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -33,6 +33,7 @@ #include #include #include +#include #include "flstring.h" #include "Fl_Font.H" #include @@ -1512,6 +1513,7 @@ void Fl_Window::show() { } else { labeltype(FL_NO_LABEL); } + Fl_Tooltip::exit_(this); if (!shown()) { // if (can_boxcheat(box())) fl_background_pixel = fl_xpixel(color()); Fl_X::make(this); diff --git a/src/Fl_x.cxx b/src/Fl_x.cxx index d7c909e32..b33c8bbb9 100644 --- a/src/Fl_x.cxx +++ b/src/Fl_x.cxx @@ -38,6 +38,7 @@ # include # include # include +# include # include # include # include "flstring.h" @@ -1329,6 +1330,7 @@ void Fl_Window::show() { } else { labeltype(FL_NO_LABEL); } + Fl_Tooltip::exit_(this); if (!shown()) { fl_open_display(); if (can_boxcheat(box())) fl_background_pixel = int(fl_xpixel(color())); -- cgit v1.2.3