X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/a81258bee4e20d3fa9b3d2f6bf3bcd1200d1e5e0..b76f0023ae275de2d71ed735a95d2ecb81d4ea74:/include/wx/gtk/button.h?ds=sidebyside

diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h
index 0b1d34d52e..5c90c03e24 100644
--- a/include/wx/gtk/button.h
+++ b/include/wx/gtk/button.h
@@ -1,17 +1,16 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        button.h
+// Name:        wx/gtk/button.h
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
-// Licence:   	wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKBUTTONH__
 #define __GTKBUTTONH__
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
 #pragma interface
 #endif
 
@@ -30,7 +29,7 @@ class wxButton;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char *wxButtonNameStr;
+extern const wxChar *wxButtonNameStr;
 
 //-----------------------------------------------------------------------------
 // wxButton
@@ -38,12 +37,9 @@ extern const char *wxButtonNameStr;
 
 class wxButton: public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxButton)
-
-  public:
-
-    wxButton(void);
-    inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
+public:
+    wxButton();
+    wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
@@ -51,17 +47,35 @@ class wxButton: public wxControl
     {
       Create(parent, id, label, pos, size, style, validator, name);
     }
+    virtual ~wxButton();
+
     bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
-    void SetDefault(void);
-    void SetLabel( const wxString &label );
-    void Enable( bool enable );
-    void SetFont( const wxFont &font );
-    void SetBackgroundColour( const wxColour &colour );
-    void SetForegroundColour( const wxColour &colour );
+
+    virtual void SetDefault();
+    virtual void SetLabel( const wxString &label );
+    virtual bool Enable( bool enable = TRUE );
+
+    static wxSize GetDefaultSize();
+
+    // implementation
+    // --------------
+
+    void ApplyWidgetStyle();
+    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; }
+    
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxButton)
 };
 
 #endif // __GTKBUTTONH__