From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 4 Jul 2001 18:21:47 +0000 (+0000)
Subject: make it possible to use wxToolBarSimple as wxToolBar with wxUniv
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/7aa5864467bf0bb220fdc447876f13f178ae8f35

make it possible to use wxToolBarSimple as wxToolBar with wxUniv


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10827 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index db17a682c1..ac9bbc5c18 100644
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -15,11 +15,25 @@
 #include "wx/tbarbase.h"     // the base class for all toolbars
 
 #if wxUSE_TOOLBAR
-    #if !wxUSE_TOOLBAR_NATIVE
-        // the wxToolBarSimple is *the* toolbar class in this case
-        #define wxToolBarSimple wxToolBar
-    
+    #if !wxUSE_TOOLBAR_NATIVE || defined(__WXUNIVERSAL__)
         #include "wx/tbarsmpl.h"
+
+        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"
diff --git a/src/generic/tbarsmpl.cpp b/src/generic/tbarsmpl.cpp
index 99248be4c5..42557f2885 100644
--- a/src/generic/tbarsmpl.cpp
+++ b/src/generic/tbarsmpl.cpp
@@ -85,6 +85,12 @@ public:
 
 IMPLEMENT_DYNAMIC_CLASS(wxToolBarSimple, wxToolBarBase)
 
+#if !wxUSE_TOOLBAR_NATIVE || defined(__WXUNIVERSAL__)
+    #include "wx/toolbar.h"
+
+    IMPLEMENT_DYNAMIC_CLASS(wxToolBar, wxToolBarSimple)
+#endif
+
 BEGIN_EVENT_TABLE(wxToolBarSimple, wxToolBarBase)
     EVT_SIZE(wxToolBarSimple::OnSize)
     EVT_SCROLL(wxToolBarSimple::OnScroll)