summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGES1
-rw-r--r--src/Fl.cxx5
-rw-r--r--src/Fl_mac.cxx1
3 files changed, 3 insertions, 4 deletions
diff --git a/CHANGES b/CHANGES
index 6e5846149..4fd6d89d7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,6 @@
CHANGES IN FLTK 1.1.8
+ - enabled "add_check()" on OS X (STR #1534)
- Documented tooltip inheritance (STR #1467)
- Better event mouse handling fixing detached menus and
sticky tooltips (STR #1463, STR #449)
diff --git a/src/Fl.cxx b/src/Fl.cxx
index 15a7049ad..d17f64823 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -260,7 +260,6 @@ void Fl::remove_check(Fl_Timeout_Handler cb, void *argp) {
}
}
-#if !defined(__APPLE__)
static void run_checks()
{
// checks are a bit messy so that add/remove and wait may be called
@@ -274,7 +273,6 @@ static void run_checks()
next_check = first_check;
}
}
-#endif // !__APPLE__
#ifndef WIN32
static char in_idle;
@@ -298,7 +296,7 @@ double Fl::wait(double time_to_wait) {
#elif defined(__APPLE__)
- flush();
+ run_checks();
if (idle) {
if (!in_idle) {
in_idle = 1;
@@ -308,6 +306,7 @@ double Fl::wait(double time_to_wait) {
// the idle function may turn off idle, we can then wait:
if (idle) time_to_wait = 0.0;
}
+ flush();
return fl_wait(time_to_wait);
#else
diff --git a/src/Fl_mac.cxx b/src/Fl_mac.cxx
index 8f21001f3..dc3782944 100644
--- a/src/Fl_mac.cxx
+++ b/src/Fl_mac.cxx
@@ -54,7 +54,6 @@ extern "C" {
#include <config.h>
#include <FL/Fl.H>
#include <FL/x.H>
-#include <FL/Fl_Tooltip.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Tooltip.H>
#include <FL/Fl_Sys_Menu_Bar.H>