Small modifications to Vadims changes

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

diff --git a/include/wx/tbarsmpl.h b/include/wx/tbarsmpl.h
index add138a78d2c0a080a153f45b9aad9260f67184e..54e1354a7773334b61b09cd5c394e4ce4527edcc 100644 (file)
--- a/include/wx/tbarsmpl.h
+++ b/include/wx/tbarsmpl.h
@@ -18,13 +18,15 @@
 
 #include "wx/defs.h"
 
 
 #include "wx/defs.h"
 

-#if USE_TOOLBAR
+#if wxUSE_TOOLBAR

 
 #include "wx/bitmap.h"
 #include "wx/list.h"
 #include "wx/tbarbase.h"
 
 
 #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;
 
 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);
 
 
   virtual void SpringUpButton(int index);
 

-  void Layout(void);
+  virtual void LayoutTools();

 
   // The post-tool-addition call
 
   // The post-tool-addition call

-  bool Realize() { Layout(); return TRUE; };
+  virtual bool Realize() { LayoutTools(); return TRUE; };

 
 protected:
   int                   m_currentRowsOrColumns;
 
 protected:
   int                   m_currentRowsOrColumns;


@@ -73,7 +75,7 @@ DECLARE_EVENT_TABLE()
 
 };
 
 
 };
 

-#endif // USE_TOOLBAR
+#endif // wxUSE_TOOLBAR

 #endif
     // _WX_TBARSMPLH__
 
 #endif
     // _WX_TBARSMPLH__