added wxConvFileName which is a variable, not define as wxConvFile; added comments...

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

diff --git a/include/wx/cocoa/button.h b/include/wx/cocoa/button.h
index 0cf3f2df6db75aec2f83210bf1b787a2106970b0..84acb8607f0ca63643cf558be0461e4b6fadcea5 100644 (file)
--- a/include/wx/cocoa/button.h
+++ b/include/wx/cocoa/button.h
@@ -6,7 +6,7 @@
 // Created:     2002/12/29
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2002 David Elliott
 // Created:     2002/12/29
 // RCS-ID:      $Id: 
 // Copyright:   (c) 2002 David Elliott

-// Licence:    wxWindows license
+// Licence:    wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __WX_COCOA_BUTTON_H__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef __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,


@@ -36,13 +36,15 @@ public:
     {
         Create(parent, winid, label, pos, size, style, validator, name);
     }
     {
         Create(parent, winid, label, pos, size, 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);

+    

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


@@ -56,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__