Fix wxMSW compilation when wxUSE_FONTMAP==0.
Don't use wxFontMapper::GetEncodingName() in wxFontEnumerator if wxFontMapper is not available. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70952 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -187,9 +187,18 @@ bool wxFontEnumeratorHelper::OnFont(const LPLOGFONT lf,
|
|||||||
{
|
{
|
||||||
wxConstCast(this, wxFontEnumeratorHelper)->m_charsets.Add(cs);
|
wxConstCast(this, wxFontEnumeratorHelper)->m_charsets.Add(cs);
|
||||||
|
|
||||||
|
#if wxUSE_FONTMAP
|
||||||
wxFontEncoding enc = wxGetFontEncFromCharSet(cs);
|
wxFontEncoding enc = wxGetFontEncFromCharSet(cs);
|
||||||
return m_fontEnum->OnFontEncoding(lf->lfFaceName,
|
return m_fontEnum->OnFontEncoding(lf->lfFaceName,
|
||||||
wxFontMapper::GetEncodingName(enc));
|
wxFontMapper::GetEncodingName(enc));
|
||||||
|
#else // !wxUSE_FONTMAP
|
||||||
|
// Just use some unique and, hopefully, understandable, name.
|
||||||
|
return m_fontEnum->OnFontEncoding
|
||||||
|
(
|
||||||
|
lf->lfFaceName,
|
||||||
|
wxString::Format(wxS("Code page %d"), cs)
|
||||||
|
);
|
||||||
|
#endif // wxUSE_FONTMAP/!wxUSE_FONTMAP
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user