X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4e025aa20625c8724a2250b9455a8007fb86337e..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/motif/button.h diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h index 20978e6ae0..583578d668 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: @@ -12,15 +12,11 @@ #ifndef _WX_BUTTON_H_ #define _WX_BUTTON_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "button.h" -#endif - // Pushbutton class WXDLLEXPORT wxButton: public wxButtonBase { DECLARE_DYNAMIC_CLASS(wxButton) - + public: wxButton() { } wxButton(wxWindow *parent, @@ -33,22 +29,26 @@ 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 void Command(wxCommandEvent& event); - + static wxSize GetDefaultSize(); - + // Implementation -private: +protected: + virtual wxSize DoGetBestSize() const; + +private: + virtual wxSize GetMinSize() const; wxSize OldGetBestSize() const; wxSize OldGetMinSize() const;