#
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:
		@@ -700,9 +700,11 @@ bool wxHtmlHelpData::AddBook(const wxString& book)
 | 
			
		||||
            charset = linebuf + wxStrlen(_T("charset="));
 | 
			
		||||
    } while (lineptr != NULL);
 | 
			
		||||
 | 
			
		||||
    wxFontEncoding enc;
 | 
			
		||||
    if (charset == wxEmptyString) enc = wxFONTENCODING_SYSTEM;
 | 
			
		||||
    else enc = wxFontMapper::Get()->CharsetToEncoding(charset);
 | 
			
		||||
    wxFontEncoding enc = wxFONTENCODING_SYSTEM;
 | 
			
		||||
#if wxUSE_FONTMAP
 | 
			
		||||
    if (charset != wxEmptyString)
 | 
			
		||||
        enc = wxFontMapper::Get()->CharsetToEncoding(charset);
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
    bool rtval = AddBookParam(*fi, enc,
 | 
			
		||||
                              title, contents, index, start, fsys.GetPath());
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user