fixed wxXmlResource::Load's detection of filenames to be done as early as possible

[wxWidgets.git] / src / common / fontenumcmn.cpp

diff --git a/src/common/fontenumcmn.cpp b/src/common/fontenumcmn.cpp
index fb57dd9104bab4a173b26d4319fa1f1538ac7910..aaae1543c403f8b0a77e16b4336da6e702b9e61f 100644 (file)
--- a/src/common/fontenumcmn.cpp
+++ b/src/common/fontenumcmn.cpp
@@ -24,6 +24,8 @@
     #pragma hdrstop
 #endif
 
+#if wxUSE_FONTENUM
+
 #include "wx/fontenum.h"
 
 // ============================================================================
@@ -100,3 +102,34 @@ bool wxFontEnumerator::IsValidFacename(const wxString &facename)
     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