Improved size handling.

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

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index 81d97f47f7de5be7ecfd9b8b65c56b28e34f38fa..272bb088992c72321f8de526ed987da7e9e74419 100644 (file)
--- 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);