From 45dba505156e3c6d0050cf180e0ecbab34e873b2 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Wed, 30 Mar 2011 08:53:07 +0000 Subject: Removed global variable appleMenu. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8547 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/Fl_cocoa.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index 9b4b4e304..d64538a01 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -2843,13 +2843,12 @@ int Fl_X::screen_init(XRectangle screens[], float dpi[]) } @end -static NSMenu *appleMenu; static void createAppleMenu(void) { static BOOL donethat = NO; if (donethat) return; donethat = YES; - NSMenu *mainmenu, *services; + NSMenu *mainmenu, *services, *appleMenu; NSMenuItem *menuItem; NSString *title; @@ -2972,6 +2971,7 @@ void fl_mac_set_about( Fl_Callback *cb, void *user_data, int shortcut) aboutItem.callback(cb); aboutItem.user_data(user_data); aboutItem.shortcut(shortcut); + NSMenu *appleMenu = [[(NSMenu*)fl_system_menu itemAtIndex:0] submenu]; CFStringRef cfname = CFStringCreateCopy(NULL, (CFStringRef)[[appleMenu itemAtIndex:0] title]); [appleMenu removeItemAtIndex:0]; FLMenuItem *item = [[[FLMenuItem alloc] initWithTitle:(NSString*)cfname -- cgit v1.2.3