Removed some consts from tabctrl.h; fixed some other errors

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

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index 5e329fba0fcd3e21bc3d0c768cad1b419f1e49a1..b4fe589c176ab17fe7dcd694b9be965fb58c6849 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -1,11 +1,18 @@
-#ifndef __TOOLBARH_BASE__
-#define __TOOLBARH_BASE__
+#ifndef _TOOLBAR_H_BASE_
+#define _TOOLBAR_H_BASE_
 
-#if defined(__WINDOWS__)
-#include "wx/tbar95.h"
+#if defined(__WINDOWS__) && defined(__WIN95__)
+#   include "wx/tbar95.h"
+#   define wxToolBar wxToolBar95
+#   define classwxToolBar classwxToolBar95
+#elif defined(__WINDOWS__)
+#   include "wx/tbarmsw.h"
+#   define wxToolBar wxToolBarMSW
+#   define classwxToolBar classwxToolBarMSW
 #elif defined(__GTK__)
-#include "wx/gtk/tbargtk.h"
+#   include "wx/gtk/tbargtk.h"
+#   define classwxToolBar wxToolBarGTK
 #endif
 
 #endif
-    // __TOOLBARH_BASE__
+    // _TOOLBAR_H_BASE_