X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/336a6aba60f239bfc33650ffe97702494940a4f6..02e05e7e4087243171de25b598e701229814b821:/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 713b93da96..c4abaea100 100644 --- a/include/wx/mac/carbon/button.h +++ b/include/wx/mac/carbon/button.h @@ -12,14 +12,10 @@ #ifndef _WX_BUTTON_H_ #define _WX_BUTTON_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "button.h" -#endif - #include "wx/control.h" #include "wx/gdicmn.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxButtonNameStr; +WXDLLEXPORT_DATA(extern const wxChar) wxButtonNameStr[]; // Pushbutton class WXDLLEXPORT wxButton: public wxButtonBase @@ -27,7 +23,8 @@ class WXDLLEXPORT wxButton: public wxButtonBase DECLARE_DYNAMIC_CLASS(wxButton) public: inline wxButton() {} - inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label, + 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, @@ -36,12 +33,13 @@ class WXDLLEXPORT wxButton: public wxButtonBase Create(parent, id, label, pos, size, style, validator, name); } - bool Create(wxWindow *parent, wxWindowID id, const wxString& label, + 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();