Merge in from trunk r64802 - r68625

[wxWidgets.git] / interface / wx / fontenum.h

diff --git a/interface/wx/fontenum.h b/interface/wx/fontenum.h
index ad31d2e5244d69bfd7aae584de5a2a9ba71e5534..15763d5ebff24552075b11be57edcc29c70f5e43 100644 (file)
--- a/interface/wx/fontenum.h
+++ b/interface/wx/fontenum.h
@@ -3,7 +3,7 @@
 // Purpose:     interface of wxFontEnumerator
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
@@ -56,7 +56,7 @@ public:
         Return array of strings containing all encodings found by
         EnumerateEncodings().
     */
-    static wxArrayString GetEncodings(const wxString& facename = "");
+    static wxArrayString GetEncodings(const wxString& facename = wxEmptyString);
 
     /**
         Return array of strings containing all facenames found by