#
Compile without fontmapper. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31255 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
3b72cd917f
commit
5a969262e1
@ -700,9 +700,11 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
|
|||||||
charset = linebuf + wxStrlen(_T("charset="));
|
charset = linebuf + wxStrlen(_T("charset="));
|
||||||
} while (lineptr != NULL);
|
} while (lineptr != NULL);
|
||||||
|
|
||||||
wxFontEncoding enc;
|
wxFontEncoding enc = wxFONTENCODING_SYSTEM;
|
||||||
if (charset == wxEmptyString) enc = wxFONTENCODING_SYSTEM;
|
#if wxUSE_FONTMAP
|
||||||
else enc = wxFontMapper::Get()->CharsetToEncoding(charset);
|
if (charset != wxEmptyString)
|
||||||
|
enc = wxFontMapper::Get()->CharsetToEncoding(charset);
|
||||||
|
#endif
|
||||||
|
|
||||||
bool rtval = AddBookParam(*fi, enc,
|
bool rtval = AddBookParam(*fi, enc,
|
||||||
title, contents, index, start, fsys.GetPath());
|
title, contents, index, start, fsys.GetPath());
|
||||||
|
Loading…
Reference in New Issue
Block a user