moved wxDash typedef to gdicmn.h

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

diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp
index 4f885e47c95ef582d6509b095d8985d624d7061f..95f90552d15577668f14a5824be667245483b15c 100644 (file)
--- a/src/html/htmlfilt.cpp
+++ b/src/html/htmlfilt.cpp
@@ -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("<meta http-equiv=\"Content-Type\" content=\""));
+        s << file.GetMimeType() <<  _T("\">");
+        return s;
+    }
+
+    else return doc;
 }