X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/58614078c466cffaf0e5d0369741706f130fb793..6e264973e636cc41915d166cb7eddf2a7e72cf9b:/include/wx/gtk1/button.h diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h index 45f0c1b4ae..c239f5b7a1 100644 --- a/include/wx/gtk1/button.h +++ b/include/wx/gtk1/button.h @@ -7,7 +7,6 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKBUTTONH__ #define __GTKBUTTONH__ @@ -30,7 +29,7 @@ class wxButton; // global data //----------------------------------------------------------------------------- -extern const char *wxButtonNameStr; +extern const wxChar *wxButtonNameStr; //----------------------------------------------------------------------------- // wxButton @@ -38,11 +37,8 @@ extern const char *wxButtonNameStr; class wxButton: public wxControl { - DECLARE_DYNAMIC_CLASS(wxButton) - - public: - - wxButton(void); +public: + wxButton(); inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, @@ -51,19 +47,28 @@ class wxButton: public wxControl { Create(parent, id, label, pos, size, style, validator, name); } + ~wxButton(); bool Create(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - void SetDefault(void); + virtual void SetDefault(); void SetLabel( const wxString &label ); - void Enable( bool enable ); + bool Enable( bool enable ); - // implementation + static wxSize GetDefaultSize(); + + // implementation + // -------------- void ApplyWidgetStyle(); +protected: + virtual wxSize DoGetBestSize() const; + +private: + DECLARE_DYNAMIC_CLASS(wxButton) }; #endif // __GTKBUTTONH__