Tooltip updates
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -304,6 +304,7 @@ BEGIN_EVENT_TABLE(wxToolBar, wxToolBarBase)
|
||||
EVT_PAINT(wxToolBar::OnPaint)
|
||||
EVT_KILL_FOCUS(wxToolBar::OnKillFocus)
|
||||
EVT_MOUSE_EVENTS(wxToolBar::OnMouseEvent)
|
||||
EVT_TIMER(-1, wxToolBar::OnTimer)
|
||||
END_EVENT_TABLE()
|
||||
|
||||
// ============================================================================
|
||||
@@ -906,6 +907,8 @@ void wxToolBar::OnMouseEvent(
|
||||
ReleaseMouse();
|
||||
}
|
||||
|
||||
m_vToolTimer.Stop();
|
||||
m_vToolTimer.Start(3000L, FALSE);
|
||||
if (!pTool)
|
||||
{
|
||||
if (m_nCurrentTool > -1)
|
||||
@@ -1406,4 +1409,18 @@ void wxToolBar::RaiseTool (
|
||||
}
|
||||
} // end of wxToolBar::RaiseTool
|
||||
|
||||
void wxToolBar::OnTimer (
|
||||
wxTimerEvent& rEvent
|
||||
)
|
||||
{
|
||||
if (rEvent.GetId() == (int)m_ulToolTimer)
|
||||
{
|
||||
(void)wxMessageBox("wxWindows toolbar timer", "ToolTimer");
|
||||
}
|
||||
else if (rEvent.GetId() == (int)m_ulToolExpTimer)
|
||||
{
|
||||
(void)wxMessageBox("wxWindows toolbar timer", "ToolExpTimer");
|
||||
}
|
||||
} // end of wxToolBar::OnTimer
|
||||
|
||||
#endif // ndef for wxUSE_TOOLBAR && wxUSE_TOOLBAR_NATIVE
|
||||
|
Reference in New Issue
Block a user