better focus handling (blind fix)

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

diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp
index 639ea7272a82de5397777d4bdaede4b39a531e83..b28da2736893aa9e2b2cadfcbdfc25dbff961e4b 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"
@@ -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;
 
@@ -141,18 +142,18 @@ 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;
     }
-    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;
 
-    // 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=\""));
@@ -160,7 +161,7 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
         return s;
     }
 
-    else return doc;
+    return doc;
 }