no changes, really
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17307 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -432,11 +432,15 @@ wxHtmlEntitiesParser::~wxHtmlEntitiesParser()
|
|||||||
void wxHtmlEntitiesParser::SetEncoding(wxFontEncoding encoding)
|
void wxHtmlEntitiesParser::SetEncoding(wxFontEncoding encoding)
|
||||||
{
|
{
|
||||||
#if wxUSE_WCHAR_T && !wxUSE_UNICODE
|
#if wxUSE_WCHAR_T && !wxUSE_UNICODE
|
||||||
if (encoding == m_encoding) return;
|
if (encoding == m_encoding)
|
||||||
|
return;
|
||||||
|
|
||||||
delete m_conv;
|
delete m_conv;
|
||||||
m_conv = NULL;
|
|
||||||
m_encoding = encoding;
|
m_encoding = encoding;
|
||||||
if (m_encoding != wxFONTENCODING_SYSTEM)
|
if (m_encoding == wxFONTENCODING_SYSTEM)
|
||||||
|
m_conv = NULL;
|
||||||
|
else
|
||||||
m_conv = new wxCSConv(wxFontMapper::GetEncodingName(m_encoding));
|
m_conv = new wxCSConv(wxFontMapper::GetEncodingName(m_encoding));
|
||||||
#else
|
#else
|
||||||
(void) encoding;
|
(void) encoding;
|
||||||
|
Reference in New Issue
Block a user