Added wxCountingStream for measuring the size of streamed data

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

diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h
index bfabb1d0be2348c4743e7c38f643cb4dacea0313..af4fdac9ee02392f8af7f848758af0ff2b606b9f 100644 (file)
--- a/include/wx/gtk1/button.h
+++ b/include/wx/gtk1/button.h
@@ -2,7 +2,7 @@
 // Name:        button.h
 // Purpose:
 // Author:      Robert Roebling
-// Id:          $id$
+// Id:          $Id$
 // Copyright:   (c) 1998 Robert Roebling
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -30,7 +30,7 @@ class wxButton;
 // global data
 //-----------------------------------------------------------------------------
 
-extern const char *wxButtonNameStr;
+extern const wxChar *wxButtonNameStr;
 
 //-----------------------------------------------------------------------------
 // wxButton
@@ -42,7 +42,7 @@ class wxButton: public wxControl
 
   public:
 
-    wxButton(void);
+    wxButton();
     inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
            const wxSize& size = wxDefaultSize, long style = 0,
@@ -51,15 +51,21 @@ 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 );
+    bool Enable( bool enable );
+
+    static wxSize GetDefaultSize();
+    
+  // implementation        
+  
+    void ApplyWidgetStyle();    
 };
 
 #endif // __GTKBUTTONH__