implemented attributes support for native virtual list control

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

diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp
index 199b91c6c447543c034df30201e3da31599fbfb1..b28da2736893aa9e2b2cadfcbdfc25dbff961e4b 100644 (file)
--- a/src/html/htmlfilt.cpp
+++ b/src/html/htmlfilt.cpp
@@ -15,14 +15,15 @@
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"
 #include "wx/wxprec.h"
 
 #include "wx/defs.h"

-#if wxUSE_HTML
+#if wxUSE_HTML && wxUSE_STREAMS

 
 #ifdef __BORDLANDC__
 #pragma hdrstop
 #endif
 
 #ifndef WXPRECOMP
 
 #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"
 #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;
     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;
 
     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
 // 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,14 +142,18 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
     char *src;
     wxString doc;
 
     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;
 
     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=\""));
     if (file.GetMimeType().Find(_T("; charset=")) == 0)
     {
         wxString s(_T("<meta http-equiv=\"Content-Type\" content=\""));


@@ -156,7 +161,7 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
         return s;
     }
 
         return s;
     }
 

-    else return doc;
+    return doc;

 }
 
 
 }