Applied patch [ 596061 ] Adds more navigation buttons to preview

[wxWidgets.git] / include / wx / os2 / toolbar.h

diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h
index 8cad6a95c793f9f91f45f7b7862a910da335b6ff..608d65311a0e7603fa10907e70dfdb43f7870e89 100644 (file)
--- a/include/wx/os2/toolbar.h
+++ b/include/wx/os2/toolbar.h
@@ -15,6 +15,9 @@
 #if wxUSE_TOOLBAR
 #include "wx/tbarbase.h"
 
 #if wxUSE_TOOLBAR
 #include "wx/tbarbase.h"
 

+#define ID_TOOLTIMER                100
+#define ID_TOOLEXPTIMER             101
+

 class WXDLLEXPORT wxToolBar: public wxToolBarBase
 {
 public:
 class WXDLLEXPORT wxToolBar: public wxToolBarBase
 {
 public:


@@ -22,7 +25,10 @@ public:
      * Public interface
      */
 
      * Public interface
      */
 

-    wxToolBar() { Init(); }
+    wxToolBar()
+    : m_vToolTimer(this, ID_TOOLTIMER)
+    , m_vToolExpTimer(this, ID_TOOLEXPTIMER)
+    { Init(); }

 
     inline wxToolBar( wxWindow*       pParent
                      ,wxWindowID      vId
 
     inline wxToolBar( wxWindow*       pParent
                      ,wxWindowID      vId


@@ -30,7 +36,8 @@ public:
                      ,const wxSize&   rSize = wxDefaultSize
                      ,long            lStyle = wxNO_BORDER | wxTB_HORIZONTAL
                      ,const wxString& rName = wxToolBarNameStr
                      ,const wxSize&   rSize = wxDefaultSize
                      ,long            lStyle = wxNO_BORDER | wxTB_HORIZONTAL
                      ,const wxString& rName = wxToolBarNameStr

-                    )
+                    ) : m_vToolTimer(this, ID_TOOLTIMER)
+                      , m_vToolExpTimer(this, ID_TOOLEXPTIMER)

     {
         Init();
         Create( pParent
     {
         Init();
         Create( pParent


@@ -187,9 +194,16 @@ private:
     void RaiseTool( wxToolBarToolBase* pTool
                    ,bool               bRaise = TRUE
                   );
     void RaiseTool( wxToolBarToolBase* pTool
                    ,bool               bRaise = TRUE
                   );

+    void OnTimer(wxTimerEvent& rEvent);

 
     static bool                     m_bInitialized;
 
 
     static bool                     m_bInitialized;
 

+    wxTimer                         m_vToolTimer;
+    wxTimer                         m_vToolExpTimer;
+    wxToolTip*                      m_pToolTip;
+    wxCoord                         m_vXMouse;
+    wxCoord                         m_vYMouse;
+

     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)
 };