X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0d57be459406c2830f6abc9d99ae99166c6d133b..1fb4de3138151a34ea2653107c08386e3a1236bf:/include/wx/motif/button.h?ds=sidebyside diff --git a/include/wx/motif/button.h b/include/wx/motif/button.h index bbfbb3bed2..c872066bb9 100644 --- a/include/wx/motif/button.h +++ b/include/wx/motif/button.h @@ -6,14 +6,14 @@ // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_BUTTON_H_ #define _WX_BUTTON_H_ #ifdef __GNUG__ -#pragma interface "button.h" + #pragma interface "button.h" #endif #include "wx/control.h" @@ -24,31 +24,36 @@ WXDLLEXPORT_DATA(extern const char*) wxButtonNameStr; // Pushbutton class WXDLLEXPORT wxButton: public wxControl { - DECLARE_DYNAMIC_CLASS(wxButton) - public: - inline wxButton() {} - inline 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) - { - 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); - - virtual void SetDefault(); - virtual void Command(wxCommandEvent& event); - -// Implementation - virtual void ChangeFont(); - virtual void ChangeBackgroundColour(); - virtual void ChangeForegroundColour(); + 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) + { + 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); + + virtual void SetDefault(); + virtual void Command(wxCommandEvent& event); + + static wxSize GetDefaultSize(); + + // Implementation + virtual void ChangeFont(bool keepOriginalSize = TRUE); + virtual void ChangeBackgroundColour(); + virtual void ChangeForegroundColour(); }; #endif