*** empty log message ***

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

diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp
index 199b91c6c447543c034df30201e3da31599fbfb1..95f90552d15577668f14a5824be667245483b15c 100644 (file)
--- 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
 // 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,7 +141,11 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
     char *src;
     wxString doc;
 
     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());
     src = new char[s -> GetSize() + 1];
     src[s -> GetSize()] = 0;
     s -> Read(src, s -> GetSize());