1. wxMotif::wxFrame derives from wxFrameBase now

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

diff --git a/include/wx/gtk/button.h b/include/wx/gtk/button.h
index 2b8b262c968b4a2dc5b00a97709300fff2b76403..538720c63cb5fa553497fd09d9ea0ffe572c9419 100644 (file)
--- a/include/wx/gtk/button.h
+++ b/include/wx/gtk/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,10 +37,7 @@ extern const char *wxButtonNameStr;
 
 class wxButton: public wxControl
 {
-  DECLARE_DYNAMIC_CLASS(wxButton)
-
-  public:
-
+public:
     wxButton();
     inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
@@ -57,13 +53,19 @@ class wxButton: public wxControl
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
-    void SetDefault();
+    virtual void SetDefault();
     void SetLabel( const wxString &label );
-    void Enable( bool enable );
+    bool Enable( bool enable );
+
+    static wxSize GetDefaultSize();
     
-  // implementation        
+    // implementation
+    // --------------
   
     void ApplyWidgetStyle();    
+    
+private:
+    DECLARE_DYNAMIC_CLASS(wxButton)
 };
 
 #endif // __GTKBUTTONH__