X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/018d3030cc3616223f598b750171f86eabdd3ed7..033bf67c3cd465dce10b7bfb5c24f62ab83e5a13:/include/wx/os2/button.h?ds=inline

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index 81d97f47f7..15de85ecd5 100644
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -17,17 +17,15 @@
 // Pushbutton
 class WXDLLEXPORT wxButton: public wxButtonBase
 {
- public:
+public:
     inline wxButton() {}
     inline wxButton( wxWindow*          pParent
                     ,wxWindowID         vId
-                    ,const wxString&    rsLabel
+                    ,const wxString&    rsLabel = wxEmptyString
                     ,const wxPoint&     rPos = wxDefaultPosition
                     ,const wxSize&      rSize = wxDefaultSize
                     ,long               lStyle = 0
-#if wxUSE_VALIDATORS
                     ,const wxValidator& rValidator = wxDefaultValidator
-#endif
                     ,const wxString&    rsName = wxButtonNameStr
                    )
     {
@@ -37,28 +35,25 @@ class WXDLLEXPORT wxButton: public wxButtonBase
                ,rPos
                ,rSize
                ,lStyle
-#if wxUSE_VALIDATORS
                ,rValidator
-#endif
                ,rsName
               );
     }
 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId
-                ,const wxString&    rsLabel
+                ,const wxString&    rsLabel = wxEmptyString
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0
-#if wxUSE_VALIDATORS
                 ,const wxValidator& rValidator = wxDefaultValidator
-#endif
                 ,const wxString&    rsName = wxButtonNameStr
                );
 
     virtual ~wxButton();
 
-    virtual void     SetDefault(void);
+    virtual wxWindow *SetDefault();
+
     static wxSize    GetDefaultSize(void);
     virtual void     Command(wxCommandEvent& rEvent);
     virtual bool     OS2Command( WXUINT uParam