fixed the last of the off-by-one errors (some are refixed, again...)

[wxWidgets.git] / include / wx / os2 / button.h

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index 802f1c3623bcfe00ad9bf45549cf4e483f775aea..5330bcfb8f12878206c5195e52e158c714c4bbbe 100644 (file)
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -17,15 +17,16 @@
 WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
 
 // Pushbutton
-class WXDLLEXPORT wxButton: public wxControl
+class WXDLLEXPORT wxButton: public wxButtonBase
 {
-  DECLARE_DYNAMIC_CLASS(wxButton)
  public:
   inline wxButton() {}
   inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
+#if wxUSE_VALIDATORS
            const wxValidator& validator = wxDefaultValidator,
+#endif
            const wxString& name = wxButtonNameStr)
   {
       Create(parent, id, label, pos, size, style, validator, name);
@@ -34,7 +35,9 @@ class WXDLLEXPORT wxButton: public wxControl
   bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
+#if wxUSE_VALIDATORS
            const wxValidator& validator = wxDefaultValidator,
+#endif
            const wxString& name = wxButtonNameStr);
 
   virtual ~wxButton();
@@ -55,7 +58,9 @@ protected:
     // send a notification event, return TRUE if processed
     bool SendClickEvent();
 
-    virtual wxSize DoGetBestSize();
+    virtual wxSize DoGetBestSize() const;
+private:
+  DECLARE_DYNAMIC_CLASS(wxButton)
 };
 
 #endif