diff options
| author | Manolo Gouy <Manolo> | 2016-03-24 06:25:18 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-03-24 06:25:18 +0000 |
| commit | f432c171129fc3657f50073adf87ed99276cb173 (patch) | |
| tree | 9db228e814245b524f39774a7c5dc7c473067f86 /src | |
| parent | 1778ee8831c00599b31390b61e687bd6b06bcb19 (diff) | |
Move platform-dependent stuff away from src/Fl.cxx
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11418 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl.cxx | 12 | ||||
| -rw-r--r-- | src/Fl_Sys_Menu_Bar.mm | 9 |
2 files changed, 9 insertions, 12 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx index ffee65687..a28aa91c2 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -175,18 +175,6 @@ bool Fl::cfg_sys_win32 = 0; const char* fl_local_shift = "\xe2\x87\xa7\\"; // U+21E7 (upwards white arrow) #endif -#if defined(__APPLE__) || defined(FL_DOXYGEN) // PORTME: Fl_Screen_Driver - platform text - // this should probably be part of Fl_Sys_Menubar -// Apple App Menu -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__ // PORTME: Fl_Screen_Driver - platform text, system menu - #ifndef FL_DOXYGEN Fl_Widget *Fl::belowmouse_, *Fl::pushed_, diff --git a/src/Fl_Sys_Menu_Bar.mm b/src/Fl_Sys_Menu_Bar.mm index 9a429963a..65141ffd8 100644 --- a/src/Fl_Sys_Menu_Bar.mm +++ b/src/Fl_Sys_Menu_Bar.mm @@ -73,6 +73,15 @@ typedef struct { BOOL use_rank; } sys_menu_item; +// Apple App Menu +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 %@"; + @interface FLMenuItem : NSMenuItem { } |