From eb763ae432cbd68f7e86bf04837ed8cd7273213c Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Thu, 7 Dec 2017 16:10:21 +0000
Subject: 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
---
 src/Fl_MacOS_Sys_Menu_Bar.mm                     | 2 +-
 src/Fl_cocoa.mm                                  | 2 +-
 src/drivers/Cocoa/Fl_MacOS_Sys_Menu_Bar_Driver.H | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src')

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();
 };
 
 
-- 
cgit v1.2.3