Solved problem with wxhInstance name being mangled by MSVC; wxGetInstance is now...

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

diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h
index 2b8b262c968b4a2dc5b00a97709300fff2b76403..af4fdac9ee02392f8af7f848758af0ff2b606b9f 100644 (file)
--- a/include/wx/gtk1/button.h
+++ b/include/wx/gtk1/button.h
@@ -30,7 +30,7 @@ class wxButton;
 // global data
 //-----------------------------------------------------------------------------
 
 // global data
 //-----------------------------------------------------------------------------
 

-extern const char *wxButtonNameStr;
+extern const wxChar *wxButtonNameStr;

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


@@ -57,9 +57,11 @@ class wxButton: public wxControl
            const wxSize& size = wxDefaultSize, long style = 0,
            const wxValidator& validator = wxDefaultValidator,
            const wxString& name = wxButtonNameStr);
            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 SetLabel( const wxString &label );

-    void Enable( bool enable );
+    bool Enable( bool enable );
+
+    static wxSize GetDefaultSize();

     
   // implementation        
   
     
   // implementation