wxHelpController now wxCHMHelpController on Windows

[wxWidgets.git] / include / wx / mac / classic / button.h

diff --git a/include/wx/mac/classic/button.h b/include/wx/mac/classic/button.h
index 824f0a9e44de979157dbc57b95f36bb89a511340..b2afedf171f0af4cc932ac9b5f9c4c5c41942c3e 100644 (file)
--- a/include/wx/mac/classic/button.h
+++ b/include/wx/mac/classic/button.h
@@ -6,7 +6,7 @@
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor
 // Created:     1998-01-01
 // RCS-ID:      $Id$
 // Copyright:   (c) Stefan Csomor

-// Licence:     wxWidgets licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _WX_BUTTON_H_


@@ -27,7 +27,8 @@ class WXDLLEXPORT wxButton: public wxButtonBase
   DECLARE_DYNAMIC_CLASS(wxButton)
  public:
   inline wxButton() {}
   DECLARE_DYNAMIC_CLASS(wxButton)
  public:
   inline wxButton() {}

-  inline wxButton(wxWindow *parent, wxWindowID id, const wxString& label,
+  inline wxButton(wxWindow *parent, wxWindowID id,
+           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,


@@ -35,8 +36,9 @@ class WXDLLEXPORT wxButton: public wxButtonBase
   {
       Create(parent, id, label, pos, size, style, validator, name);
   }
   {
       Create(parent, id, label, pos, size, style, validator, name);
   }

-
-  bool Create(wxWindow *parent, wxWindowID id, const wxString& label,
+  
+  bool Create(wxWindow *parent, wxWindowID id,
+           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,