From 94323b60e3582a74994eb8447f165422caf77a1c Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Thu, 29 Nov 2012 10:17:00 +0000 Subject: [PATCH] Cope with the common case of utf-8 being specified in the .hhp file, and convert the book title. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/html/helpdata.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/html/helpdata.cpp b/src/html/helpdata.cpp index edebdcc7fb..e4ef62a1d5 100644 --- a/src/html/helpdata.cpp +++ b/src/html/helpdata.cpp @@ -685,6 +685,19 @@ bool wxHtmlHelpData::AddBook(const wxString& book) enc = wxFontMapper::Get()->CharsetToEncoding(charset); #endif + // No conversion was done on the title yet; at least + // test for a common case. + if (charset == wxT("utf-8") && !title.IsEmpty()) + { + char *buf = new char[title.Length()+1]; + size_t i; + for (i = 0; i < title.Length(); i++) + buf[i] = (char) title[i]; + buf[i] = 0; + title = wxString::FromUTF8(buf); + delete[] buf; + } + bool rtval = AddBookParam(*fi, enc, title, contents, index, start, fsys.GetPath()); delete fi; -- 2.45.2