mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simpler code to initialise the MacOS-specific implementation of Fl_Sys_Menu_Bar_Driver

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12585 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Manolo Gouy 2017-12-07 15:35:07 +00:00
parent dc569ef8fb
commit 2da4cf8b9f
3 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Fl_MacOS_Sys_Menu_Bar.mm
View File

@ -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>

2
src/Fl_Sys_Menu_Bar.cxx
View File

@ -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;}

2
src/Fl_cocoa.mm
View File

@ -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();
}