X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/401e3b6e5f50f15571b86297b5d1e3f55c473f6f..22423eac8bcfcd3d357465e2cbeba08f1c431181:/include/wx/cocoa/button.h diff --git a/include/wx/cocoa/button.h b/include/wx/cocoa/button.h index a33f669a1c..84acb8607f 100644 --- a/include/wx/cocoa/button.h +++ b/include/wx/cocoa/button.h @@ -28,7 +28,7 @@ class WXDLLEXPORT wxButton : public wxButtonBase, protected wxCocoaNSButton public: wxButton() { } wxButton(wxWindow *parent, wxWindowID winid, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, @@ -37,34 +37,14 @@ public: Create(parent, winid, label, pos, size, style, validator, name); } - 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 *parent, wxWindowID winid, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = 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(); // ------------------------------------------------------------------------ @@ -78,6 +58,7 @@ protected: public: wxString GetLabel() const; void SetLabel(const wxString& label); + wxSize DoGetBestSize() const; }; #endif // __WX_COCOA_BUTTON_H__