-#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
+/////////////////////////////////////////////////////////////////////////////
-#if defined(__WINDOWS__) && defined(__WIN95__)
-# include "wx/tbar95.h"
-# define wxToolBar wxToolBar95
-# define classwxToolBar classwxToolBar95
-#elif defined(__WINDOWS__)
-# include "wx/tbarmsw.h"
-# define wxToolBar wxToolBarMSW
-# define classwxToolBar classwxToolBarMSW
-#elif defined(__GTK__)
-# include "wx/gtk/tbargtk.h"
-# define classwxToolBar wxToolBarGTK
-#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(__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
- // _TOOLBAR_H_BASE_
+ // _WX_TOOLBAR_H_BASE_