From aa3e374197e99d6362468dd821935050e5074065 Mon Sep 17 00:00:00 2001 From: Stefan Csomor Date: Tue, 8 Feb 2011 10:47:19 +0000 Subject: [PATCH] copy item text for app menu items from wx menus git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66859 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/osx/menu_osx.cpp | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/osx/menu_osx.cpp b/src/osx/menu_osx.cpp index dcdb935fbd..54b2d6aa91 100644 --- a/src/osx/menu_osx.cpp +++ b/src/osx/menu_osx.cpp @@ -600,16 +600,29 @@ void wxMenuBar::MacInstallMenuBar() int id = 0; wxMenuItem* appleItem = NULL; + wxMenuItem* wxItem = NULL; id = wxApp::s_macAboutMenuItemId; appleItem = m_appleMenu->FindItem(id); + wxItem = FindItem(id); if ( appleItem != NULL ) - appleItem->GetPeer()->Hide(FindItem(id) == NULL ); + { + if ( wxItem == NULL ) + appleItem->GetPeer()->Hide(); + else + appleItem->SetItemLabel(wxItem->GetItemLabel()); + } id = wxApp::s_macPreferencesMenuItemId; appleItem = m_appleMenu->FindItem(id); + wxItem = FindItem(id); if ( appleItem != NULL ) - appleItem->GetPeer()->Hide(FindItem(id) == NULL ); + { + if ( wxItem == NULL ) + appleItem->GetPeer()->Hide(); + else + appleItem->SetItemLabel(wxItem->GetItemLabel()); + } #if 0 -- 2.47.2