Skip to content

Commit

Permalink
using wx translations for window menu
Browse files Browse the repository at this point in the history
  • Loading branch information
csomor committed Feb 28, 2018
1 parent 0fc5301 commit c4a4d95
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions src/osx/cocoa/menu.mm
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,7 @@ virtual void MacSetupHelpMenu()
virtual NSMenu* MacCreateOrFindWindowMenu()
{
wxMenu* peer = GetWXPeer();
wxString windowMenuTitle = wxStripMenuCodes(_("&Window"));

NSMenu* windowMenu = nil;
int windowmenuid = peer->FindItem(wxApp::s_macWindowMenuTitleName);
Expand All @@ -249,8 +250,8 @@ virtual void MacSetupHelpMenu()

if ( windowMenu == nil )
{
windowMenu = [[NSMenu alloc] initWithTitle:@"Window"];
NSMenuItem* windowMenuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""];
windowMenu = [[NSMenu alloc] initWithTitle:wxNSStringWithWxString(windowMenuTitle)];
NSMenuItem* windowMenuItem = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(windowMenuTitle) action:nil keyEquivalent:@""];
[windowMenuItem setSubmenu:windowMenu];
[windowMenu release];
[m_osxMenu addItem:windowMenuItem];
Expand All @@ -270,18 +271,18 @@ virtual void MacSetupWindowMenu()

if ( item == nil || [item action] != @selector(performMiniaturize:) )
{
item = [[NSMenuItem alloc] initWithTitle:@"Minimize" action:@selector(performMiniaturize:) keyEquivalent:@"m"];
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:@"Zoom" action:@selector(performZoom:) keyEquivalent:@""];
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:@"Bring All to Front" action:@selector(arrangeInFront:) keyEquivalent:@""];
item = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(_("Bring All to Front")) action:@selector(arrangeInFront:) keyEquivalent:@""];
[windowMenu insertItem:item atIndex:3];
[item release];

Expand Down

0 comments on commit c4a4d95

Please sign in to comment.