X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/08f744fb3be54d7f13c265bc05d3c37fadf67b06..eea4d01c65f9b29baa1193db762b4c6b8144af24:/src/html/htmlfilt.cpp diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp index 9aaa86d4eb..0baea69675 100644 --- a/src/html/htmlfilt.cpp +++ b/src/html/htmlfilt.cpp @@ -145,7 +145,7 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const // tag if we used Content-Type header). #if wxUSE_UNICODE int charsetPos; - if ((charsetPos = file.GetMimeType().Find(_T("; charset="))) != wxNOT_FOUND) + if ((charsetPos = file.GetMimeType().Find(wxT("; charset="))) != wxNOT_FOUND) { wxString charset = file.GetMimeType().Mid(charsetPos + 10); wxCSConv conv(charset); @@ -158,7 +158,7 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const s->Read( buf.data(), size ); *(buf.data() + size) = 0; wxString tmpdoc( buf, wxConvISO8859_1); - + wxString charset = wxHtmlParser::ExtractCharsetInformation(tmpdoc); if (charset.empty()) doc = tmpdoc; @@ -175,7 +175,7 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const { wxString hdr; wxString mime = file.GetMimeType(); - hdr.Printf(_T(""), mime.c_str()); + hdr.Printf(wxT(""), mime.c_str()); return hdr+doc; } #endif