X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..99c4be680622f58a48a04dfe0835b59d2c41afea:/include/wx/gtk/button.h diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h index 8c016d3b87..d04870f76e 100644 --- a/include/wx/gtk/button.h +++ b/include/wx/gtk/button.h @@ -4,81 +4,60 @@ // 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" -#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(); - 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(); - 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); + // 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_