Checking for wxUSE_SOCKETS and __GSOCKET_STANDALONE__ should be right, now

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

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index b4fe589c176ab17fe7dcd694b9be965fb58c6849..7dad6add567e2d0f612b6422e7b19267479a4106 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -1,17 +1,28 @@
 #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(__WXPM__)
+#   include "wx/os2/toolbar.h"
+#elif defined(__WXSTUBS__)
+#   include "wx/stubs/toolbar.h"
 #endif
 
 #endif