diff options
| author | Manolo Gouy <Manolo> | 2017-12-07 15:35:07 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2017-12-07 15:35:07 +0000 |
| commit | 2da4cf8b9fbaa72af16f4073b6763f01f4a31027 (patch) | |
| tree | e2c6226ecf444b190c6e759e918d91cfd7882188 /src | |
| parent | dc569ef8fbc488edae442ac7504ce04dcdcf72c3 (diff) | |
Simpler code to initialise the MacOS-specific implementation of Fl_Sys_Menu_Bar_Driver
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12585 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_MacOS_Sys_Menu_Bar.mm | 4 | ||||
| -rw-r--r-- | src/Fl_Sys_Menu_Bar.cxx | 2 | ||||
| -rw-r--r-- | src/Fl_cocoa.mm | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/Fl_MacOS_Sys_Menu_Bar.mm b/src/Fl_MacOS_Sys_Menu_Bar.mm index 3dc030cbc..5292ff815 100644 --- a/src/Fl_MacOS_Sys_Menu_Bar.mm +++ b/src/Fl_MacOS_Sys_Menu_Bar.mm @@ -36,10 +36,6 @@ Fl_MacOS_Sys_Menu_Bar_Driver* Fl_MacOS_Sys_Menu_Bar_Driver::new_driver() { return once; } -// this runs once if this source file is linked in, and initializes the -// static variable Fl_Sys_Menu_Bar_Driver::driver_ with an object of class Fl_MacOS_Sys_Menu_Bar_Driver -static Fl_MacOS_Sys_Menu_Bar_Driver *unused = Fl_MacOS_Sys_Menu_Bar_Driver::new_driver(); - #import <Cocoa/Cocoa.h> diff --git a/src/Fl_Sys_Menu_Bar.cxx b/src/Fl_Sys_Menu_Bar.cxx index 6c967f01c..6c4ee9a51 100644 --- a/src/Fl_Sys_Menu_Bar.cxx +++ b/src/Fl_Sys_Menu_Bar.cxx @@ -181,7 +181,7 @@ Fl_Sys_Menu_Bar_Driver *Fl_Sys_Menu_Bar::driver() { return Fl_Sys_Menu_Bar_Driver::driver_; } -Fl_Sys_Menu_Bar_Driver *Fl_Sys_Menu_Bar_Driver::driver_ = Fl_Sys_Menu_Bar::driver(); +Fl_Sys_Menu_Bar_Driver *Fl_Sys_Menu_Bar_Driver::driver_ = 0; Fl_Sys_Menu_Bar_Driver::Fl_Sys_Menu_Bar_Driver() {bar = NULL;} diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 510ed40b2..5092fc777 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -2908,7 +2908,6 @@ Fl_X* Fl_Cocoa_Window_Driver::makeWindow() fl_open_display(); NSInteger winlevel = NSNormalWindowLevel; NSUInteger winstyle; - Fl_MacOS_Sys_Menu_Bar_Driver::new_driver(); // useful if run in a static initializer Fl_Window* w = pWindow; if (w->parent()) { w->border(0); @@ -3850,6 +3849,7 @@ static void createAppleMenu(void) [mainmenu release]; [appleMenu release]; [menuItem release]; + Fl_MacOS_Sys_Menu_Bar_Driver::new_driver(); } |