3 files changed, 7 insertions, 7 deletions
diff --git a/src/Fl_Tooltip.cxx b/src/Fl_Tooltip.cxx
index 26a2496eb..2d88182fe 100644
--- a/src/Fl_Tooltip.cxx
+++ b/src/Fl_Tooltip.cxx
@@ -19,6 +19,8 @@
 #include <FL/Fl_Tooltip.H>
 #include <FL/fl_draw.H>
 #include <FL/Fl_Menu_Window.H>
+#include <FL/Fl.H>
+#include <FL/Fl_System_Driver.H>
 
 #include <stdio.h>
 #include <string.h>	// strdup()
@@ -151,9 +153,8 @@ static void tooltip_timeout(void*) {
       if (window) window->hide();
     } else {
       int condition = 1;
-#if !(defined(__APPLE__) || defined(WIN32)) // bugfix: no need to refactor
-      condition = (Fl::grab() == NULL);
-#endif
+// bugfix: no need to refactor
+      if (Fl::system_driver()->use_tooltip_timeout_condition()) condition = (Fl::grab() == NULL);
       if ( condition ) {
 	if (!window) window = new Fl_TooltipBox;
 	// this cast bypasses the normal Fl_Window label() code:
@@ -287,12 +288,9 @@ void Fl_Tooltip::enter_area(Fl_Widget* wid, int x,int y,int w,int h, const char*
   if (recent_tooltip) {
     if (window) window->hide();
     Fl::add_timeout(Fl_Tooltip::hoverdelay(), tooltip_timeout);
-  } else if (Fl_Tooltip::delay() < .1) {
-#ifdef WIN32
     // possible fix for the Windows titlebar, it seems to want the
     // window to be destroyed, moving it messes up the parenting:
-    if (window && window->visible()) window->hide();
-#endif // WIN32
+    if (Fl::system_driver()->use_recent_tooltip_fix() && window && window->visible()) window->hide();
     tooltip_timeout(0);
   } else {
     if (window && window->visible()) window->hide();
diff --git a/src/drivers/Posix/Fl_Posix_System_Driver.H b/src/drivers/Posix/Fl_Posix_System_Driver.H
index 7f95ede63..de7ab085f 100644
--- a/src/drivers/Posix/Fl_Posix_System_Driver.H
+++ b/src/drivers/Posix/Fl_Posix_System_Driver.H
@@ -72,6 +72,7 @@ public:
   virtual int need_menu_handle_part2() {return 1;}
   virtual int need_menu_handle_part1_extra() {return 1;}
   virtual int open_uri(const char *uri, char *msg, int msglen);
+  virtual int use_tooltip_timeout_condition() {return 1;}
 };
 
 #endif // FL_POSIX_SYSTEM_DRIVER_H
diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H
index 6079b0721..7d99c4548 100644
--- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H
+++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H
@@ -76,6 +76,7 @@ public:
   virtual int filename_isdir_quick(const char* n);
   virtual const char *filename_ext(const char *buf);
   virtual int open_uri(const char *uri, char *msg, int msglen);
+  virtual int use_recent_tooltip_fix() {return 1;}
 };
 
 #endif // FL_WINAPI_SYSTEM_DRIVER_H