in debug mode when clicking with the middle mouse button draw borders around all...

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

diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h
index 8cad6a95c793f9f91f45f7b7862a910da335b6ff..ab156e37f11e123402b2d8943f92bd1abfab0550 100644 (file)
--- a/include/wx/os2/toolbar.h
+++ b/include/wx/os2/toolbar.h
@@ -13,16 +13,23 @@
 #define _WX_TOOLBAR_H_
 
 #if wxUSE_TOOLBAR
 #define _WX_TOOLBAR_H_
 
 #if wxUSE_TOOLBAR

+#include "wx/timer.h"

 #include "wx/tbarbase.h"
 
 #include "wx/tbarbase.h"
 

-class WXDLLEXPORT wxToolBar: public wxToolBarBase
+#define ID_TOOLTIMER                100
+#define ID_TOOLEXPTIMER             101
+
+class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase

 {
 public:
     /*
      * Public interface
      */
 
 {
 public:
     /*
      * 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 +37,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


@@ -157,7 +165,8 @@ protected:
                                           ,const wxString& rsShortHelp
                                           ,const wxString& rsLongHelp
                                          );
                                           ,const wxString& rsShortHelp
                                           ,const wxString& rsLongHelp
                                          );

-    virtual wxToolBarToolBase* CreateTool(wxControl* pControl);
+    virtual wxToolBarToolBase* CreateTool(wxControl* pControl,
+                                          const wxString& label);

 
     //
     // Helpers
 
     //
     // Helpers


@@ -187,9 +196,25 @@ 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;
+
+    //
+    // Virtual function hiding supression
+    virtual wxToolBarToolBase *InsertTool (size_t nPos, wxToolBarToolBase* pTool)
+    {
+        return( wxToolBarBase::InsertTool( nPos
+                                          ,pTool
+                                         ));
+    }
+

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