Applied patch [ 1428990 ] wxUniv: patch for toolbar button remain in pressed status
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@37999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -649,6 +649,23 @@ bool wxToolBar::PerformAction(const wxControlAction& action,
|
|||||||
PerformAction( wxACTION_BUTTON_RELEASE, numArg );
|
PerformAction( wxACTION_BUTTON_RELEASE, numArg );
|
||||||
|
|
||||||
PerformAction( wxACTION_BUTTON_CLICK, numArg );
|
PerformAction( wxACTION_BUTTON_CLICK, numArg );
|
||||||
|
|
||||||
|
// Write by Danny Raynor to change state again.
|
||||||
|
if( tool->IsToggled() )
|
||||||
|
{
|
||||||
|
// Change toggle state to false
|
||||||
|
tool->Toggle(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check button still pressed or not
|
||||||
|
if( tool->IsInverted() )
|
||||||
|
{
|
||||||
|
PerformAction( wxACTION_TOOLBAR_RELEASE, numArg );
|
||||||
|
}
|
||||||
|
|
||||||
|
// Set mouse leave toolbar button range (If still in the range,
|
||||||
|
// toolbar button would get focus again
|
||||||
|
PerformAction( wxACTION_TOOLBAR_LEAVE, numArg );
|
||||||
}
|
}
|
||||||
else if ( action == wxACTION_TOOLBAR_PRESS )
|
else if ( action == wxACTION_TOOLBAR_PRESS )
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user