X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/738f9e5a12b8bb3936cc10347be98390602d3660..3b49331b7441e091fc5997b830801d76a1243f28:/include/wx/gtk/button.h diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h index 051c16637c..190805702d 100644 --- a/include/wx/gtk/button.h +++ b/include/wx/gtk/button.h @@ -1,70 +1,67 @@ ///////////////////////////////////////////////////////////////////////////// -// 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__ -#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; +#ifndef _WX_GTK_BUTTON_H_ +#define _WX_GTK_BUTTON_H_ //----------------------------------------------------------------------------- // wxButton //----------------------------------------------------------------------------- -class wxButton: public wxControl +class WXDLLIMPEXP_CORE wxButton: public wxButtonBase { public: wxButton(); - inline 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); } - ~wxButton(); - bool Create(wxWindow *parent, wxWindowID id, const wxString& label, + + virtual ~wxButton(); + + 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(); - void SetLabel( const wxString &label ); - bool Enable( bool enable ); - static wxSize GetDefaultSize(); - - // implementation - - void ApplyWidgetStyle(); - + virtual wxWindow *SetDefault(); + virtual void SetLabel( const wxString &label ); + virtual bool Enable( bool enable = TRUE ); + + // implementation + // -------------- + + // 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); + + // helper to allow access to protected member from GTK callback + void MoveWindow(int x, int y, int width, int height) { DoMoveWindow(x, y, width, height); } + +protected: + virtual wxSize DoGetBestSize() const; + virtual void DoApplyWidgetStyle(GtkRcStyle *style); + + virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const; + private: DECLARE_DYNAMIC_CLASS(wxButton) }; -#endif // __GTKBUTTONH__ +#endif // _WX_GTK_BUTTON_H_