X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/063807f6c3b48f4ee4e391187bb9230b641e4fa4..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/os2/toolbar.h

diff --git a/include/wx/os2/toolbar.h b/include/wx/os2/toolbar.h
index edb8e0e785..acb2ec8fbd 100644
--- a/include/wx/os2/toolbar.h
+++ b/include/wx/os2/toolbar.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        toolbar.h
+// Name:        wx/os2/toolbar.h
 // Purpose:     wxToolBar class
 // Author:      David Webster
 // Modified by:
@@ -19,7 +19,7 @@
 #define ID_TOOLTIMER                100
 #define ID_TOOLEXPTIMER             101
 
-class WXDLLEXPORT wxToolBar: public wxToolBarBase
+class WXDLLIMPEXP_CORE wxToolBar: public wxToolBarBase
 {
 public:
     /*
@@ -35,7 +35,7 @@ public:
                      ,wxWindowID      vId
                      ,const wxPoint&  rPos = wxDefaultPosition
                      ,const wxSize&   rSize = wxDefaultSize
-                     ,long            lStyle = wxNO_BORDER | wxTB_HORIZONTAL
+                     ,long            lStyle = wxTB_HORIZONTAL
                      ,const wxString& rName = wxToolBarNameStr
                     ) : m_vToolTimer(this, ID_TOOLTIMER)
                       , m_vToolExpTimer(this, ID_TOOLEXPTIMER)
@@ -55,7 +55,7 @@ public:
                 ,wxWindowID      vId
                 ,const wxPoint&  rPos = wxDefaultPosition
                 ,const wxSize&   rSize = wxDefaultSize
-                ,long            lStyle = wxNO_BORDER | wxTB_HORIZONTAL
+                ,long            lStyle = wxTB_HORIZONTAL
                 ,const wxString& rName = wxToolBarNameStr
                );
 
@@ -165,7 +165,8 @@ protected:
                                           ,const wxString& rsShortHelp
                                           ,const wxString& rsLongHelp
                                          );
-    virtual wxToolBarToolBase* CreateTool(wxControl* pControl);
+    virtual wxToolBarToolBase* CreateTool(wxControl* pControl,
+                                          const wxString& label);
 
     //
     // Helpers
@@ -205,6 +206,15 @@ private:
     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)
 };