X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/314260fbd07ecebb43c60d147e1f4580a7159e42..236a9de39afa090fdee3cf91cb5364ceca69e3f8:/src/html/htmlfilt.cpp diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp index 3dfac30ec7..95f90552d1 100644 --- a/src/html/htmlfilt.cpp +++ b/src/html/htmlfilt.cpp @@ -64,8 +64,8 @@ wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file) const doc = src; delete [] src; - doc.Replace("<", "<", TRUE); - doc.Replace(">", ">", TRUE); + doc.Replace(wxT("<"), wxT("<"), TRUE); + doc.Replace(wxT(">"), wxT(">"), TRUE); doc2 = "
\n" + doc + "\n
"; return doc2; } @@ -94,7 +94,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterImage, wxHtmlFilter) bool wxHtmlFilterImage::CanRead(const wxFSFile& file) const { - return (file.GetMimeType().Left(6) == "image/"); + return (file.GetMimeType().Left(6) == wxT("image/")); } @@ -141,14 +141,26 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const char *src; wxString doc; - if (s == NULL) return wxEmptyString; + if (s == NULL) + { + wxLogError(_("Cannot open HTML document: %s"), file.GetLocation().mb_str()); + return wxEmptyString; + } src = new char[s -> GetSize() + 1]; src[s -> GetSize()] = 0; s -> Read(src, s -> GetSize()); doc = src; delete[] src; - return doc; + // add meta tag if we obtained this through http: + if (file.GetMimeType().Find(_T("; charset=")) == 0) + { + wxString s(_T(""); + return s; + } + + else return doc; }