wxUSE_SOCKETS added to setup(0).h; Cygwin corrections; doc tweaks

[wxWidgets.git] / include / wx / msw / tbar95.h

diff --git a/include/wx/msw/tbar95.h b/include/wx/msw/tbar95.h
index 2b9e0e2b45943c39e9d119048a76219339b9ecda..78ef1e5ff8ae5aba88d1b5cb8a1ab4a626fe86fb 100644 (file)
--- a/include/wx/msw/tbar95.h
+++ b/include/wx/msw/tbar95.h
@@ -16,7 +16,7 @@
 #pragma interface "tbar95.h"
 #endif
 
-#if USE_BUTTONBAR && USE_TOOLBAR
+#if wxUSE_BUTTONBAR && wxUSE_TOOLBAR
 #include "wx/tbarbase.h"
 
 WXDLLEXPORT_DATA(extern const char*) wxToolBarNameStr;
@@ -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,7 +68,9 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
   wxSize GetToolSize(void) const;
 
   wxSize GetMaxSize(void) const;
+
   void GetSize(int *w, int *y) const;
+  wxSize GetSize() const { return wxWindow::GetSize(); }
 
   virtual bool GetToolState(int toolIndex) const;
 
@@ -81,8 +83,8 @@ class WXDLLEXPORT wxToolBar95: public wxToolBarBase
   bool Realize() { return CreateTools(); };
 
   // IMPLEMENTATION
-  bool MSWCommand(WXUINT param, WXWORD id);
-  bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam);
+  virtual bool MSWCommand(WXUINT param, WXWORD id);
+  virtual bool MSWNotify(WXWPARAM wParam, WXLPARAM lParam, WXLPARAM *result);
 
   // Responds to colour changes
   void OnSysColourChanged(wxSysColourChangedEvent& event);
@@ -93,6 +95,6 @@ protected:
 DECLARE_EVENT_TABLE()
 };
 
-#endif // USE_TOOL/BUTTONBAR
+#endif // wxUSE_TOOL/BUTTONBAR
 #endif
     // _WX_TBAR95_H_