X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5526e819eca4465ed5520d49bccfebc6a28045e0..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/html/htmlfilter.cpp diff --git a/src/html/htmlfilter.cpp b/src/html/htmlfilter.cpp index 792240be7e..57508b1069 100644 --- a/src/html/htmlfilter.cpp +++ b/src/html/htmlfilter.cpp @@ -8,12 +8,11 @@ #ifdef __GNUG__ -#pragma implementation +#pragma implementation "htmlfilter.h" #endif -#include +#include "wx/wxprec.h" -#include "wx/defs.h" #if wxUSE_HTML #ifdef __BORDLANDC__ @@ -21,11 +20,10 @@ #endif #ifndef WXPRECOMP -#include #endif -#include -#include +#include "wx/html/htmlfilter.h" +#include "wx/html/htmlwin.h" /* @@ -43,29 +41,29 @@ IMPLEMENT_ABSTRACT_CLASS(wxHtmlFilter, wxObject) IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterPlainText, wxHtmlFilter) -bool wxHtmlFilterPlainText::CanRead(const wxFSFile& file) +bool wxHtmlFilterPlainText::CanRead(const wxFSFile& WXUNUSED(file)) const { return TRUE; } -wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file) +wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file) const { wxInputStream *s = file.GetStream(); char *src; wxString doc, doc2; if (s == NULL) return wxEmptyString; - src = (char*) malloc(s -> StreamSize()); - src[s -> StreamSize()] = 0; - s -> Read(src, s -> StreamSize()); + src = new char[s -> GetSize()+1]; + src[s -> GetSize()] = 0; + s -> Read(src, s -> GetSize()); doc = src; - free(src); + delete [] src; - doc.Replace("<", "<", TRUE); - doc.Replace(">", ">", TRUE); - doc2 = "

\n" + doc + "\n

"; + doc.Replace(_T("<"), _T("<"), TRUE); + doc.Replace(_T(">"), _T(">"), TRUE); + doc2 = _T("

\n") + doc + _T("\n

"); return doc2; } @@ -83,22 +81,22 @@ class wxHtmlFilterImage : public wxHtmlFilter DECLARE_DYNAMIC_CLASS(wxHtmlFilterImage) public: - virtual bool CanRead(const wxFSFile& file); - virtual wxString ReadFile(const wxFSFile& file); + virtual bool CanRead(const wxFSFile& file) const; + virtual wxString ReadFile(const wxFSFile& file) const; }; IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterImage, wxHtmlFilter) -bool wxHtmlFilterImage::CanRead(const wxFSFile& file) +bool wxHtmlFilterImage::CanRead(const wxFSFile& file) const { return (file.GetMimeType().Left(6) == "image/"); } -wxString wxHtmlFilterImage::ReadFile(const wxFSFile& file) +wxString wxHtmlFilterImage::ReadFile(const wxFSFile& file) const { return ("

"); } @@ -116,32 +114,36 @@ class wxHtmlFilterHTML : public wxHtmlFilter DECLARE_DYNAMIC_CLASS(wxHtmlFilterHTML) public: - virtual bool CanRead(const wxFSFile& file); - virtual wxString ReadFile(const wxFSFile& file); + virtual bool CanRead(const wxFSFile& file) const; + virtual wxString ReadFile(const wxFSFile& file) const; }; IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterHTML, wxHtmlFilter) -bool wxHtmlFilterHTML::CanRead(const wxFSFile& file) +bool wxHtmlFilterHTML::CanRead(const wxFSFile& file) const { - return (file.GetMimeType() == "text/html"); +// return (file.GetMimeType() == "text/html"); +// 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); } -wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) +wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const { wxInputStream *s = file.GetStream(); char *src; wxString doc; if (s == NULL) return wxEmptyString; - src = (char*) malloc(s -> StreamSize() + 1); - src[s -> StreamSize()] = 0; - s -> Read(src, s -> StreamSize()); + src = new char[s -> GetSize() + 1]; + src[s -> GetSize()] = 0; + s -> Read(src, s -> GetSize()); doc = src; - free(src); + delete[] src; return doc; } @@ -167,4 +169,4 @@ class wxHtmlFilterModule : public wxModule IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterModule, wxModule) -#endif \ No newline at end of file +#endif