Refactor wxEventLoopSource-related code.

[wxWidgets.git] / include / wx / gtk1 / button.h

diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h
index 95c74f0da3005e89afb9f74d22f3952ce8f881eb..a9b753f0938af46c950d666968c84898c0fb8a79 100644 (file)
--- 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$
@@ -13,19 +13,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 +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 );
 
@@ -67,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);