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

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index 47a0bcd504..ba408a4214 100644
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -25,9 +25,7 @@ class WXDLLEXPORT wxButton: public wxButtonBase
                     ,const wxPoint&     rPos = wxDefaultPosition
                     ,const wxSize&      rSize = wxDefaultSize
                     ,long               lStyle = 0
-#if wxUSE_VALIDATORS
                     ,const wxValidator& rValidator = wxDefaultValidator
-#endif
                     ,const wxString&    rsName = wxButtonNameStr
                    )
     {
@@ -37,9 +35,7 @@ class WXDLLEXPORT wxButton: public wxButtonBase
                ,rPos
                ,rSize
                ,lStyle
-#if wxUSE_VALIDATORS
                ,rValidator
-#endif
                ,rsName
               );
     }
@@ -50,9 +46,7 @@ class WXDLLEXPORT wxButton: public wxButtonBase
                 ,const wxPoint&     rPos = wxDefaultPosition
                 ,const wxSize&      rSize = wxDefaultSize
                 ,long               lStyle = 0
-#if wxUSE_VALIDATORS
                 ,const wxValidator& rValidator = wxDefaultValidator
-#endif
                 ,const wxString&    rsName = wxButtonNameStr
                );
 
@@ -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