Moved typedef to within public block to avoid compile error in VC++

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

diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp
index 350037cea132eee40d17beb7dbb5d0d2d18f4d47..9c412c1f7bacf6eff94905d6485ca44f7251136b 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;
 


@@ -141,13 +142,25 @@ 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:
+    if (file.GetMimeType().Find(_T("; charset=")) == 0)
+    {
+        wxString s(_T("<meta http-equiv=\"Content-Type\" content=\""));
+        s << file.GetMimeType() <<  _T("\">");
+        return s+doc;
+    }
+

     return doc;
 }
 
     return doc;
 }