diff options
| author | Manolo Gouy <Manolo> | 2017-12-07 16:10:21 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2017-12-07 16:10:21 +0000 |
| commit | eb763ae432cbd68f7e86bf04837ed8cd7273213c (patch) | |
| tree | c59f2e48310710f4b312b13ab202fcacbe01e640 | |
| parent | 2da4cf8b9fbaa72af16f4073b6763f01f4a31027 (diff) | |
Further 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@12586 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | FL/Fl_Sys_Menu_Bar_Driver.H | 1 | ||||
| -rw-r--r-- | src/Fl_MacOS_Sys_Menu_Bar.mm | 2 | ||||
| -rw-r--r-- | src/Fl_cocoa.mm | 2 | ||||
| -rw-r--r-- | src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/FL/Fl_Sys_Menu_Bar_Driver.H b/FL/Fl_Sys_Menu_Bar_Driver.H index a1adbd953..1a2dfac25 100644 --- a/FL/Fl_Sys_Menu_Bar_Driver.H +++ b/FL/Fl_Sys_Menu_Bar_Driver.H @@ -47,7 +47,6 @@ public: virtual void mode(int i, int fl) { bar->Fl_Menu_Bar::mode(i, fl); } static Fl_Sys_Menu_Bar_Driver *driver_; // to be assigned with a unique object of this class or of a derived class - static Fl_Sys_Menu_Bar_Driver* new_driver(); }; diff --git a/src/Fl_MacOS_Sys_Menu_Bar.mm b/src/Fl_MacOS_Sys_Menu_Bar.mm index 5292ff815..9dec537bb 100644 --- a/src/Fl_MacOS_Sys_Menu_Bar.mm +++ b/src/Fl_MacOS_Sys_Menu_Bar.mm @@ -23,7 +23,7 @@ #include "drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H" -Fl_MacOS_Sys_Menu_Bar_Driver* Fl_MacOS_Sys_Menu_Bar_Driver::new_driver() { +Fl_Sys_Menu_Bar_Driver* Fl_MacOS_Sys_Menu_Bar_Driver::driver() { static Fl_MacOS_Sys_Menu_Bar_Driver *once = new Fl_MacOS_Sys_Menu_Bar_Driver(); if (driver_ != once) { if (driver_) { diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 5092fc777..c19784f7e 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -3849,7 +3849,7 @@ static void createAppleMenu(void) [mainmenu release]; [appleMenu release]; [menuItem release]; - Fl_MacOS_Sys_Menu_Bar_Driver::new_driver(); + Fl_MacOS_Sys_Menu_Bar_Driver::driver(); } diff --git a/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H b/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H index 9ea966a79..b2a6f125b 100644 --- a/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H +++ b/src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H @@ -39,7 +39,7 @@ public: virtual void remove(int index); virtual void replace(int index, const char *name); virtual void mode(int i, int fl); - static Fl_MacOS_Sys_Menu_Bar_Driver* new_driver(); + static Fl_Sys_Menu_Bar_Driver* driver(); }; |