AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

don't call OnMouseEnter(-1) twice when the mouse leaves the toolbar but wasn't over a tool before

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@45246 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2007-04-04 13:38:37 +00:00
parent e8f5903971
commit 6ae2a4b72f
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/msw/tbar95.cpp
View File

@ -258,7 +258,7 @@ void wxToolBar::Init()
m_defaultWidth = DEFAULTBITMAPX; m_defaultWidth = DEFAULTBITMAPX;
m_defaultHeight = DEFAULTBITMAPY; m_defaultHeight = DEFAULTBITMAPY;
m_pInTool = 0; m_pInTool = NULL;
} }
bool wxToolBar::Create(wxWindow *parent, bool wxToolBar::Create(wxWindow *parent,
@ -1455,9 +1455,14 @@ void wxToolBar::OnSysColourChanged(wxSysColourChangedEvent& event)
void wxToolBar::OnMouseEvent(wxMouseEvent& event) void wxToolBar::OnMouseEvent(wxMouseEvent& event)
{ {
if (event.Leaving() && m_pInTool) if ( event.Leaving() )
{ {
OnMouseEnter( -1 ); if ( m_pInTool )
{
OnMouseEnter(wxID_ANY);
m_pInTool = NULL;
}
event.Skip(); event.Skip();
return; return;
} }
@ -1688,18 +1693,11 @@ void wxToolBar::HandleMouseMove(WXWPARAM WXUNUSED(wParam), WXLPARAM lParam)
y = GET_Y_LPARAM(lParam); y = GET_Y_LPARAM(lParam);
wxToolBarToolBase* tool = FindToolForPosition( x, y ); wxToolBarToolBase* tool = FindToolForPosition( x, y );
// cursor left current tool // has the current tool changed?
if ( tool != m_pInTool && !tool ) if ( tool != m_pInTool )
{
m_pInTool = 0;
OnMouseEnter( -1 );
}
// cursor entered a tool
if ( tool != m_pInTool && tool )
{ {
m_pInTool = tool; m_pInTool = tool;
OnMouseEnter( tool->GetId() ); OnMouseEnter(tool ? tool->GetId() : wxID_ANY);
} }
} }