Distrib changes.

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

diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h
index 0b1d34d52e2b866302edb40813d2ce080062f818..051c16637cd4fe1c43566044ddf16ab44724acac 100644 (file)
--- a/include/wx/gtk1/button.h
+++ b/include/wx/gtk1/button.h
@@ -7,7 +7,6 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-
 #ifndef __GTKBUTTONH__
 #define __GTKBUTTONH__
 
@@ -30,7 +29,7 @@ class wxButton;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char *wxButtonNameStr;
+extern const wxChar *wxButtonNameStr;
 
 //-----------------------------------------------------------------------------
 // wxButton
@@ -38,11 +37,8 @@ extern const char *wxButtonNameStr;
 
 class wxButton: public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxButton)
-
-  public:
-
-    wxButton(void);
+public:
+    wxButton();
     inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
@@ -51,17 +47,24 @@ class wxButton: public wxControl
     {
       Create(parent, id, label, pos, size, style, validator, name);
     }
+    ~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);
+    virtual void SetDefault();
     void SetLabel( const wxString &label );
-    void Enable( bool enable );
-    void SetFont( const wxFont &font );
-    void SetBackgroundColour( const wxColour &colour );
-    void SetForegroundColour( const wxColour &colour );
+    bool Enable( bool enable );
+
+    static wxSize GetDefaultSize();
+    
+  // implementation        
+  
+    void ApplyWidgetStyle();    
+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxButton)
 };
 
 #endif // __GTKBUTTONH__