merged 2.4 branch into the trunk
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -663,10 +663,13 @@ bool wxStdToolbarInputHandler::HandleMouse(wxInputConsumer *consumer,
|
||||
m_winCapture = NULL;
|
||||
}
|
||||
|
||||
if ( tool == m_toolCapture )
|
||||
consumer->PerformAction( wxACTION_BUTTON_TOGGLE, m_toolCapture->GetId() );
|
||||
else
|
||||
consumer->PerformAction( wxACTION_TOOLBAR_LEAVE, m_toolCapture->GetId() );
|
||||
if (m_toolCapture)
|
||||
{
|
||||
if ( tool == m_toolCapture )
|
||||
consumer->PerformAction( wxACTION_BUTTON_TOGGLE, m_toolCapture->GetId() );
|
||||
else
|
||||
consumer->PerformAction( wxACTION_TOOLBAR_LEAVE, m_toolCapture->GetId() );
|
||||
}
|
||||
|
||||
m_toolCapture = NULL;
|
||||
|
||||
|
Reference in New Issue
Block a user