Moved the cleanup code to an EVT_WINDOW_DESTROY handler.

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

diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp
index 6f30086b6021c020a062f5fb70d62dd1a7c87045..9c412c1f7bacf6eff94905d6485ca44f7251136b 100644 (file)
--- a/src/html/htmlfilt.cpp
+++ b/src/html/htmlfilt.cpp
@@ -22,7 +22,8 @@
 #endif
 
 #ifndef WXPRECOMP
-#include "wx/wx.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
 #endif
 
 #include "wx/html/htmlfilt.h"
@@ -141,7 +142,7 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
     char *src;
     wxString doc;
 
-    if (s == NULL) 
+    if (s == NULL)
     {
         wxLogError(_("Cannot open HTML document: %s"), file.GetLocation().c_str());
         return wxEmptyString;
@@ -152,12 +153,12 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
     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;
     }
 
     return doc;