X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63ec432bd7b9c93961e85e871bcb31758364a634..3d777efedc1e05bd6c2a7c34a00a65895b62bb13:/include/wx/gtk1/button.h?ds=sidebyside diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h index 95c74f0da3..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 ///////////////////////////////////////////////////////////////////////////// @@ -13,19 +12,6 @@ #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 @@ -54,7 +40,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 ); @@ -67,7 +53,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);