From fe286dfe7b0ae6827942d40586906431c1d97287 Mon Sep 17 00:00:00 2001 From: Michael R Sweet Date: Fri, 25 Nov 2005 14:50:22 +0000 Subject: OSX fixes... src/Fl.cxx: - Don't compile in static functions that aren't used. src/Fl_mac.cxx: - Coding style... src/Fl_Sys_Menu_Bar.cxx: - Fix FL_META handling - FL_META incorrectly set the CTRL modifier, and it was not possible to get all combos of modifiers. The new coding should work properly for all combos... git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4651 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/Fl.cxx') diff --git a/src/Fl.cxx b/src/Fl.cxx index b822e2d7a..502f1d7ad 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -352,6 +352,7 @@ 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 @@ -366,6 +367,9 @@ static void run_checks() } } +static char in_idle; +#endif // !__APPLE__ + //////////////////////////////////////////////////////////////// // wait/run/check/ready: @@ -374,8 +378,6 @@ void (*Fl::idle)(); // see Fl_add_idle.cxx for the add/remove functions extern int fl_ready(); // in Fl_.cxx extern int fl_wait(double time); // in Fl_.cxx -static char in_idle; - double Fl::wait(double time_to_wait) { // delete all widgets that were listed during callbacks do_widget_deletion(); -- cgit v1.2.3