Author: manolo
Date: 2012-01-12 08:07:08 -0800 (Thu, 12 Jan 2012)
New Revision: 9224
Log:
Fixed the use of FL_SUBMENU_POINTER in Fl_Sys_Menu_Bar objects (cont'd).
Modified:
branches/branch-3.0/include/fltk3/SysMenuBar.h
branches/branch-3.0/src/fltk3/SysMenuBar.cxx
branches/branch-3.0/src/fltk3/cocoa.mm
Modified: branches/branch-3.0/include/fltk3/SysMenuBar.h
===================================================================
--- branches/branch-3.0/include/fltk3/SysMenuBar.h 2012-01-12 16:00:07 UTC
(rev 9223)
+++ branches/branch-3.0/include/fltk3/SysMenuBar.h 2012-01-12 16:07:08 UTC
(rev 9224)
@@ -73,7 +73,7 @@
int clear_submenu(int index);
#if ! defined(FLTK3_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 F|_cocoa.mm because it
contains objective-c code
static void *doMenuOrItemOperation( menuOrItemOperation operation, ...);
#endif
Modified: branches/branch-3.0/src/fltk3/SysMenuBar.cxx
===================================================================
--- branches/branch-3.0/src/fltk3/SysMenuBar.cxx 2012-01-12 16:00:07 UTC
(rev 9223)
+++ branches/branch-3.0/src/fltk3/SysMenuBar.cxx 2012-01-12 16:07:08 UTC
(rev 9224)
@@ -270,8 +270,8 @@
*/
void fltk3::SysMenuBar::replace(int rank, const char *name)
{
- doMenuOrItemOperation(renameItem, rank, name);
- fltk3::sys_menu_bar->fltk3::Menu_::replace(rank, name);
+ fltk3::Menu_::replace(rank, name);
+ convertToMenuBar(fltk3::Menu_::menu());
}
Modified: branches/branch-3.0/src/fltk3/cocoa.mm
===================================================================
--- branches/branch-3.0/src/fltk3/cocoa.mm 2012-01-12 16:00:07 UTC (rev
9223)
+++ branches/branch-3.0/src/fltk3/cocoa.mm 2012-01-12 16:07:08 UTC (rev
9224)
@@ -3148,28 +3148,6 @@
if (prank != NULL) *prank = [menu indexOfItem:item];
[item release];
}
- else if (operation == fltk3::SysMenuBar::renameItem) { //
arguments: int rank, const char *newname
- // renames the system menu item numbered rank in
fltk3::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
