X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6244848856584171db8cd74a7ff227250e46cc54..5ef9f903666c6d4be2b5120d8d531cb3b41fd8c1:/include/wx/msw/tbarmsw.h?ds=sidebyside

diff --git a/include/wx/msw/tbarmsw.h b/include/wx/msw/tbarmsw.h
index 5ce62ea20d..75fe842966 100644
--- a/include/wx/msw/tbarmsw.h
+++ b/include/wx/msw/tbarmsw.h
@@ -17,9 +17,10 @@
 #endif
 
 #if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
+
 #include "wx/tbarbase.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxButtonBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxButtonBarNameStr;
 
 class WXDLLEXPORT wxMemoryDC;
 
@@ -65,7 +66,7 @@ public:
   // The button size is bigger than the bitmap size
   wxSize GetToolSize(void) const;
 
-  void Layout(void);
+  void LayoutTools();
 
   // The post-tool-addition call
   bool Realize() { Layout(); return TRUE; };
@@ -118,6 +119,26 @@ DECLARE_EVENT_TABLE()
 #define wxTBSTATE_HIDDEN          0x08    // button is hidden
 #define wxTBSTATE_INDETERMINATE   0x10    // button is indeterminate
 
+class WXDLLEXPORT wxToolBar : public wxToolBarMSW
+{
+public:
+    wxToolBar() { }
+
+    wxToolBar(wxWindow *parent,
+              wxWindowID id,
+              const wxPoint& pos = wxDefaultPosition,
+              const wxSize& size = wxDefaultSize,
+              long style = wxNO_BORDER | wxTB_HORIZONTAL,
+              const wxString& name = wxToolBarNameStr)
+        : wxToolBarMSW(parent, id, pos, size, style, name)
+    {
+    }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxToolBar)
+};
+
 #endif // wxUSE_TOOL/BUTTONBAR
+
 #endif
     // _WX_TBARMSW_H_