X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/afa59b4e8828f1fff43c3c0d4303adf2c6ac59e5..7523de907dd77eedd33431d5ff46478a467faf5f:/include/wx/os2/button.h?ds=inline

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index 092a589d87..15de85ecd5 100644
--- a/include/wx/os2/button.h
+++ b/include/wx/os2/button.h
@@ -14,22 +14,18 @@
 
 #include "wx/control.h"
 
-WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr;
-
 // 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
                    )
     {
@@ -39,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
@@ -82,8 +75,18 @@ class WXDLLEXPORT wxButton: public wxButtonBase
 
 protected:
 
-    bool           SendClickEvent(void);
-    virtual wxSize DoGetBestSize(void) const;
+    bool            SendClickEvent(void);
+    void            SetTmpDefault(void);
+    void            UnsetTmpDefault(void);
+
+    static void     SetDefaultStyle( wxButton* pButton
+                                    ,bool      bOn
+                                   );
+
+    virtual wxSize  DoGetBestSize(void) const;
+    virtual WXDWORD OS2GetStyle( long     style
+                                ,WXDWORD* exstyle
+                               ) const;
 private:
   DECLARE_DYNAMIC_CLASS(wxButton)
 }; // end of CLASS wxButton