Added convenience form of wxEvtHandler::Connect, only one id; changed

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

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 8aee3e80caca510df68efb483d91050dbdc1001b..86d2444de77bffaf664ec84e8f2c2312605e470c 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -4,15 +4,23 @@
 // the application code should use only wxToolBar which is #define'd to be the
 // native implementation for each platform
 #if defined(__WXMSW__) && defined(__WIN95__)
 // 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 wxToolBar wxToolBar95

-#   define classwxToolBar classwxToolBar95
+#   define sm_classwxToolBar sm_classwxToolBar95

 #elif defined(__WXMSW__)
 #elif defined(__WXMSW__)

-#   include "wx/tbarmsw.h"
+#   include "wx/msw/tbarmsw.h"

 #   define wxToolBar wxToolBarMSW
 #   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(__WXGTK__)
 #   include "wx/gtk/tbargtk.h"

+#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
 #endif
 
 #endif