-#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__)
+#ifndef _WX_TOOLBAR_H_BASE_
+#define _WX_TOOLBAR_H_BASE_
+
+#include "wx/tbarbase.h" // the base class for all toolbars
+
+#if 0
+class WXDLLEXPORT wxToolBar : public wxControl
+{
+};
+#endif // 0
+
+#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__)