Better support for unspecified property value in wxDateProperty and DatePickerCtrl...

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

diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h
index a395a617ca8e34a25264092482778af38240e64f..d04870f76e132c846c5c164eb0cd39e13e970a93 100644 (file)
--- a/include/wx/gtk/button.h
+++ b/include/wx/gtk/button.h
@@ -7,25 +7,8 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifndef __GTKBUTTONH__
-#define __GTKBUTTONH__
-
-#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[];
+#ifndef _WX_GTK_BUTTON_H_
+#define _WX_GTK_BUTTON_H_

 
 //-----------------------------------------------------------------------------
 // wxButton
 
 //-----------------------------------------------------------------------------
 // wxButton


@@ -54,19 +37,13 @@ public:
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
 
            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 );
 
     // implementation
     // --------------
 
     virtual void SetLabel( const wxString &label );
     virtual bool Enable( bool enable = TRUE );
 
     // implementation
     // --------------
 

-    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);
 
     static wxVisualAttributes
     GetClassDefaultAttributes(wxWindowVariant variant = wxWINDOW_VARIANT_NORMAL);
 


@@ -75,10 +52,12 @@ public:
 
 protected:
     virtual wxSize DoGetBestSize() const;
 
 protected:
     virtual wxSize DoGetBestSize() const;

-    void DoApplyWidgetStyle(GtkRcStyle *style);
+    virtual void DoApplyWidgetStyle(GtkRcStyle *style);
+
+    virtual GdkWindow *GTKGetWindow(wxArrayGdkWindows& windows) const;

 
 private:
     DECLARE_DYNAMIC_CLASS(wxButton)
 };
 
 
 private:
     DECLARE_DYNAMIC_CLASS(wxButton)
 };
 

-#endif // __GTKBUTTONH__
+#endif // _WX_GTK_BUTTON_H_