second merge of the 2.2 branch (RL)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@7973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -196,15 +196,17 @@ bool wxFrameBase::ProcessCommand(int id)
|
||||
if ( !bar )
|
||||
return FALSE;
|
||||
|
||||
wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
|
||||
commandEvent.SetEventObject(this);
|
||||
|
||||
wxMenuItem *item = bar->FindItem(id);
|
||||
if ( item && item->IsCheckable() )
|
||||
{
|
||||
item->Toggle();
|
||||
}
|
||||
|
||||
wxCommandEvent commandEvent(wxEVT_COMMAND_MENU_SELECTED, id);
|
||||
commandEvent.SetInt(id);
|
||||
commandEvent.SetEventObject(this);
|
||||
// use the new value
|
||||
commandEvent.SetInt(item->IsChecked());
|
||||
}
|
||||
|
||||
return GetEventHandler()->ProcessEvent(commandEvent);
|
||||
}
|
||||
|
Reference in New Issue
Block a user