X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/430974f8c443dcbe1616a85238ead7db5fb88e43..11e3c6ef36393fb5863ea2f9601d8facd73acb12:/include/wx/os2/button.h?ds=sidebyside

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index 47a0bcd504..e6e68407da 100644
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        button.h
+// Name:        wx/os2/button.h
 // Purpose:     wxButton class
 // Author:      David Webster
 // Modified by:
@@ -15,19 +15,17 @@
 #include "wx/control.h"
 
 // Pushbutton
-class WXDLLEXPORT wxButton: public wxButtonBase
+class WXDLLIMPEXP_CORE 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
@@ -84,9 +79,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