fixed bug with the caret positioning after SetValue() introduced by the last commit

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

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index db17a682c151849dccafea44075a8c31a9229756..e7872223aa5b6d9f0c21deec32dbf3ccd8fe2ea7 100644 (file)
--- 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
 #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"
         #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"
     #else // wxUSE_TOOLBAR_NATIVE
         #if defined(__WXMSW__) && defined(__WIN95__)
            #include "wx/msw/tbar95.h"


@@ -29,8 +43,6 @@
            #include "wx/motif/toolbar.h"
         #elif defined(__WXGTK__)
            #include "wx/gtk/tbargtk.h"
            #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__)
         #elif defined(__WXMAC__)
            #include "wx/mac/toolbar.h"
         #elif defined(__WXPM__)