diff options
| -rw-r--r-- | FL/Fl_Sys_Menu_Bar.H | 2 | ||||
| -rw-r--r-- | src/Fl_Sys_Menu_Bar.cxx | 7 | ||||
| -rw-r--r-- | src/Fl_cocoa.mm | 22 |
3 files changed, 3 insertions, 28 deletions
diff --git a/FL/Fl_Sys_Menu_Bar.H b/FL/Fl_Sys_Menu_Bar.H index fabecb16d..f329915b5 100644 --- a/FL/Fl_Sys_Menu_Bar.H +++ b/FL/Fl_Sys_Menu_Bar.H @@ -52,7 +52,7 @@ public: int clear_submenu(int index); #if ! defined(FL_DOXYGEN) enum menuOrItemOperation { itemAtIndex, setKeyEquivalent, setKeyEquivalentModifierMask, setState, initWithTitle, - numberOfItems, setSubmenu, setEnabled, addSeparatorItem, setTitle, removeItem, addNewItem, renameItem }; + numberOfItems, setSubmenu, setEnabled, addSeparatorItem, setTitle, removeItem, addNewItem }; // function doMenuOrItemOperation is in file Fl_cocoa.mm because it contains objective-c code static void *doMenuOrItemOperation( menuOrItemOperation operation, ...); #endif 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; |