X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..b2c36e35494f0105f942069fa0d717b2d9a6fa36:/include/wx/motif/button.h?ds=sidebyside diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h index a0034575bc..0ac026222d 100644 --- a/include/wx/motif/button.h +++ b/include/wx/motif/button.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: button.h +// Name: wx/motif/button.h // Purpose: wxButton class // Author: Julian Smart // Modified by: @@ -13,10 +13,8 @@ #define _WX_BUTTON_H_ // Pushbutton -class WXDLLEXPORT wxButton: public wxButtonBase +class WXDLLIMPEXP_CORE wxButton: public wxButtonBase { - DECLARE_DYNAMIC_CLASS(wxButton) - public: wxButton() { } wxButton(wxWindow *parent, @@ -29,27 +27,31 @@ public: { Create(parent, id, label, pos, size, style, validator, name); } - + 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 void SetDefault(); + + virtual wxWindow *SetDefault(); virtual void Command(wxCommandEvent& event); - + static wxSize GetDefaultSize(); - + // Implementation -private: - virtual wxSize DoGetBestSize() const; virtual wxSize GetMinSize() const; + +protected: + virtual wxSize DoGetBestSize() const; + +private: wxSize OldGetBestSize() const; wxSize OldGetMinSize() const; void SetDefaultShadowThicknessAndResize(); + + DECLARE_DYNAMIC_CLASS(wxButton) }; -#endif -// _WX_BUTTON_H_ +#endif // _WX_BUTTON_H_