X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/31528cd3cac75558beef4bce0ba21fd182a808ab..bb8bd6ef8a5b96c74f47ebe73a2fa877900ed67f:/include/wx/motif/button.h?ds=sidebyside diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h index 13fe4ecf90..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,47 +12,48 @@ #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 WXDLLEXPORT wxButton: public wxButtonBase { DECLARE_DYNAMIC_CLASS(wxButton) public: wxButton() { } wxButton(wxWindow *parent, - wxWindowID id, - const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr) + 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) { Create(parent, id, label, pos, size, style, validator, name); } - bool Create(wxWindow *parent, wxWindowID id, const wxString& label, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, long style = 0, - const wxValidator& validator = wxDefaultValidator, - const wxString& name = wxButtonNameStr); + 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 - virtual void ChangeFont(bool keepOriginalSize = TRUE); - virtual void ChangeBackgroundColour(); - virtual void ChangeForegroundColour(); +protected: + + virtual wxSize DoGetBestSize() const; + +private: + + virtual wxSize GetMinSize() const; + wxSize OldGetBestSize() const; + wxSize OldGetMinSize() const; + void SetDefaultShadowThicknessAndResize(); }; #endif - // _WX_BUTTON_H_ +// _WX_BUTTON_H_