X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da87a1ca42a81c7b7b69cb013eb52d09cd5c1b70..7be1f0d91a912a73b110157170124830446e15e1:/include/wx/toolbar.h

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index b4fe589c17..86d2444de7 100644
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -1,17 +1,26 @@
 #ifndef _TOOLBAR_H_BASE_
 #define _TOOLBAR_H_BASE_
 
-#if defined(__WINDOWS__) && defined(__WIN95__)
-#   include "wx/tbar95.h"
+// 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 classwxToolBar classwxToolBar95
-#elif defined(__WINDOWS__)
-#   include "wx/tbarmsw.h"
+#   define sm_classwxToolBar sm_classwxToolBar95
+#elif defined(__WXMSW__)
+#   include "wx/msw/tbarmsw.h"
 #   define wxToolBar wxToolBarMSW
-#   define classwxToolBar classwxToolBarMSW
-#elif defined(__GTK__)
+#   define sm_classwxToolBar sm_classwxToolBarMSW
+#elif defined(__WXMOTIF__)
+#   include "wx/motif/toolbar.h"
+#elif defined(__WXGTK__)
 #   include "wx/gtk/tbargtk.h"
-#   define classwxToolBar wxToolBarGTK
+#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
 
 #endif