X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6540132fa1ee1b36c155ea39c84899e6beb2664e..5b0c31c300bc5cab3346afd38fb444a1c52a53ac:/src/common/fontenumcmn.cpp

diff --git a/src/common/fontenumcmn.cpp b/src/common/fontenumcmn.cpp
index f06fcf1269..aaae1543c4 100644
--- a/src/common/fontenumcmn.cpp
+++ b/src/common/fontenumcmn.cpp
@@ -24,6 +24,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_FONTENUM
+
 #include "wx/fontenum.h"
 
 // ============================================================================
@@ -72,3 +74,62 @@ wxArrayString wxFontEnumerator::GetEncodings(const wxString& facename)
     temp.EnumerateEncodings(facename);
     return temp.m_arrEncodings;
 }
+
+/* static */
+bool wxFontEnumerator::IsValidFacename(const wxString &facename)
+{
+    // we cache the result of wxFontEnumerator::GetFacenames supposing that
+    // the array of face names won't change in the session of this program
+    static wxArrayString s_arr = wxFontEnumerator::GetFacenames();
+
+#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 
+    //     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
+    if (facename.IsSameAs(wxT("Ms Shell Dlg"), false) ||
+        facename.IsSameAs(wxT("Ms Shell Dlg 2"), false))
+        return true;
+#endif
+
+    // is given font face name a valid one ?
+    if (s_arr.Index(facename, false) == wxNOT_FOUND)
+        return false;
+
+    return true;
+}
+
+#ifdef wxHAS_UTF8_FONTS
+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"));
+
+    // all fonts are in UTF-8 only if this code is used
+    if ( !facename.empty() )
+    {
+        OnFontEncoding(facename, utf8);
+        return true;
+    }
+
+    // so enumerating all facenames supporting this encoding is the same as
+    // enumerating all facenames
+    const wxArrayString facenames(GetFacenames(wxFONTENCODING_UTF8));
+    const size_t count = facenames.size();
+    if ( !count )
+        return false;
+
+    for ( size_t n = 0; n < count; n++ )
+    {
+        OnFontEncoding(facenames[n], utf8);
+    }
+
+    return true;
+}
+#endif // wxHAS_UTF8_FONTS
+
+#endif // wxUSE_FONTENUM