X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/57c4d796c56bd48ce370240107f3e4c07e142985..dad5f99acb6b3400ff73562c03db2f3f21b658cd:/include/wx/os2/button.h?ds=sidebyside

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index 09614dc3c1..5330bcfb8f 100644
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -17,20 +17,15 @@
 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
-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else
            const wxValidator& validator = wxDefaultValidator,
-#  endif
 #endif
            const wxString& name = wxButtonNameStr)
   {
@@ -41,11 +36,7 @@ class WXDLLEXPORT wxButton: public wxControl
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
 #if wxUSE_VALIDATORS
-#  if defined(__VISAGECPP__)
-           const wxValidator* validator = wxDefaultValidator,
-#  else
            const wxValidator& validator = wxDefaultValidator,
-#  endif
 #endif
            const wxString& name = wxButtonNameStr);
 
@@ -67,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