More samples makefiles

[wxWidgets.git] / src / html / htmlfilter.cpp

diff --git a/src/html/htmlfilter.cpp b/src/html/htmlfilter.cpp
index 1bdccd5b17cc061ef6f6f62fa48a5eecd794221c..37215c51707f90cce6b09914699ecbb0f79c271d 100644 (file)
--- a/src/html/htmlfilter.cpp
+++ b/src/html/htmlfilter.cpp
@@ -124,7 +124,11 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterHTML, wxHtmlFilter)
 
 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);
 }
 
 
@@ -136,11 +140,11 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
     wxString doc;
 
     if (s == NULL) return wxEmptyString;
-    src = (char*) malloc(s -> GetSize() + 1);
+    src = new char[s -> GetSize() + 1];
     src[s -> GetSize()] = 0;
     s -> Read(src, s -> GetSize());
     doc = src;
-    free(src);
+    delete[] src;
 
     return doc;
 }