X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/69941f05864fa8b37856ccc1338124bfac756a2b..4f55a07f9f4c6ba6905aaa8e584e6fb14771d278:/src/html/htmlfilt.cpp diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp index daddda164a..6f30086b60 100644 --- a/src/html/htmlfilt.cpp +++ b/src/html/htmlfilt.cpp @@ -14,7 +14,8 @@ #include "wx/wxprec.h" -#if wxUSE_HTML +#include "wx/defs.h" +#if wxUSE_HTML && wxUSE_STREAMS #ifdef __BORDLANDC__ #pragma hdrstop @@ -57,14 +58,14 @@ wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file) const wxString doc, doc2; if (s == NULL) return wxEmptyString; - src = new char[s -> GetSize()+1]; - src[s -> GetSize()] = 0; - s -> Read(src, s -> GetSize()); + src = new char[s->GetSize()+1]; + src[s->GetSize()] = 0; + s->Read(src, s->GetSize()); 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; } @@ -93,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/")); } @@ -129,7 +130,7 @@ bool wxHtmlFilterHTML::CanRead(const wxFSFile& file) const // This is true in most case but some page can return: // "text/html; char-encoding=...." // So we use Find instead - return (file.GetMimeType().Find(_T("text/html")) == 0); + return (file.GetMimeType().Find(wxT("text/html")) == 0); } @@ -140,13 +141,25 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const char *src; wxString doc; - if (s == NULL) return wxEmptyString; - src = new char[s -> GetSize() + 1]; - src[s -> GetSize()] = 0; - s -> Read(src, s -> GetSize()); + if (s == NULL) + { + wxLogError(_("Cannot open HTML document: %s"), file.GetLocation().c_str()); + return wxEmptyString; + } + src = new char[s->GetSize() + 1]; + src[s->GetSize()] = 0; + s->Read(src, s->GetSize()); doc = src; delete[] src; + // add meta tag if we obtained this through http: + if (file.GetMimeType().Find(_T("; charset=")) == 0) + { + wxString s(_T(""); + return s; + } + return doc; }