X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a63b009834eb4cc25c0029b5f1040361d2ac3d23..ce4b7808ca940be201422a066de141ca12f13863:/include/wx/motif/button.h diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h index dd046850d8..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,22 +12,16 @@ #ifndef _WX_BUTTON_H_ #define _WX_BUTTON_H_ -#ifdef __GNUG__ -#pragma interface "button.h" -#endif - -WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr; - // Pushbutton class WXDLLEXPORT wxButton: public wxButtonBase { DECLARE_DYNAMIC_CLASS(wxButton) - + public: wxButton() { } wxButton(wxWindow *parent, wxWindowID id, - const wxString& label, + const wxString& label = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, @@ -35,21 +29,29 @@ public: { Create(parent, id, label, pos, size, style, validator, name); } - - bool Create(wxWindow *parent, wxWindowID id, const wxString& label, + + 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; void SetDefaultShadowThicknessAndResize(); };