X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bf3c1a19629a458c4adb72f6176a119c7f8dea90..029a401d74c00ce86f485fafeda73520d315fb0f:/include/wx/motif/button.h?ds=sidebyside diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h index 5735b60555..29d201e111 100644 --- a/include/wx/motif/button.h +++ b/include/wx/motif/button.h @@ -1,10 +1,9 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: button.h +// Name: wx/motif/button.h // Purpose: wxButton class // Author: Julian Smart // Modified by: // Created: 17/09/98 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -13,10 +12,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,31 +26,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 -protected: + virtual wxSize GetMinSize() const; +protected: virtual wxSize DoGetBestSize() const; private: - - virtual wxSize GetMinSize() const; wxSize OldGetBestSize() const; wxSize OldGetMinSize() const; void SetDefaultShadowThicknessAndResize(); + + DECLARE_DYNAMIC_CLASS(wxButton) }; -#endif -// _WX_BUTTON_H_ +#endif // _WX_BUTTON_H_