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
This commit is contained in:
@@ -600,16 +600,29 @@ void wxMenuBar::MacInstallMenuBar()
|
|||||||
|
|
||||||
int id = 0;
|
int id = 0;
|
||||||
wxMenuItem* appleItem = NULL;
|
wxMenuItem* appleItem = NULL;
|
||||||
|
wxMenuItem* wxItem = NULL;
|
||||||
|
|
||||||
id = wxApp::s_macAboutMenuItemId;
|
id = wxApp::s_macAboutMenuItemId;
|
||||||
appleItem = m_appleMenu->FindItem(id);
|
appleItem = m_appleMenu->FindItem(id);
|
||||||
|
wxItem = FindItem(id);
|
||||||
if ( appleItem != NULL )
|
if ( appleItem != NULL )
|
||||||
appleItem->GetPeer()->Hide(FindItem(id) == NULL );
|
{
|
||||||
|
if ( wxItem == NULL )
|
||||||
|
appleItem->GetPeer()->Hide();
|
||||||
|
else
|
||||||
|
appleItem->SetItemLabel(wxItem->GetItemLabel());
|
||||||
|
}
|
||||||
|
|
||||||
id = wxApp::s_macPreferencesMenuItemId;
|
id = wxApp::s_macPreferencesMenuItemId;
|
||||||
appleItem = m_appleMenu->FindItem(id);
|
appleItem = m_appleMenu->FindItem(id);
|
||||||
|
wxItem = FindItem(id);
|
||||||
if ( appleItem != NULL )
|
if ( appleItem != NULL )
|
||||||
appleItem->GetPeer()->Hide(FindItem(id) == NULL );
|
{
|
||||||
|
if ( wxItem == NULL )
|
||||||
|
appleItem->GetPeer()->Hide();
|
||||||
|
else
|
||||||
|
appleItem->SetItemLabel(wxItem->GetItemLabel());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
|
|||||||
Reference in New Issue
Block a user