From b8d34a254fd77bb9f2920f5635e0fa017b23ae11 Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Thu, 12 Jan 2012 16:00:07 +0000
Subject: Fixed the use of FL_SUBMENU_POINTER in Fl_Sys_Menu_Bar objects
 (cont'd).

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@9223 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_Sys_Menu_Bar.cxx |  7 ++-----
 src/Fl_cocoa.mm         | 22 ----------------------
 2 files changed, 2 insertions(+), 27 deletions(-)

(limited to 'src')

diff --git a/src/Fl_Sys_Menu_Bar.cxx b/src/Fl_Sys_Menu_Bar.cxx
index 2ec0ec20c..7a161cbc2 100644
--- a/src/Fl_Sys_Menu_Bar.cxx
+++ b/src/Fl_Sys_Menu_Bar.cxx
@@ -261,8 +261,8 @@ void Fl_Sys_Menu_Bar::remove(int rank)
  */
 void Fl_Sys_Menu_Bar::replace(int rank, const char *name)
 {
-  doMenuOrItemOperation(renameItem, rank, name);
-  fl_sys_menu_bar->Fl_Menu_::replace(rank, name);
+  Fl_Menu_::replace(rank, name);
+  convertToMenuBar(Fl_Menu_::menu());
 }
 
 
@@ -273,9 +273,6 @@ void Fl_Sys_Menu_Bar::replace(int rank, const char *name)
 void Fl_Sys_Menu_Bar::draw() {
 }
 
-extern class Fl_Sys_Menu_Bar *fl_sys_menu_bar;
-
-
 #endif /* __APPLE__ */
 
 //
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 3aff1005f..a497ce9ab 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -3151,28 +3151,6 @@ void *Fl_Sys_Menu_Bar::doMenuOrItemOperation(Fl_Sys_Menu_Bar::menuOrItemOperatio
     if (prank != NULL) *prank = [menu indexOfItem:item];
     [item release];
   }
-  else if (operation == Fl_Sys_Menu_Bar::renameItem) {		// arguments: int rank, const char *newname
-    // renames the system menu item numbered rank in fl_sys_menu_bar->menu()
-    int rank = va_arg(ap, int);
-    char *newname = remove_ampersand( va_arg(ap, const char *) );
-    int countmenus = [[NSApp mainMenu] numberOfItems];
-    bool found = NO;
-    NSMenuItem *macitem = 0;
-    for(int i = 1; (!found) && i < countmenus; i++) {
-      NSMenuItem *item = [[NSApp mainMenu] itemAtIndex:i];
-      NSMenu *submenu = [item submenu];
-      if (submenu == nil) continue;
-      int countitems = [submenu numberOfItems];
-      for(int j = 0; j < countitems; j++) {
-	macitem = [submenu itemAtIndex:j];
-	if ([macitem tag] == rank) { found = YES; break; }
-      }
-    }
-    if (found) {
-      [macitem setTitle:[[[NSString alloc] initWithUTF8String:newname] autorelease]];
-    }
-    free(newname);
-  }
   va_end(ap);
   [localPool release];
   return retval;
-- 
cgit v1.2.3