X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd3f686c274a264e89ea97505350a82c1134f307..f305c661926d1686aedad884a4ccb311e1cee6be:/include/wx/msw/tbar95.h

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 4aae20d62a..17c0d2c5b7 100644
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -19,7 +19,7 @@
 #if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
 #include "wx/tbarbase.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
+WXDLLEXPORT_DATA(extern const wxChar*) wxToolBarNameStr;
 
 class WXDLLEXPORT wxToolBar95: public wxToolBarBase
 {
@@ -44,10 +44,10 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
             const wxString& name = wxToolBarNameStr);
 
   // Call default behaviour
-  void OnPaint(wxPaintEvent& event) { Default() ; }
-  void OnSize(wxSizeEvent& event) { Default() ; }
-  void OnMouseEvent(wxMouseEvent& event) { Default() ; }
-  void OnKillFocus(wxFocusEvent& event) { Default() ; }
+  void OnPaint(wxPaintEvent& WXUNUSED(event)) { Default() ; }
+  void OnSize(wxSizeEvent& WXUNUSED(event)) { Default() ; }
+  void OnKillFocus(wxFocusEvent& WXUNUSED(event)) { Default() ; }
+  void OnMouseEvent(wxMouseEvent& event);
 
   // Handle wxToolBar95 events
 
@@ -68,6 +68,7 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
   wxSize GetToolSize(void) const;
 
   wxSize GetMaxSize(void) const;
+
   void GetSize(int *w, int *y) const;
 
   virtual bool GetToolState(int toolIndex) const;
@@ -75,7 +76,7 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
   // Add all the buttons: required for Win95.
   virtual bool CreateTools(void);
   virtual void SetRows(int nRows);
-  virtual void Layout(void) {}
+  virtual void LayoutButtons(void) {}
 
   // The post-tool-addition call
   bool Realize() { return CreateTools(); };