OS/2 thread updates

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

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index e2499addee1266b373de61e583f83238ef710b8c..47911912d297279d73014b9cff9510f035cc1c23 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -1,22 +1,20 @@
 #ifndef _TOOLBAR_H_BASE_
 #define _TOOLBAR_H_BASE_
 
 #ifndef _TOOLBAR_H_BASE_
 #define _TOOLBAR_H_BASE_
 

-// 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"
 #if defined(__WXMSW__) && defined(__WIN95__)
 #   include "wx/msw/tbar95.h"

-#   define wxToolBar wxToolBar95
-#   define sm_classwxToolBar sm_classwxToolBar95

 #elif defined(__WXMSW__)
 #   include "wx/msw/tbarmsw.h"
 #elif defined(__WXMSW__)
 #   include "wx/msw/tbarmsw.h"

-#   define wxToolBar wxToolBarMSW
-#   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(__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
 #elif defined(__WXSTUBS__)
 #   include "wx/stubs/toolbar.h"
 #endif