X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b6af8d80dcdd9d7ef9cca3aaaaf8fe4db343d7ae..ef094fa075bc56bcbc33b12159c395ea28afda3b:/include/wx/gtk/button.h diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h index c423cc21fb..5b895a059e 100644 --- a/include/wx/gtk/button.h +++ b/include/wx/gtk/button.h @@ -1,18 +1,16 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: button.h +// Name: wx/gtk/button.h // Purpose: // Author: Robert Roebling -// Created: 01/02/97 -// Id: -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem -// Licence: wxWindows licence +// Id: $Id$ +// Copyright: (c) 1998 Robert Roebling +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - #ifndef __GTKBUTTONH__ #define __GTKBUTTONH__ -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(__APPLE__) #pragma interface #endif @@ -31,7 +29,7 @@ class wxButton; // global data //----------------------------------------------------------------------------- -extern const char *wxButtonNameStr; +extern const wxChar *wxButtonNameStr; //----------------------------------------------------------------------------- // wxButton @@ -39,19 +37,41 @@ extern const char *wxButtonNameStr; class wxButton: public wxControl { - DECLARE_DYNAMIC_CLASS(wxButton) - - public: - - wxButton(void); - wxButton( wxWindow *parent, wxWindowID id, const wxString &label, - const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, - long style = 0, const wxString &name = wxButtonNameStr ); - bool Create( wxWindow *parent, wxWindowID id, const wxString &label, - const wxPoint &pos = wxDefaultPosition, const wxSize &size = wxDefaultSize, - long style = 0, const wxString &name = wxButtonNameStr ); - void SetDefault(void); - void SetLabel( const wxString &label ); +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); + } + 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(); + virtual void SetLabel( const wxString &label ); + virtual bool Enable( bool enable = TRUE ); + + static wxSize GetDefaultSize(); + + // implementation + // -------------- + + void ApplyWidgetStyle(); + bool IsOwnGtkWindow( GdkWindow *window ); + +protected: + virtual wxSize DoGetBestSize() const; + +private: + DECLARE_DYNAMIC_CLASS(wxButton) }; #endif // __GTKBUTTONH__