bug #103 (encodings not enumerated correctly) fixed

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@8156 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-08-22 10:06:37 +00:00
parent 47608cc184
commit 1464778143

View 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