replace changes of r49890 by defining more compatibility operators in wxCmdLineArgsAr...

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

diff --git a/include/wx/cocoa/button.h b/include/wx/cocoa/button.h
index b0ecb12f7a251e1ff77aafe52479084aa9408e14..aefc9d13696943a734aab352228079ea64c4acf0 100644 (file)
--- a/include/wx/cocoa/button.h
+++ b/include/wx/cocoa/button.h
@@ -4,9 +4,9 @@
 // Author:      David Elliott
 // Modified by:
 // Created:     2002/12/29
-// RCS-ID:      $Id: 
+// RCS-ID:      $Id$
 // Copyright:   (c) 2002 David Elliott
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_BUTTON_H__
@@ -28,7 +28,7 @@ class WXDLLEXPORT wxButton : public wxButtonBase, protected wxCocoaNSButton
 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,
@@ -36,35 +36,15 @@ public:
     {
         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,
-            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);
-    
-    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();
 
 // ------------------------------------------------------------------------
@@ -78,6 +58,8 @@ protected:
 public:
     wxString GetLabel() const;
     void SetLabel(const wxString& label);
+    wxSize DoGetBestSize() const;
 };
 
-#endif // __WX_COCOA_BUTTON_H__
+#endif
+    // __WX_COCOA_BUTTON_H__