X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..a596eeb93f525c64d374f49e5986c57d1ea124a7:/include/wx/gtk1/button.h diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h index 8c016d3b87..f3d0169639 100644 --- a/include/wx/gtk1/button.h +++ b/include/wx/gtk1/button.h @@ -1,19 +1,15 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/button.h +// Name: wx/gtk1/button.h // Purpose: // Author: Robert Roebling // Id: $Id$ // Copyright: (c) 1998 Robert Roebling -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef __GTKBUTTONH__ #define __GTKBUTTONH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/list.h" @@ -23,54 +19,55 @@ // classes //----------------------------------------------------------------------------- -class wxButton; +class WXDLLIMPEXP_FWD_CORE wxButton; //----------------------------------------------------------------------------- // global data //----------------------------------------------------------------------------- -extern const wxChar *wxButtonNameStr; +extern WXDLLIMPEXP_CORE 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);