Remove wxUSE_WCHAR_T checks.
wxWidgets requires wchar_t for some time now; wx/chartype.h has a check to fail complation without it. Simplify code by removing now-dead code for the !wxUSE_WCHAR_T case. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63991 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -569,7 +569,6 @@ bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
|
||||
// Now store the contents range
|
||||
bookr->SetContentsRange(cont_start, m_contents.size());
|
||||
|
||||
#if wxUSE_WCHAR_T
|
||||
// MS HTML Help files [written by MS HTML Help Workshop] are broken
|
||||
// in that the data are iso-8859-1 (including HTML entities), but must
|
||||
// be interpreted as being in language's windows charset. Correct the
|
||||
@@ -597,11 +596,6 @@ bool wxHtmlHelpData::AddBookParam(const wxFSFile& bookfile,
|
||||
}
|
||||
#undef CORRECT_STR
|
||||
}
|
||||
#else
|
||||
wxUnusedVar(IndexOld);
|
||||
wxUnusedVar(ContentsOld);
|
||||
wxASSERT_MSG(encoding == wxFONTENCODING_SYSTEM, wxT("Help files need charset conversion, but wxUSE_WCHAR_T is 0"));
|
||||
#endif // wxUSE_WCHAR_T/!wxUSE_WCHAR_T
|
||||
|
||||
m_bookRecords.Add(bookr);
|
||||
if (!m_index.empty())
|
||||
|
Reference in New Issue
Block a user