Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix window menu on macOS

Browse Source 
the window menu was potentially added multiple times and could have multiple copies of the active window

closes https://github.com/wxWidgets/wxWidgets/pull/917 , thanks to @hwiesmann
This commit is contained in:
Stefan Csomor
2018-09-04 19:57:48 +02:00
parent cd915a63fa
commit ccff3e43fc
1 changed files with 34 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/osx/cocoa/menu.mm
View File

@@ -232,26 +232,25 @@ public :
virtual NSMenu* MacCreateOrFindWindowMenu()
{
wxMenu* peer = GetWXPeer();
wxString windowMenuTitle = wxStripMenuCodes(_("&Window"));
NSString* nsWindowMenuTitle = wxNSStringWithWxString(wxStripMenuCodes(wxApp::s_macWindowMenuTitleName));
NSString* nsAlternateWindowMenuTitle = wxNSStringWithWxString(wxStripMenuCodes(_("&Window")));
NSMenu* windowMenu = nil;
int windowmenuid = peer->FindItem(wxApp::s_macWindowMenuTitleName);
if ( windowmenuid == wxNOT_FOUND )
windowmenuid = peer->FindItem(_("&Window"));
if ( windowmenuid != wxNOT_FOUND )
for (NSMenuItem* topmenu in [m_osxMenu itemArray])
{
wxMenuItem* windowMenuItem = peer->FindItem(windowmenuid);
if ( windowMenuItem->IsSubMenu() )
windowMenu = windowMenuItem->GetSubMenu()->GetHMenu();
if ([[topmenu title] isEqualToString:nsWindowMenuTitle] ||
[[topmenu title] isEqualToString:nsAlternateWindowMenuTitle])
{
windowMenu = [topmenu submenu];
break;
}
}
if ( windowMenu == nil )
{
windowMenu = [[NSMenu alloc] initWithTitle:wxNSStringWithWxString(windowMenuTitle)];
NSMenuItem* windowMenuItem = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(windowMenuTitle) action:nil keyEquivalent:@""];
windowMenu = [[NSMenu alloc] initWithTitle:nsWindowMenuTitle];
NSMenuItem* windowMenuItem = [[NSMenuItem alloc] initWithTitle:nsWindowMenuTitle action:nil keyEquivalent:@""];
[windowMenuItem setSubmenu:windowMenu];
[windowMenu release];
[m_osxMenu addItem:windowMenuItem];
@@ -265,31 +264,27 @@ public :
{
NSMenu* windowMenu = MacCreateOrFindWindowMenu();
NSMenuItem* item = nil;
bool menuWasEmpty = [windowMenu numberOfItems] == 0;
if ( !menuWasEmpty )
item = [windowMenu itemAtIndex:0];
if ( item == nil || [item action] != @selector(performMiniaturize:) )
{
item = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(_("Minimize")) action:@selector(performMiniaturize:) keyEquivalent:@"m"];
[windowMenu insertItem:item atIndex:0];
[item setEnabled:YES];
[item release];
item = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(_("Zoom")) action:@selector(performZoom:) keyEquivalent:@""];
[windowMenu insertItem:item atIndex:1];
[item release];
[windowMenu insertItem:[NSMenuItem separatorItem] atIndex:2];
item = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(_("Bring All to Front")) action:@selector(arrangeInFront:) keyEquivalent:@""];
[windowMenu insertItem:item atIndex:3];
[item release];
if ( !menuWasEmpty )
[windowMenu insertItem:[NSMenuItem separatorItem] atIndex:4];
}
// all items have to be removed to prevent that multiple identical menu items
// exist because NSApp.setWindowsMenu will add some stuff regardless if it
// already exists or not
[windowMenu removeAllItems];
item = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(_("Minimize")) action:@selector(performMiniaturize:) keyEquivalent:@"m"];
[windowMenu insertItem:item atIndex:0];
[item setEnabled:YES];
[item release];
item = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(_("Zoom")) action:@selector(performZoom:) keyEquivalent:@""];
[windowMenu insertItem:item atIndex:1];
[item release];
[windowMenu insertItem:[NSMenuItem separatorItem] atIndex:2];
item = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(_("Bring All to Front")) action:@selector(arrangeInFront:) keyEquivalent:@""];
[windowMenu insertItem:item atIndex:3];
[item release];
[NSApp setWindowsMenu:windowMenu];
}
}