X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83df96d63a52ebb08b9e32549dc255354b4a18d0..a4301b8f14d21b7d28fc4f6a247b740d945ca6dc:/include/wx/motif/button.h diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h index dc69dceae7..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: @@ -12,25 +12,14 @@ #ifndef _WX_BUTTON_H_ #define _WX_BUTTON_H_ -#ifdef __GNUG__ -#pragma interface "button.h" -#endif - -#include "wx/control.h" -#include "wx/gdicmn.h" - -WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr; - // Pushbutton -class WXDLLEXPORT wxButton: public wxControl +class WXDLLIMPEXP_CORE 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, @@ -38,23 +27,31 @@ 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 wxWindow *SetDefault(); virtual void Command(wxCommandEvent& event); - + static wxSize GetDefaultSize(); - + // Implementation - virtual void ChangeFont(bool keepOriginalSize = TRUE); - virtual void ChangeBackgroundColour(); - virtual void ChangeForegroundColour(); + 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_