X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd0eed647daeb257f28699de879d2f4f5aeb7fb6..22e90769f8da73d398bd7da83f185263a292972f:/include/wx/gtk/button.h diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h index 2b8b262c96..c239f5b7a1 100644 --- a/include/wx/gtk/button.h +++ b/include/wx/gtk/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,10 +37,7 @@ extern const char *wxButtonNameStr; class wxButton: public wxControl { - DECLARE_DYNAMIC_CLASS(wxButton) - - public: - +public: wxButton(); inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, @@ -57,13 +53,22 @@ class wxButton: public wxControl const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, const wxString& name = wxButtonNameStr); - void SetDefault(); + virtual void SetDefault(); void SetLabel( const wxString &label ); - void Enable( bool enable ); + bool Enable( bool enable ); + + static wxSize GetDefaultSize(); - // implementation + // implementation + // -------------- void ApplyWidgetStyle(); + +protected: + virtual wxSize DoGetBestSize() const; + +private: + DECLARE_DYNAMIC_CLASS(wxButton) }; #endif // __GTKBUTTONH__