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

Fix for menu items not being disabled after a modal dialog is shown

Browse Source 
on app startup


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31779 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2005-02-06 11:12:48 +00:00
parent 60c474a0c4
commit ef9ed995cf
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,7 +157,12 @@ void wxMenuItem::UpdateItemText()
void wxMenuItem::Enable(bool bDoEnable) void wxMenuItem::Enable(bool bDoEnable)
{ {
if ( m_isEnabled != bDoEnable // Due to desychronisation of m_isEnabled from the
// 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 || GetId() == wxApp::s_macPreferencesMenuItemId
|| GetId() == wxApp::s_macExitMenuItemId || GetId() == wxApp::s_macExitMenuItemId