Made changes to allow build with new mingw32/gcc-2.95

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

diff --git a/include/wx/tbarsmpl.h b/include/wx/tbarsmpl.h
index 7b44d3f1099954a52b2f0dc494816654c3a54d2a..54e1354a7773334b61b09cd5c394e4ce4527edcc 100644 (file)
--- a/include/wx/tbarsmpl.h
+++ b/include/wx/tbarsmpl.h
@@ -9,8 +9,8 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __TBARSMPLH__
-#define __TBARSMPLH__
+#ifndef _WX_TBARSMPLH__
+#define _WX_TBARSMPLH__
 
 #ifdef __GNUG__
 #pragma interface "tbarsmpl.h"
@@ -18,13 +18,15 @@
 
 #include "wx/defs.h"
 
-#if USE_TOOLBAR
+#if wxUSE_TOOLBAR
 
 #include "wx/bitmap.h"
 #include "wx/list.h"
 #include "wx/tbarbase.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
+class WXDLLEXPORT wxMemoryDC;
+
+WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
 WXDLLEXPORT_DATA(extern const wxSize) wxDefaultSize;
 WXDLLEXPORT_DATA(extern const wxPoint) wxDefaultPosition;
 
@@ -60,10 +62,10 @@ class WXDLLEXPORT wxToolBarSimple : public wxToolBarBase
 
   virtual void SpringUpButton(int index);
 
-  void Layout(void);
+  virtual void LayoutTools();
 
   // The post-tool-addition call
-  bool Realize() { Layout(); return TRUE; };
+  virtual bool Realize() { LayoutTools(); return TRUE; };
 
 protected:
   int                   m_currentRowsOrColumns;
@@ -73,7 +75,7 @@ DECLARE_EVENT_TABLE()
 
 };
 
-#endif // USE_TOOLBAR
+#endif // wxUSE_TOOLBAR
 #endif
-    // __TBARSMPLH__
+    // _WX_TBARSMPLH__