Fixed OS/2 compilation problems.

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

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 86d2444de77bffaf664ec84e8f2c2312605e470c..25f71277cb145157e7069d78a2c1351a17c39c96 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -1,27 +1,59 @@
-#ifndef _TOOLBAR_H_BASE_
-#define _TOOLBAR_H_BASE_
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/toolbar.h
+// Purpose:     wxToolBar interface declaration
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     20.11.99
+// RCS-ID:      $Id$
+// Copyright:   (c) wxWindows team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////

 
 

-// the application code should use only wxToolBar which is #define'd to be the
-// native implementation for each platform
-#if defined(__WXMSW__) && defined(__WIN95__)
-#   include "wx/msw/tbar95.h"
-#   define wxToolBar wxToolBar95
-#   define sm_classwxToolBar sm_classwxToolBar95
-#elif defined(__WXMSW__)
-#   include "wx/msw/tbarmsw.h"
-#   define wxToolBar wxToolBarMSW
-#   define sm_classwxToolBar sm_classwxToolBarMSW
-#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(__WXSTUBS__)
-#   include "wx/stubs/toolbar.h"
-#endif
+#ifndef _WX_TOOLBAR_H_BASE_
+#define _WX_TOOLBAR_H_BASE_
+
+#include "wx/tbarbase.h"     // the base class for all toolbars
+
+#if wxUSE_TOOLBAR
+    #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"
+        #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(__WXX11__)
+           #include "wx/x11/toolbar.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
 
 #endif

-    // _TOOLBAR_H_BASE_
+    // _WX_TOOLBAR_H_BASE_