X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fb896a322a2ed53d393ee738765ddd3f72cee004..6968a3b87cee46f5c5af9b46e1ef97f17133cef7:/include/wx/cocoa/button.h diff --git a/include/wx/cocoa/button.h b/include/wx/cocoa/button.h index 748bd0cb1e..91a44f0120 100644 --- a/include/wx/cocoa/button.h +++ b/include/wx/cocoa/button.h @@ -4,9 +4,9 @@ // Author: David Elliott // Modified by: // Created: 2002/12/29 -// RCS-ID: $Id: +// RCS-ID: $Id$ // Copyright: (c) 2002 David Elliott -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __WX_COCOA_BUTTON_H__ @@ -17,7 +17,7 @@ // ======================================================================== // wxButton // ======================================================================== -class WXDLLEXPORT wxButton : public wxButtonBase, protected wxCocoaNSButton +class WXDLLIMPEXP_CORE wxButton : public wxButtonBase, protected wxCocoaNSButton { DECLARE_DYNAMIC_CLASS(wxButton) DECLARE_EVENT_TABLE() @@ -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,12 +37,14 @@ public: Create(parent, winid, label, pos, size, 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); + virtual ~wxButton(); // ------------------------------------------------------------------------ @@ -54,6 +56,10 @@ protected: // Implementation // ------------------------------------------------------------------------ public: + wxString GetLabel() const; + void SetLabel(const wxString& label); + wxSize DoGetBestSize() const; }; -#endif // __WX_COCOA_BUTTON_H__ +#endif + // __WX_COCOA_BUTTON_H__