X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ff42758536f8d573409bf6c35528497ba36b4d0e..bf2c43c76e2819be443ab1d830ab68d9569d66b1:/src/common/fontenumcmn.cpp diff --git a/src/common/fontenumcmn.cpp b/src/common/fontenumcmn.cpp index aaae1543c4..1185a864ab 100644 --- a/src/common/fontenumcmn.cpp +++ b/src/common/fontenumcmn.cpp @@ -4,7 +4,6 @@ // Author: Vadim Zeitlin // Modified by: // Created: 7/5/2006 -// RCS-ID: $Id$ // Copyright: (c) 1999-2003 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -84,12 +83,12 @@ bool wxFontEnumerator::IsValidFacename(const wxString &facename) #ifdef __WXMSW__ // Quoting the MSDN: - // "MS Shell Dlg is a mapping mechanism that enables - // U.S. English Microsoft Windows NT, and Microsoft Windows 2000 to - // support locales that have characters that are not contained in code + // "MS Shell Dlg is a mapping mechanism that enables + // U.S. English Microsoft Windows NT, and Microsoft Windows 2000 to + // support locales that have characters that are not contained in code // page 1252. It is not a font but a face name for a nonexistent font." // Thus we need to consider "Ms Shell Dlg" and "Ms Shell Dlg 2" as valid - // font face names even if they are enumerated by wxFontEnumerator + // font face names even if they are not enumerated by wxFontEnumerator if (facename.IsSameAs(wxT("Ms Shell Dlg"), false) || facename.IsSameAs(wxT("Ms Shell Dlg 2"), false)) return true; @@ -107,7 +106,7 @@ bool wxFontEnumerator::EnumerateEncodingsUTF8(const wxString& facename) { // name of UTF-8 encoding: no need to use wxFontMapper for it as it's // unlikely to change - const wxString utf8(_T("UTF-8")); + const wxString utf8(wxT("UTF-8")); // all fonts are in UTF-8 only if this code is used if ( !facename.empty() )