From fe367d13098a3d8730782d4f15fa6a727e4ae25d Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Thu, 3 Feb 2011 11:11:31 +0000 Subject: Moved the initializations of Fl_Mac_App_Menu class fields to file Fl.cxx for Doxygen use. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8364 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl.cxx | 9 +++++++++ src/Fl_cocoa.mm | 8 -------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/Fl.cxx b/src/Fl.cxx index b7331fd3a..56ddc5247 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -66,6 +66,15 @@ extern double fl_mac_flush_and_wait(double time_to_wait, char in_idle); // // Globals... // +#if defined(__APPLE__) || defined(FL_DOXYGEN) +const char *Fl_Mac_App_Menu::about = "About "; +const char *Fl_Mac_App_Menu::print = "Print Front Window"; +const char *Fl_Mac_App_Menu::services = "Services"; +const char *Fl_Mac_App_Menu::hide = "Hide "; +const char *Fl_Mac_App_Menu::hide_others = "Hide Others"; +const char *Fl_Mac_App_Menu::show = "Show All"; +const char *Fl_Mac_App_Menu::quit = "Quit "; +#endif // __APPLE__ #ifndef FL_DOXYGEN Fl_Widget *Fl::belowmouse_, *Fl::pushed_, diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 66c6373d9..49af5d67a 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -2805,14 +2805,6 @@ int Fl_X::screen_init(XRectangle screens[], float dpi[]) } @end -const char *Fl_Mac_App_Menu::about = "About "; -const char *Fl_Mac_App_Menu::print = "Print Front Window"; -const char *Fl_Mac_App_Menu::services = "Services"; -const char *Fl_Mac_App_Menu::hide = "Hide "; -const char *Fl_Mac_App_Menu::hide_others = "Hide Others"; -const char *Fl_Mac_App_Menu::show = "Show All"; -const char *Fl_Mac_App_Menu::quit = "Quit "; - static NSMenu *appleMenu; static void createAppleMenu(void) { -- cgit v1.2.3