X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/430974f8c443dcbe1616a85238ead7db5fb88e43..f5a1953b341d16396763bee067ccdd96108f3aad:/include/wx/os2/button.h

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index 47a0bcd504..272bb08899 100644
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -21,13 +21,11 @@ class WXDLLEXPORT wxButton: public wxButtonBase
     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,25 +35,21 @@ 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);
@@ -84,9 +78,9 @@ protected:
     void            SetTmpDefault(void);
     void            UnsetTmpDefault(void);
 
-    static void UpdateDefaultStyle( wxWindow* pWinDefault
-                                   ,wxWindow* pWinOldDefault
-                                  );
+    static void     SetDefaultStyle( wxButton* pButton
+                                    ,bool      bOn
+                                   );
 
     virtual wxSize  DoGetBestSize(void) const;
     virtual WXDWORD OS2GetStyle( long     style