X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9ce43bfae9c8245d620c9bd7cca50b8fa9d88e38..aa61d3525370a9b9fa8c797d9b7f89d96994db5f:/include/wx/toolbar.h

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 4e1a581f47..83192210aa 100644
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     20.11.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) Vadim Zeitlin
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
@@ -55,90 +55,29 @@ enum
 #if wxUSE_TOOLBAR
     #include "wx/tbarbase.h"     // the base class for all toolbars
 
-    // Simple toolbar no longer available, so we will need to have
-    // a generic toolbar at some point (perhaps the wxUniv toolbar)
-    #if 0 // !wxUSE_TOOLBAR_NATIVE && !defined(__WXUNIVERSAL__)
-        #include "wx/tbarsmpl.h"
-
-        class WXDLLEXPORT wxToolBar : public wxToolBarSimple
-        {
-        public:
-            wxToolBar() { }
-
-            wxToolBar(wxWindow *parent,
-                      wxWindowID winid,
-                      const wxPoint& pos = wxDefaultPosition,
-                      const wxSize& size = wxDefaultSize,
-                      long style = wxNO_BORDER | wxTB_HORIZONTAL,
-                      const wxString& name = wxToolBarNameStr)
-                : wxToolBarSimple(parent, winid, pos, size, style, name) { }
-
-            // the most commonly used version of AddTool()
-            wxToolBarToolBase *AddTool(int toolid,
-                               const wxBitmap& bitmap,
-                               const wxString& shortHelpString = wxEmptyString,
-                               const wxString& longHelpString = wxEmptyString)
-            {
-                return wxToolBarSimple::AddTool(toolid, bitmap, wxNullBitmap, FALSE, -1, -1, NULL,
-                       shortHelpString, longHelpString);
-            }
-
-            // old form
-            wxToolBarToolBase *AddTool
-                               (
-                                   int toolid,
-                                   const wxBitmap& bitmap,
-                                   const wxBitmap& pushedBitmap,
-                                   bool toggle,
-                                   wxObject *clientData = NULL,
-                                   const wxString& shortHelpString = wxEmptyString,
-                                   const wxString& longHelpString = wxEmptyString
-                               )
-            {
-                return wxToolBarSimple::AddTool(toolid, bitmap, pushedBitmap, toggle, -1, -1, clientData,
-                       shortHelpString, longHelpString);
-            }
-
-            // virtual overridden
-            virtual wxToolBarToolBase *AddTool
-                               (
-                                   int toolid,
-                                   const wxBitmap& bitmap,
-                                   const wxBitmap& pushedBitmap,
-                                   bool toggle,
-                                   wxCoord xPos,
-                                   wxCoord yPos = -1,
-                                   wxObject *clientData = NULL,
-                                   const wxString& shortHelpString = wxEmptyString,
-                                   const wxString& longHelpString = wxEmptyString
-                               )
-            {
-                return wxToolBarSimple::AddTool(toolid, bitmap, pushedBitmap, toggle, xPos, yPos, clientData,
-                       shortHelpString, longHelpString);
-            }
-
-        private:
-            DECLARE_DYNAMIC_CLASS(wxToolBar)
-        };
-    #else // wxUSE_TOOLBAR_NATIVE
-        #if defined(__WXUNIVERSAL__)
-           #include "wx/univ/toolbar.h"
-        #elif defined(__WXWINCE__)
-           #include "wx/msw/wince/tbarwce.h"
-        #elif 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(__WXMAC__)
-           #include "wx/mac/toolbar.h"
-        #elif defined(__WXPM__)
-           #include "wx/os2/toolbar.h"
-        #endif
-    #endif // !wxUSE_TOOLBAR_NATIVE/wxUSE_TOOLBAR_NATIVE
+    #if defined(__WXUNIVERSAL__)
+       #include "wx/univ/toolbar.h"
+    #elif defined(__WXPALMOS__)
+       #include "wx/palmos/toolbar.h"
+    #elif defined(__WXMSW__) && (!defined(_WIN32_WCE) || (_WIN32_WCE >= 400 && !defined(__POCKETPC__) && !defined(__SMARTPHONE__)))
+       #include "wx/msw/tbar95.h"
+    #elif defined(__WXWINCE__)
+       #include "wx/msw/wince/tbarwce.h"
+    #elif defined(__WXMSW__)
+       #include "wx/msw/tbarmsw.h"
+    #elif defined(__WXMOTIF__)
+       #include "wx/motif/toolbar.h"
+    #elif defined(__WXGTK20__)
+        #include "wx/gtk/tbargtk.h"
+    #elif defined(__WXGTK__)
+        #include "wx/gtk1/tbargtk.h"
+    #elif defined(__WXMAC__)
+       #include "wx/mac/toolbar.h"
+    #elif defined(__WXCOCOA__)
+       #include "wx/cocoa/toolbar.h"
+    #elif defined(__WXPM__)
+       #include "wx/os2/toolbar.h"
+    #endif
 #endif // wxUSE_TOOLBAR
 
 #endif