X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/655719367ac5e131d9642e5783f3ecf64d1a3385..7c508bca835368f8082791d69dcf7a6db4dba61c:/include/wx/mac/classic/button.h diff --git a/include/wx/mac/classic/button.h b/include/wx/mac/classic/button.h index 23e9044f00..9b6eea1a4c 100644 --- a/include/wx/mac/classic/button.h +++ b/include/wx/mac/classic/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, @@ -35,8 +32,9 @@ 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,