diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-11-25 14:50:22 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-11-25 14:50:22 +0000 |
| commit | fe286dfe7b0ae6827942d40586906431c1d97287 (patch) | |
| tree | bf7ed3b5c9ac2b1f9c46b9ac670a33455310b6f5 /src/Fl.cxx | |
| parent | 2a4b7134970f80d41557f6be45bd76a42a01d9d4 (diff) | |
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
Diffstat (limited to 'src/Fl.cxx')
| -rw-r--r-- | src/Fl.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
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_<platform>.cxx extern int fl_wait(double time); // in Fl_<platform>.cxx -static char in_idle; - double Fl::wait(double time_to_wait) { // delete all widgets that were listed during callbacks do_widget_deletion(); |
