From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Tue, 22 Aug 2000 10:06:37 +0000 (+0000)
Subject: bug #103 (encodings not enumerated correctly) fixed
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/146477814355dfb48cf46ce2b68de2dcdac4596e

bug #103 (encodings not enumerated correctly) fixed


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---

diff --git a/src/msw/fontenum.cpp b/src/msw/fontenum.cpp
index 1747efcaaf..b547ec12f4 100644
--- a/src/msw/fontenum.cpp
+++ b/src/msw/fontenum.cpp
@@ -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