bug #103 (encodings not enumerated correctly) fixed
authorVadim Zeitlin <vadim@wxwidgets.org>
Tue, 22 Aug 2000 10:06:37 +0000 (10:06 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Tue, 22 Aug 2000 10:06:37 +0000 (10:06 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/fontenum.cpp

index 1747efcaaf281aae971e88e2141e360f724c71bf..b547ec12f4889cd7b0fac74f3644e49e8e0f3206 100644 (file)
@@ -104,7 +104,7 @@ int CALLBACK wxFontEnumeratorProc(LPLOGFONT lplf, LPTEXTMETRIC lptm,
 wxFontEnumeratorHelper::wxFontEnumeratorHelper(wxFontEnumerator *fontEnum)
 {
     m_fontEnum = fontEnum;
-    m_charset = -1;
+    m_charset = DEFAULT_CHARSET;
     m_fixedOnly = FALSE;
     m_enumEncodings = FALSE;
 }
@@ -178,7 +178,7 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
             wxConstCast(this, wxFontEnumeratorHelper)->m_charsets.Add(cs);
 
             wxFontEncoding enc = wxGetFontEncFromCharSet(cs);
-            return m_fontEnum->OnFontEncoding(m_family,
+            return m_fontEnum->OnFontEncoding(lf->lfFaceName,
                                               wxFontMapper::GetEncodingName(enc));
         }
         else