Author: manolo
Date: 2012-01-12 08:00:07 -0800 (Thu, 12 Jan 2012)
New Revision: 9223
Log:
Fixed the use of FL_SUBMENU_POINTER in Fl_Sys_Menu_Bar objects (cont'd).
Modified:
branches/branch-1.3/FL/Fl_Sys_Menu_Bar.H
branches/branch-1.3/src/Fl_Sys_Menu_Bar.cxx
branches/branch-1.3/src/Fl_cocoa.mm
Modified: branches/branch-1.3/FL/Fl_Sys_Menu_Bar.H
===================================================================
--- branches/branch-1.3/FL/Fl_Sys_Menu_Bar.H 2012-01-12 13:17:55 UTC (rev
9222)
+++ branches/branch-1.3/FL/Fl_Sys_Menu_Bar.H 2012-01-12 16:00:07 UTC (rev
9223)
@@ -52,7 +52,7 @@
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
Modified: branches/branch-1.3/src/Fl_Sys_Menu_Bar.cxx
===================================================================
--- branches/branch-1.3/src/Fl_Sys_Menu_Bar.cxx 2012-01-12 13:17:55 UTC (rev
9222)
+++ branches/branch-1.3/src/Fl_Sys_Menu_Bar.cxx 2012-01-12 16:00:07 UTC (rev
9223)
@@ -261,8 +261,8 @@
*/
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::draw() {
}
-extern class Fl_Sys_Menu_Bar *fl_sys_menu_bar;
-
-
#endif /* __APPLE__ */
//
Modified: branches/branch-1.3/src/Fl_cocoa.mm
===================================================================
--- branches/branch-1.3/src/Fl_cocoa.mm 2012-01-12 13:17:55 UTC (rev 9222)
+++ branches/branch-1.3/src/Fl_cocoa.mm 2012-01-12 16:00:07 UTC (rev 9223)
@@ -3151,28 +3151,6 @@
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;
_______________________________________________
fltk-commit mailing list
[email protected]
http://lists.easysw.com/mailman/listinfo/fltk-commit
