For non-Unicode added #include <ctype.h> and <string.h> to avoid some missing

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

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 3e09456f594782028c3887458630dc76622e5568..86d2444de77bffaf664ec84e8f2c2312605e470c 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -6,11 +6,13 @@
 #if defined(__WXMSW__) && defined(__WIN95__)
 #   include "wx/msw/tbar95.h"
 #   define wxToolBar wxToolBar95
 #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
 #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__)
 #elif defined(__WXGTK__)
 #   include "wx/gtk/tbargtk.h"
 #elif defined(__WXQT__)