Motif updates

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

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 5e329fba0fcd3e21bc3d0c768cad1b419f1e49a1..4bba52e5acb76f8b04819b46262d14c4dfeaef97 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -1,11 +1,29 @@
-#ifndef __TOOLBARH_BASE__
-#define __TOOLBARH_BASE__
+#ifndef _TOOLBAR_H_BASE_
+#define _TOOLBAR_H_BASE_

 
 

-#if defined(__WINDOWS__)
-#include "wx/tbar95.h"
-#elif defined(__GTK__)
-#include "wx/gtk/tbargtk.h"
+// 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"
+#   define wxToolBar wxToolBar95
+#   define sm_classwxToolBar sm_classwxToolBar95
+#elif defined(__WXMSW__)
+#   include "wx/msw/tbarmsw.h"
+#   define wxToolBar wxToolBarMSW
+#   define sm_classwxToolBar sm_classwxToolBarMSW
+#elif defined(__WXMOTIF__)
+#   include "wx/tbarsmpl.h"
+#   define wxToolBar wxToolBarSimple
+#   define sm_classwxToolBar sm_classwxToolBarSimple
+#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

-    // __TOOLBARH_BASE__
+    // _TOOLBAR_H_BASE_