X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63ec432bd7b9c93961e85e871bcb31758364a634..fba05595e6cca40763f8ead119c7ad61cb01e0e4:/include/wx/mac/carbon/button.h?ds=sidebyside diff --git a/include/wx/mac/carbon/button.h b/include/wx/mac/carbon/button.h index c4abaea100..126e3ad6c5 100644 --- a/include/wx/mac/carbon/button.h +++ b/include/wx/mac/carbon/button.h @@ -20,33 +20,39 @@ WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[]; // Pushbutton class WXDLLEXPORT wxButton: public wxButtonBase { - DECLARE_DYNAMIC_CLASS(wxButton) - public: - inline wxButton() {} - inline wxButton(wxWindow *parent, wxWindowID id, - const wxString& label = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) - { - Create(parent, id, label, pos, size, style, validator, name); - } - - bool Create(wxWindow *parent, wxWindowID id, - const wxString& label = wxEmptyString, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); - +public: + wxButton() {} + wxButton(wxWindow *parent, + wxWindowID id, + const wxString& label = wxEmptyString, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxButtonNameStr) + { + Create(parent, id, label, pos, size, style, validator, name); + } + + bool Create(wxWindow *parent, + wxWindowID id, + const wxString& label = wxEmptyString, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = 0, + const wxValidator& validator = wxDefaultValidator, + const wxString& name = wxButtonNameStr); + virtual wxInt32 MacControlHit( WXEVENTHANDLERREF handler , WXEVENTREF event ) ; static wxSize GetDefaultSize(); - virtual void SetDefault(); - virtual void Command(wxCommandEvent& event); + virtual wxWindow *SetDefault(); + virtual void Command(wxCommandEvent& event); + protected: virtual wxSize DoGetBestSize() const ; + + DECLARE_DYNAMIC_CLASS(wxButton) }; #endif