don't convert title to current encoding if input encoding is wxFONTENCODING_DEFAULT (this shouldn't be necessary and provokes an assert from wxCSConv ctor)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@40973 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -293,9 +293,14 @@ TAG_HANDLER_BEGIN(TITLE, "TITLE")
|
||||
tag.GetBeginPos(),
|
||||
tag.GetEndPos1()-tag.GetBeginPos());
|
||||
#if !wxUSE_UNICODE && wxUSE_WCHAR_T
|
||||
wxCSConv conv(m_WParser->GetInputEncoding());
|
||||
title = wxString(title.wc_str(conv), wxConvLocal);
|
||||
#endif
|
||||
const wxFontEncoding enc = m_WParser->GetInputEncoding();
|
||||
if ( enc != wxFONTENCODING_DEFAULT )
|
||||
{
|
||||
// need to convert to the current one
|
||||
title = wxString(title.wc_str(wxCSConv(enc)), wxConvLocal);
|
||||
}
|
||||
#endif // !wxUSE_UNICODE
|
||||
|
||||
title = m_WParser->GetEntitiesParser()->Parse(title);
|
||||
|
||||
winIface->SetHTMLWindowTitle(title);
|
||||
|
Reference in New Issue
Block a user