Added a bug report; C++Builder compile fixes

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

diff --git a/include/wx/tbarsmpl.h b/include/wx/tbarsmpl.h
index 2e4911aee15c2c29218361d35c3c4f6569d0a35c..54e1354a7773334b61b09cd5c394e4ce4527edcc 100644 (file)
--- a/include/wx/tbarsmpl.h
+++ b/include/wx/tbarsmpl.h
@@ -26,7 +26,7 @@
 
 class WXDLLEXPORT wxMemoryDC;
 
 
 class WXDLLEXPORT wxMemoryDC;
 

-WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
+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;
 


@@ -62,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;