#ifndef _TOOLBAR_H_BASE_
#define _TOOLBAR_H_BASE_
+// 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/tbar95.h"
+# include "wx/msw/tbar95.h"
# define wxToolBar wxToolBar95
-# define classwxToolBar classwxToolBar95
+# define sm_classwxToolBar sm_classwxToolBar95
#elif defined(__WXMSW__)
-# include "wx/tbarmsw.h"
+# include "wx/msw/tbarmsw.h"
# define wxToolBar wxToolBarMSW
-# define classwxToolBar classwxToolBarMSW
+# define sm_classwxToolBar sm_classwxToolBarMSW
+#elif defined(__WXMOTIF__)
+# include "wx/motif/toolbar.h"
#elif defined(__WXGTK__)
# include "wx/gtk/tbargtk.h"
-# define wxToolBar wxToolBarGTK
-# define classwxToolBar classwxToolBarGTK
+#elif defined(__WXQT__)
+# include "wx/qt/tbarqt.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