wxUniv: implement wxSYS_VSCROLL_X/Y metrics in wxUniv code, they depend on the theme...

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

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

+#include "wx/timer.h"

 #include "wx/tbarbase.h"
 
 #define ID_TOOLTIMER                100
 #define ID_TOOLEXPTIMER             101
 
 #include "wx/tbarbase.h"
 
 #define ID_TOOLTIMER                100
 #define ID_TOOLEXPTIMER             101
 

-class WXDLLEXPORT wxToolBar: public wxToolBarBase
+class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase

 {
 public:
     /*
 {
 public:
     /*


@@ -164,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


@@ -200,8 +202,18 @@ private:
 
     wxTimer                         m_vToolTimer;
     wxTimer                         m_vToolExpTimer;
 
     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)
 
     DECLARE_EVENT_TABLE()
     DECLARE_DYNAMIC_CLASS(wxToolBar)