X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/981e62aa85597e36b40d89274bcf1203e5ae5f67..19e30148e18cc99296b26503c155e5cef59045f4:/src/html/htmlfilt.cpp

diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp
index 199b91c6c4..9c412c1f7b 100644
--- a/src/html/htmlfilt.cpp
+++ b/src/html/htmlfilt.cpp
@@ -15,14 +15,15 @@
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS
 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP
-#include "wx/wx.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
 #endif
 
 #include "wx/html/htmlfilt.h"
@@ -58,9 +59,9 @@ 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;
 
@@ -130,7 +131,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(_("text/html")) == 0);
+  return (file.GetMimeType().Find(wxT("text/html")) == 0);
 }
 
 
@@ -141,22 +142,26 @@ 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:    
+    // 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;
+        return s+doc;
     }
 
-    else return doc;
+    return doc;
 }