X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/20123d495814b8b8543bf43fbd63aa7ec21e5d78..8e77fd8bca165aab9709649d79a7cbc6a172d4e1:/include/wx/gtk1/button.h?ds=sidebyside diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h index e0d5e0d0ee..a9b753f093 100644 --- a/include/wx/gtk1/button.h +++ b/include/wx/gtk1/button.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/gtk/button.h +// Name: wx/gtk1/button.h // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -10,26 +10,9 @@ #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 WXDLLIMPEXP_CORE wxButton; - -//----------------------------------------------------------------------------- -// global data -//----------------------------------------------------------------------------- - -extern WXDLLIMPEXP_CORE const wxChar *wxButtonNameStr; //----------------------------------------------------------------------------- // wxButton @@ -58,7 +41,7 @@ public: 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 ); @@ -71,7 +54,7 @@ public: // 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);