X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0413cec5271566470f4c852608a35800b49056cd..4de601b1280321675d6ec3580947e0c158a42c93:/src/html/htmlfilt.cpp

diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp
index 350037cea1..fff367cc45 100644
--- a/src/html/htmlfilt.cpp
+++ b/src/html/htmlfilt.cpp
@@ -130,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(wxT("text/html")) == 0);
+  return (file.GetMimeType().Find(_("text/html")) == 0);
 }
 
 
@@ -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("<meta http-equiv=\"Content-Type\" content=\""));
+        s << file.GetMimeType() <<  _T("\">");
+        return s;
+    }
+
+    else return doc;
 }