fixed wxBITMAP macro under wxGTK

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

diff --git a/include/wx/toolbar.h b/include/wx/toolbar.h
index e8ab833439315b5b6735a5d20f4b542ba7fc35ef..600a4743af247496b665f53050e3d8168ca9bb53 100644 (file)
--- a/include/wx/toolbar.h
+++ b/include/wx/toolbar.h
@@ -1,19 +1,42 @@
-#ifndef _TOOLBAR_H_BASE_
-#define _TOOLBAR_H_BASE_
+/////////////////////////////////////////////////////////////////////////////
+// Name:        wx/toolbar.h
+// Purpose:     wxToolBar interface declaration
+// Author:      Vadim Zeitlin
+// Modified by:
+// Created:     20.11.99
+// RCS-ID:      $Id$
+// Copyright:   (c) wxWindows team
+// Licence:     wxWindows licence
+/////////////////////////////////////////////////////////////////////////////
+
+#ifndef _WX_TOOLBAR_H_BASE_
+#define _WX_TOOLBAR_H_BASE_
+
+#include "wx/tbarbase.h"     // the base class for all toolbars
+
+#if 0
+class WXDLLEXPORT wxToolBar : public wxControl
+{
+};
+#endif // 0
 
-// 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 classwxToolBar classwxToolBar95
 #elif defined(__WXMSW__)
 #   include "wx/msw/tbarmsw.h"
-#   define wxToolBar wxToolBarMSW
-#   define classwxToolBar 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(__WXPM__)
+#   include "wx/os2/toolbar.h"
+#elif defined(__WXSTUBS__)
+#   include "wx/stubs/toolbar.h"
 #endif
 
 #endif
-    // _TOOLBAR_H_BASE_
+    // _WX_TOOLBAR_H_BASE_