s/Chiniese/Chinese/g

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

diff --git a/include/wx/gtk1/button.h b/include/wx/gtk1/button.h
index af4fdac9ee02392f8af7f848758af0ff2b606b9f..c239f5b7a1f48b6db22e6987643277291cc7e0e8 100644 (file)
--- a/include/wx/gtk1/button.h
+++ b/include/wx/gtk1/button.h
@@ -7,7 +7,6 @@
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-

 #ifndef __GTKBUTTONH__
 #define __GTKBUTTONH__
 
 #ifndef __GTKBUTTONH__
 #define __GTKBUTTONH__
 


@@ -38,10 +37,7 @@ extern const wxChar *wxButtonNameStr;
 
 class wxButton: public wxControl
 {
 
 class wxButton: public wxControl
 {

-  DECLARE_DYNAMIC_CLASS(wxButton)
-
-  public:
-
+public:

     wxButton();
     inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos = wxDefaultPosition,
     wxButton();
     inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
            const wxPoint& pos = wxDefaultPosition,


@@ -63,9 +59,16 @@ class wxButton: public wxControl
 
     static wxSize GetDefaultSize();
     
 
     static wxSize GetDefaultSize();
     

-  // implementation        
+    // implementation
+    // --------------

   
     void ApplyWidgetStyle();    
   
     void ApplyWidgetStyle();    

+    
+protected:
+    virtual wxSize DoGetBestSize() const;
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxButton)

 };
 
 #endif // __GTKBUTTONH__
 };
 
 #endif // __GTKBUTTONH__