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

using wx translations for window menu

Browse Source
This commit is contained in:
Stefan Csomor
2018-02-28 21:09:41 +01:00
parent 0fc53016a9
commit c4a4d95ad1
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -233,6 +233,7 @@ public :
virtual NSMenu* MacCreateOrFindWindowMenu() virtual NSMenu* MacCreateOrFindWindowMenu()
{ {
wxMenu* peer = GetWXPeer(); wxMenu* peer = GetWXPeer();
wxString windowMenuTitle = wxStripMenuCodes(_("&Window"));
NSMenu* windowMenu = nil; NSMenu* windowMenu = nil;
int windowmenuid = peer->FindItem(wxApp::s_macWindowMenuTitleName); int windowmenuid = peer->FindItem(wxApp::s_macWindowMenuTitleName);
@@ -249,8 +250,8 @@ public :
if ( windowMenu == nil ) if ( windowMenu == nil )
{ {
windowMenu = [[NSMenu alloc] initWithTitle:@"Window"]; windowMenu = [[NSMenu alloc] initWithTitle:wxNSStringWithWxString(windowMenuTitle)];
NSMenuItem* windowMenuItem = [[NSMenuItem alloc] initWithTitle:@"Window" action:nil keyEquivalent:@""]; NSMenuItem* windowMenuItem = [[NSMenuItem alloc] initWithTitle:wxNSStringWithWxString(windowMenuTitle) action:nil keyEquivalent:@""];
[windowMenuItem setSubmenu:windowMenu]; [windowMenuItem setSubmenu:windowMenu];
[windowMenu release]; [windowMenu release];
[m_osxMenu addItem:windowMenuItem]; [m_osxMenu addItem:windowMenuItem];
@@ -270,18 +271,18 @@ public :
if ( item == nil || [item action] != @selector(performMiniaturize:) ) 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]; [windowMenu insertItem:item atIndex:0];
[item setEnabled:YES]; [item setEnabled:YES];
[item release]; [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]; [windowMenu insertItem:item atIndex:1];
[item release]; [item release];
[windowMenu insertItem:[NSMenuItem separatorItem] atIndex:2]; [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]; [windowMenu insertItem:item atIndex:3];
[item release]; [item release];