X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c208c5759da71a637f0f0f5b7d3dc3eda09c02..c455ab932f89cc166fc38d3f2c2f942f6a130649:/include/wx/msw/tbar95.h

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 78ef1e5ff8..acbf6aed48 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
 {
@@ -29,24 +29,21 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
    * Public interface
    */
 
-  wxToolBar95(void);
+  wxToolBar95();
 
-  inline wxToolBar95(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+  wxToolBar95(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxNO_BORDER|wxTB_HORIZONTAL,
             const wxString& name = wxToolBarNameStr)
   {
     Create(parent, id, pos, size, style, name);
   }
-  ~wxToolBar95(void);
+  ~wxToolBar95();
 
   bool Create(wxWindow *parent, wxWindowID id, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
             long style = wxNO_BORDER|wxTB_HORIZONTAL,
             const wxString& name = wxToolBarNameStr);
 
   // Call default behaviour
-  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
@@ -62,29 +59,26 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
   void SetToolBitmapSize(const wxSize& size);
   void EnableTool(int toolIndex, bool enable); // additional drawing on enabling
   void ToggleTool(int toolIndex, bool toggle); // toggle is TRUE if toggled on
-  void ClearTools(void);
+  void ClearTools();
 
   // The button size is bigger than the bitmap size
-  wxSize GetToolSize(void) const;
+  wxSize GetToolSize() const;
 
-  wxSize GetMaxSize(void) const;
-
-  void GetSize(int *w, int *y) const;
-  wxSize GetSize() const { return wxWindow::GetSize(); }
+  wxSize GetMaxSize() const;
 
   virtual bool GetToolState(int toolIndex) const;
 
   // Add all the buttons: required for Win95.
-  virtual bool CreateTools(void);
+  virtual bool CreateTools();
   virtual void SetRows(int nRows);
-  virtual void Layout(void) {}
+  virtual void LayoutButtons() {}
 
   // The post-tool-addition call
   bool Realize() { return CreateTools(); };
 
   // IMPLEMENTATION
   virtual bool MSWCommand(WXUINT param, WXWORD id);
-  virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result);
+  virtual bool MSWOnNotify(int idCtrl, WXLPARAM lParam, WXLPARAM *result);
 
   // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);