Correct the wxButton::Setlabel nonsense

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

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 7d4111f2d51eb6f72c96275f7245ab8cf081e14d..3f7abdfdea1999c46512f3e15d1fd1cdbb39b2e8 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -1,17 +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__)
 #if defined(__WXMSW__) && defined(__WIN95__)

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

 #   define wxToolBar wxToolBar95
 #   define classwxToolBar classwxToolBar95
 #elif defined(__WXMSW__)
 #   define wxToolBar wxToolBar95
 #   define classwxToolBar classwxToolBar95
 #elif defined(__WXMSW__)

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

 #   define wxToolBar wxToolBarMSW
 #   define classwxToolBar classwxToolBarMSW
 #elif defined(__WXGTK__)
 #   include "wx/gtk/tbargtk.h"
 #   define wxToolBar wxToolBarMSW
 #   define classwxToolBar classwxToolBarMSW
 #elif defined(__WXGTK__)
 #   include "wx/gtk/tbargtk.h"

-#   define classwxToolBar wxToolBarGTK
+#elif defined(__WXQT__)
+#   include "wx/qt/tbargtk.h"

 #endif
 
 #endif
 #endif
 
 #endif