X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5f7bcb48fd9a642036a3bf5c70e2b0c9576df1b1..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/gtk1/button.h diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h index 0d1c3110c7..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 ///////////////////////////////////////////////////////////////////////////// @@ -10,32 +9,15 @@ #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; //----------------------------------------------------------------------------- // wxButton //----------------------------------------------------------------------------- -class wxButton: public wxButtonBase +class WXDLLIMPEXP_CORE wxButton: public wxButtonBase { public: wxButton(); @@ -58,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 ); @@ -71,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);