X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/db434467a143a2c847c4bcfe987f0202c2d02bf2..85b43fbf7a512ea49cf491320c458bec705762ed:/include/wx/gtk1/button.h diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h index c239f5b7a1..5b895a059e 100644 --- a/include/wx/gtk1/button.h +++ b/include/wx/gtk1/button.h @@ -1,16 +1,16 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: button.h +// Name: wx/gtk/button.h // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __GTKBUTTONH__ #define __GTKBUTTONH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -39,7 +39,7 @@ class wxButton: public wxControl { public: wxButton(); - inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label, + wxButton(wxWindow *parent, wxWindowID id, const wxString& label, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = 0, const wxValidator& validator = wxDefaultValidator, @@ -47,23 +47,26 @@ public: { Create(parent, id, label, pos, size, style, validator, name); } - ~wxButton(); + virtual ~wxButton(); + 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(); - void SetLabel( const wxString &label ); - bool Enable( bool enable ); + virtual void SetLabel( const wxString &label ); + virtual bool Enable( bool enable = TRUE ); static wxSize GetDefaultSize(); - + // implementation // -------------- - - void ApplyWidgetStyle(); - + + void ApplyWidgetStyle(); + bool IsOwnGtkWindow( GdkWindow *window ); + protected: virtual wxSize DoGetBestSize() const;