X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b9b1d6c8ddc0e923c368529efb0e011edeec44e6..213ceb3f0e7b88a09d756dd181f14ecb5bd44d57:/include/wx/os2/button.h?ds=sidebyside

diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h
index ebfe1c1a35..1617192173 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,12 +35,20 @@ class WXDLLEXPORT wxButton: public wxButtonBase
                ,rPos
                ,rSize
                ,lStyle
-#if wxUSE_VALIDATORS
                ,rValidator
-#endif
                ,rsName
               );
     }
+    
+    wxButton(wxWindow *parent, wxWindowID id, wxStockItemID stock,
+           const wxString& descriptiveLabel = wxEmptyString,
+           const wxPoint& pos = wxDefaultPosition,
+           long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxButtonNameStr)
+    {
+        Create(parent, id, stock, descriptiveLabel, pos, style, validator, name);
+    }
 
     bool Create( wxWindow*          pParent
                 ,wxWindowID         vId
@@ -50,11 +56,20 @@ 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
                );
+    
+    bool Create(wxWindow *parent, wxWindowID id, wxStockItemID stock,
+           const wxString& descriptiveLabel = wxEmptyString,
+           const wxPoint& pos = wxDefaultPosition,
+           long style = 0,
+           const wxValidator& validator = wxDefaultValidator,
+           const wxString& name = wxButtonNameStr)
+    {
+        return CreateStock(parent, id, stock, descriptiveLabel,
+                           pos, style, validator, name);
+    }
 
     virtual ~wxButton();
 
@@ -81,6 +96,13 @@ class WXDLLEXPORT wxButton: public wxButtonBase
 protected:
 
     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