From d7cc67d2f192683a450c9732eb00670bbcd23f48 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Sat, 18 Jan 2014 16:28:59 +0000 Subject: Mac OS: put idle processing under an alloc/release pair of an NSAutoreleasePool. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@10066 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl.cxx | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) (limited to 'src/Fl.cxx') diff --git a/src/Fl.cxx b/src/Fl.cxx index 268232309..fcb16555d 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -67,7 +67,7 @@ void fl_cleanup_pens(void); void fl_release_dc(HWND,HDC); void fl_cleanup_dc_list(void); #elif defined(__APPLE__) -extern double fl_mac_flush_and_wait(double time_to_wait, char in_idle); +extern double fl_mac_flush_and_wait(double time_to_wait); #endif // WIN32 // @@ -430,7 +430,7 @@ static void run_checks() } } -#ifndef WIN32 +#if !defined(WIN32) && !defined(__APPLE__) static char in_idle; #endif @@ -520,16 +520,7 @@ double Fl::wait(double time_to_wait) { #elif defined(__APPLE__) run_checks(); - if (idle) { - if (!in_idle) { - in_idle = 1; - idle(); - in_idle = 0; - } - // the idle function may turn off idle, we can then wait: - if (idle) time_to_wait = 0.0; - } - return fl_mac_flush_and_wait(time_to_wait, in_idle); + return fl_mac_flush_and_wait(time_to_wait); #else -- cgit v1.2.3