X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6c0fdfbb420efa8d6a7a37a87fd6de092b02720d..fb4888a650065c9a24572d6867345f34adafaa37:/include/wx/os2/toolbar.h diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h index c428072b28..24adde3e98 100644 --- a/include/wx/os2/toolbar.h +++ b/include/wx/os2/toolbar.h @@ -13,6 +13,7 @@ #define _WX_TOOLBAR_H_ #if wxUSE_TOOLBAR +#include "wx/timer.h" #include "wx/tbarbase.h" #define ID_TOOLTIMER 100 @@ -200,8 +201,18 @@ private: wxTimer m_vToolTimer; wxTimer m_vToolExpTimer; - ULONG m_ulToolTimer; - ULONG m_ulToolExpTimer; + wxToolTip* m_pToolTip; + wxCoord m_vXMouse; + wxCoord m_vYMouse; + + // + // Virtual function hiding supression + virtual wxToolBarToolBase *InsertTool (size_t nPos, wxToolBarToolBase* pTool) + { + return( wxToolBarBase::InsertTool( nPos + ,pTool + )); + } DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxToolBar)