X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ab7ce33c563651f790f99d64ee56727706047ae3..3d777efedc1e05bd6c2a7c34a00a65895b62bb13:/include/wx/gtk1/button.h?ds=sidebyside diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h index f6d0a48857..d7909905d4 100644 --- a/include/wx/gtk1/button.h +++ b/include/wx/gtk1/button.h @@ -1,8 +1,7 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/button.h +// Name: wx/gtk1/button.h // Purpose: // Author: Robert Roebling -// Id: $Id$ // Copyright: (c) 1998 Robert Roebling // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -10,61 +9,53 @@ #ifndef __GTKBUTTONH__ #define __GTKBUTTONH__ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/list.h" -#include "wx/control.h" - -//----------------------------------------------------------------------------- -// classes -//----------------------------------------------------------------------------- - -class wxButton; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern const wxChar *wxButtonNameStr; //----------------------------------------------------------------------------- // wxButton //----------------------------------------------------------------------------- -class wxButton: public wxControl +class WXDLLIMPEXP_CORE wxButton: public wxButtonBase { public: wxButton(); - wxButton(wxWindow *parent, wxWindowID id, const wxString& label, + wxButton(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) { - Create(parent, id, label, pos, size, style, validator, name); + Create(parent, id, label, pos, size, style, validator, name); } + virtual ~wxButton(); - 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 SetLabel( const wxString &label ); virtual bool Enable( bool enable = TRUE ); - static wxSize GetDefaultSize(); - // implementation // -------------- - void ApplyWidgetStyle(); + void DoApplyWidgetStyle(GtkRcStyle *style); + bool IsOwnGtkWindow( GdkWindow *window ); + + // Since this wxButton doesn't derive from wxButtonBase (why?) we need + // to override this here too... + virtual bool ShouldInheritColours() const { return false; } + + static wxVisualAttributes + GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL); protected: virtual wxSize DoGetBestSize() const;