Blind wxTinderbox fix.

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

diff --git a/include/wx/cocoa/button.h b/include/wx/cocoa/button.h
index b0ecb12f7a251e1ff77aafe52479084aa9408e14..84acb8607f0ca63643cf558be0461e4b6fadcea5 100644 (file)
--- a/include/wx/cocoa/button.h
+++ b/include/wx/cocoa/button.h
@@ -28,7 +28,7 @@ class WXDLLEXPORT wxButton : public wxButtonBase, protected wxCocoaNSButton
 public:
    wxButton() { }
    wxButton(wxWindow *parent, wxWindowID winid,
 public:
    wxButton() { }
    wxButton(wxWindow *parent, wxWindowID winid,

-             const wxString& label,
+             const wxString& label = wxEmptyString,

              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize, long style = 0,
              const wxValidator& validator = wxDefaultValidator,
              const wxPoint& pos = wxDefaultPosition,
              const wxSize& size = wxDefaultSize, long style = 0,
              const wxValidator& validator = wxDefaultValidator,


@@ -37,34 +37,14 @@ public:
         Create(parent, winid, label, pos, size, style, validator, name);
     }
     
         Create(parent, winid, label, pos, size, style, validator, name);
     }
     

-    wxButton(wxWindow *parent, wxWindowID winid, wxStockItemID stock,
-           const wxString& descriptiveLabel = wxEmptyString,
-           const wxPoint& pos = wxDefaultPosition,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr)
-    {
-        Create(parent, winid, stock, descriptiveLabel, pos, style, validator, name);
-    }

 
     bool Create(wxWindow *parent, wxWindowID winid,
 
     bool Create(wxWindow *parent, wxWindowID winid,

-            const wxString& label,
+            const wxString& label = wxEmptyString,

             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxButtonNameStr);
     
             const wxPoint& pos = wxDefaultPosition,
             const wxSize& size = wxDefaultSize, long style = 0,
             const wxValidator& validator = wxDefaultValidator,
             const wxString& name = wxButtonNameStr);
     

-    bool Create(wxWindow *parent, wxWindowID winid, wxStockItemID stock,
-           const wxString& descriptiveLabel = wxEmptyString,
-           const wxPoint& pos = wxDefaultPosition,
-           long style = 0,
-           const wxValidator& validator = wxDefaultValidator,
-           const wxString& name = wxButtonNameStr)
-    {
-        return CreateStock(parent, winid, stock, descriptiveLabel,
-                           pos, style, validator, name);
-    }
-    

     virtual ~wxButton();
 
 // ------------------------------------------------------------------------
     virtual ~wxButton();
 
 // ------------------------------------------------------------------------


@@ -78,6 +58,7 @@ protected:
 public:
     wxString GetLabel() const;
     void SetLabel(const wxString& label);
 public:
     wxString GetLabel() const;
     void SetLabel(const wxString& label);

+    wxSize DoGetBestSize() const;

 };
 
 #endif // __WX_COCOA_BUTTON_H__
 };
 
 #endif // __WX_COCOA_BUTTON_H__