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 3e09456f594782028c3887458630dc76622e5568..7dad6add567e2d0f612b6422e7b19267479a4106 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -6,17 +6,21 @@
 #if defined(__WXMSW__) && defined(__WIN95__)
 #   include "wx/msw/tbar95.h"
 #   define wxToolBar wxToolBar95
-#   define classwxToolBar classwxToolBar95
+#   define sm_classwxToolBar sm_classwxToolBar95
 #elif defined(__WXMSW__)
 #   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"
 #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