Fix for menu items not being disabled after a modal dialog is shown
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:
@@ -157,7 +157,12 @@ void wxMenuItem::UpdateItemText()
|
||||
|
||||
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
|
||||
|| GetId() == wxApp::s_macPreferencesMenuItemId
|
||||
|| GetId() == wxApp::s_macExitMenuItemId
|
||||
|
Reference in New Issue
Block a user