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

Backport r75319: support for localized help menus

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@75332 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2013-12-02 17:45:47 +00:00
parent f9450029bc
commit 1ee3437ac6
1 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -140,6 +140,9 @@
@interface NSApplication(MissingAppleMenuCall) @interface NSApplication(MissingAppleMenuCall)
- (void)setAppleMenu:(NSMenu *)menu; - (void)setAppleMenu:(NSMenu *)menu;
#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
- (void)setHelpMenu:(NSMenu* )menu;
#endif
@end @end
class wxMenuCocoaImpl : public wxMenuImpl class wxMenuCocoaImpl : public wxMenuImpl
@@ -192,12 +195,35 @@ public :
virtual void MakeRoot() virtual void MakeRoot()
{ {
wxMenu* peer = GetWXPeer();
[NSApp setMainMenu:m_osxMenu]; [NSApp setMainMenu:m_osxMenu];
[NSApp setAppleMenu:[[m_osxMenu itemAtIndex:0] submenu]]; [NSApp setAppleMenu:[[m_osxMenu itemAtIndex:0] submenu]];
wxMenuItem *services = GetWXPeer()->FindItem(wxID_OSX_SERVICES); wxMenuItem *services = peer->FindItem(wxID_OSX_SERVICES);
if ( services ) if ( services )
[NSApp setServicesMenu:services->GetSubMenu()->GetHMenu()]; [NSApp setServicesMenu:services->GetSubMenu()->GetHMenu()];
#if 0
// should we reset this just to be sure we don't leave a dangling ref ?
else
[NSApp setServicesMenu:nil];
#endif
NSMenu* helpMenu = nil;
int helpid = peer->FindItem(wxApp::s_macHelpMenuTitleName);
if ( helpid == wxNOT_FOUND )
helpid = peer->FindItem(_("&Help"));
if ( helpid != wxNOT_FOUND )
{
wxMenuItem* helpMenuItem = peer->FindItem(helpid);
if ( helpMenuItem->IsSubMenu() )
helpMenu = helpMenuItem->GetSubMenu()->GetHMenu();
}
if ( [NSApp respondsToSelector:@selector(setHelpMenu:)])
[NSApp setHelpMenu:helpMenu];
} }
virtual void Enable( bool WXUNUSED(enable) ) virtual void Enable( bool WXUNUSED(enable) )