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

Patch by David Brinegar to fix menubar updating after modal dialog shown

Browse Source 
See thread: [wx-dev] [wxMac] Menubar UI updates when launching from Finder


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31961 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-02-12 12:31:02 +00:00
parent 5ecd392970
commit a2d3a3d1d3
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mac/carbon/menuitem.cpp
View File

@@ -158,18 +158,18 @@ void wxMenuItem::UpdateItemText()
void wxMenuItem::Enable(bool bDoEnable) void wxMenuItem::Enable(bool bDoEnable)
{ {
// Due to desychronisation of m_isEnabled from the if (( m_isEnabled != bDoEnable
// true state after a modal dialog is shown in OnInit,
// and subsequent enabling of menu items that should be
// disabled, we now always update the item's status.
if ( /* m_isEnabled != bDoEnable */ true
#if TARGET_CARBON #if TARGET_CARBON
|| GetId() == wxApp::s_macPreferencesMenuItemId // avoid changing menuitem state when menu is disabled
|| GetId() == wxApp::s_macExitMenuItemId // eg. BeginAppModalStateForWindow() will disable menus and ignore this change
|| GetId() == wxApp::s_macAboutMenuItemId // which in turn causes m_isEnabled to become out of sync with real menuitem state
&& !(m_parentMenu && !IsMenuItemEnabled(MAC_WXHMENU(m_parentMenu->GetHMenu()), 0)) )
// always update builtin menuitems
|| ( GetId() == wxApp::s_macPreferencesMenuItemId
|| GetId() == wxApp::s_macExitMenuItemId
|| GetId() == wxApp::s_macAboutMenuItemId
#endif #endif
) ))
{ {
wxMenuItemBase::Enable( bDoEnable ) ; wxMenuItemBase::Enable( bDoEnable ) ;
UpdateItemStatus() ; UpdateItemStatus() ;