X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6d167489bdf17d55d9bd11be834bc17277661063..e8e4fa12f29224194fcf30236ec7640b3cac0bc0:/include/wx/toolbar.h?ds=sidebyside

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 600a4743af..ac9bbc5c18 100644
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -14,29 +14,46 @@
 
 #include "wx/tbarbase.h"     // the base class for all toolbars
 
-#if 0
-class WXDLLEXPORT wxToolBar : public wxControl
-{
-};
-#endif // 0
+#if wxUSE_TOOLBAR
+    #if !wxUSE_TOOLBAR_NATIVE || defined(__WXUNIVERSAL__)
+        #include "wx/tbarsmpl.h"
 
-#if defined(__WXMSW__) && defined(__WIN95__)
-#   include "wx/msw/tbar95.h"
-#elif defined(__WXMSW__)
-#   include "wx/msw/tbarmsw.h"
-#elif defined(__WXMOTIF__)
-#   include "wx/motif/toolbar.h"
-#elif defined(__WXGTK__)
-#   include "wx/gtk/tbargtk.h"
-#elif defined(__WXQT__)
-#   include "wx/qt/tbarqt.h"
-#elif defined(__WXMAC__)
-#   include "wx/mac/toolbar.h"
-#elif defined(__WXPM__)
-#   include "wx/os2/toolbar.h"
-#elif defined(__WXSTUBS__)
-#   include "wx/stubs/toolbar.h"
-#endif
+        class WXDLLEXPORT wxToolBar : public wxToolBarSimple
+        {
+        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)
+                : wxToolBarSimple(parent, id, pos, size, style, name) { }
+
+        private:
+            DECLARE_DYNAMIC_CLASS(wxToolBar)
+        };
+    #else // wxUSE_TOOLBAR_NATIVE
+        #if defined(__WXMSW__) && defined(__WIN95__)
+           #include "wx/msw/tbar95.h"
+        #elif defined(__WXMSW__)
+           #include "wx/msw/tbarmsw.h"
+        #elif defined(__WXMOTIF__)
+           #include "wx/motif/toolbar.h"
+        #elif defined(__WXGTK__)
+           #include "wx/gtk/tbargtk.h"
+        #elif defined(__WXQT__)
+           #include "wx/qt/tbarqt.h"
+        #elif defined(__WXMAC__)
+           #include "wx/mac/toolbar.h"
+        #elif defined(__WXPM__)
+           #include "wx/os2/toolbar.h"
+        #elif defined(__WXSTUBS__)
+           #include "wx/stubs/toolbar.h"
+        #endif
+    #endif // !wxUSE_TOOLBAR_NATIVE/wxUSE_TOOLBAR_NATIVE
+#endif // wxUSE_TOOLBAR
 
 #endif
     // _WX_TOOLBAR_H_BASE_