X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/401e3b6e5f50f15571b86297b5d1e3f55c473f6f..e4dd1e19a281da5d1e23b12fd76c9fc242bcb1d6:/include/wx/os2/button.h diff --git a/include/wx/os2/button.h b/include/wx/os2/button.h index 1617192173..15de85ecd5 100644 --- a/include/wx/os2/button.h +++ b/include/wx/os2/button.h @@ -17,11 +17,11 @@ // 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 @@ -39,41 +39,21 @@ class WXDLLEXPORT wxButton: public wxButtonBase ,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 - ,const wxString& rsLabel + ,const wxString& rsLabel = wxEmptyString ,const wxPoint& rPos = wxDefaultPosition ,const wxSize& rSize = wxDefaultSize ,long lStyle = 0 ,const wxValidator& rValidator = wxDefaultValidator ,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(); - virtual void SetDefault(void); + virtual wxWindow *SetDefault(); + static wxSize GetDefaultSize(void); virtual void Command(wxCommandEvent& rEvent); virtual bool OS2Command( WXUINT uParam