]> git.saurik.com Git - wxWidgets.git/blobdiff - src/html/htmlfilt.cpp
projects / wxWidgets.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix typo in r57455 which totally broke modal dialogs display (close #10291)
[wxWidgets.git] / src / html / htmlfilt.cpp
diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp
index 9c412c1f7bacf6eff94905d6485ca44f7251136b..28c3de9e68acc0d0ac045b9515b26a5173dc6f2a 100644 (file)
--- a/src/html/htmlfilt.cpp
+++ b/src/html/htmlfilt.cpp
@@ -1,34 +1,38 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        htmlfilt.cpp
+// Name:        src/html/htmlfilt.cpp
 // Purpose:     wxHtmlFilter - input filter for translating into HTML format
 // Author:      Vaclav Slavik
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vaclav Slavik
-// Licence:     wxWindows Licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+#include "wx/wxprec.h"
 
-#ifdef __GNUG__
-#pragma implementation
+#ifdef __BORLANDC__
+    #pragma hdrstop
 #endif
 
-#include "wx/wxprec.h"
-
-#include "wx/defs.h"
 #if wxUSE_HTML && wxUSE_STREAMS
 
-#ifdef __BORDLANDC__
-#pragma hdrstop
-#endif
-
-#ifndef WXPRECOMP
+#ifndef WX_PRECOMP
     #include "wx/log.h"
     #include "wx/intl.h"
 #endif
 
+#include "wx/strconv.h"
+#include "wx/sstream.h"
 #include "wx/html/htmlfilt.h"
 #include "wx/html/htmlwin.h"
 
+// utility function: read entire contents of an wxInputStream into a wxString
+//
+// TODO: error handling?
+static void ReadString(wxString& str, wxInputStream* s, wxMBConv& conv)
+{
+    wxStringOutputStream out(&str, conv);
+    s->Read(out);
+}
 
 /*
 
@@ -47,7 +51,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterPlainText, wxHtmlFilter)
 
 bool wxHtmlFilterPlainText::CanRead(const wxFSFile& WXUNUSED(file)) const
 {
-    return TRUE;
+    return true;
 }
 
 
@@ -55,19 +59,15 @@ bool wxHtmlFilterPlainText::CanRead(const wxFSFile& WXUNUSED(file)) const
 wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file) const
 {
     wxInputStream *s = file.GetStream();
-    char *src;
     wxString doc, doc2;
 
     if (s == NULL) return wxEmptyString;
-    src = new char[s->GetSize()+1];
-    src[s->GetSize()] = 0;
-    s->Read(src, s->GetSize());
-    doc = src;
-    delete [] src;
-
-    doc.Replace(wxT("<"), wxT("&lt;"), TRUE);
-    doc.Replace(wxT(">"), wxT("&gt;"), TRUE);
-    doc2 = "<HTML><BODY><PRE>\n" + doc + "\n</PRE></BODY></HTML>";
+    ReadString(doc, s, wxConvISO8859_1);
+
+    doc.Replace(wxT("&"), wxT("&amp;"), true);
+    doc.Replace(wxT("<"), wxT("&lt;"), true);
+    doc.Replace(wxT(">"), wxT("&gt;"), true);
+    doc2 = wxT("<HTML><BODY><PRE>\n") + doc + wxT("\n</PRE></BODY></HTML>");
     return doc2;
 }
 
@@ -102,26 +102,18 @@ bool wxHtmlFilterImage::CanRead(const wxFSFile& file) const
 
 wxString wxHtmlFilterImage::ReadFile(const wxFSFile& file) const
 {
-    return ("<HTML><BODY><IMG SRC=\"" + file.GetLocation() + "\"></BODY></HTML>");
+    wxString res = wxT("<HTML><BODY><IMG SRC=\"") + file.GetLocation() + wxT("\"></BODY></HTML>");
+    return res;
 }
 
 
 
 
 //--------------------------------------------------------------------------------
-// wxHtmlFilterPlainText
-//          filter for text/plain or uknown
+// wxHtmlFilterHTML
+//          filter for text/html
 //--------------------------------------------------------------------------------
 
-class wxHtmlFilterHTML : public wxHtmlFilter
-{
-    DECLARE_DYNAMIC_CLASS(wxHtmlFilterHTML)
-
-    public:
-        virtual bool CanRead(const wxFSFile& file) const;
-        virtual wxString ReadFile(const wxFSFile& file) const;
-};
-
 
 IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterHTML, wxHtmlFilter)
 
@@ -139,7 +131,6 @@ bool wxHtmlFilterHTML::CanRead(const wxFSFile& file) const
 wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
 {
     wxInputStream *s = file.GetStream();
-    char *src;
     wxString doc;
 
     if (s == NULL)
@@ -147,19 +138,43 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
         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;
 
+    // NB: We convert input file to wchar_t here in Unicode mode, based on
+    //     either Content-Type header or <meta> tags. In ANSI mode, we don't
+    //     do it as it is done by wxHtmlParser (for this reason, we add <meta>
+    //     tag if we used Content-Type header).
+#if wxUSE_UNICODE
+    int charsetPos;
+    if ((charsetPos = file.GetMimeType().Find(_T("; charset="))) != wxNOT_FOUND)
+    {
+        wxString charset = file.GetMimeType().Mid(charsetPos + 10);
+        wxCSConv conv(charset);
+        ReadString(doc, s, conv);
+    }
+    else
+    {
+        wxString tmpdoc;
+        ReadString(tmpdoc, s, wxConvISO8859_1);
+        wxString charset = wxHtmlParser::ExtractCharsetInformation(tmpdoc);
+        if (charset.empty())
+            doc = tmpdoc;
+        else
+        {
+            wxCSConv conv(charset);
+            doc = wxString(tmpdoc.mb_str(wxConvISO8859_1), conv);
+        }
+    }
+#else // !wxUSE_UNICODE
+    ReadString(doc, s, wxConvLibc);
     // add meta tag if we obtained this through http:
-    if (file.GetMimeType().Find(_T("; charset=")) == 0)
+    if (!file.GetMimeType().empty())
     {
-        wxString s(_T("<meta http-equiv=\"Content-Type\" content=\""));
-        s << file.GetMimeType() <<  _T("\">");
-        return s+doc;
+        wxString hdr;
+        wxString mime = file.GetMimeType();
+        hdr.Printf(_T("<meta http-equiv=\"Content-Type\" content=\"%s\">"), mime.c_str());
+        return hdr+doc;
     }
+#endif
 
     return doc;
 }
@@ -178,7 +193,7 @@ class wxHtmlFilterModule : public wxModule
         {
             wxHtmlWindow::AddFilter(new wxHtmlFilterHTML);
             wxHtmlWindow::AddFilter(new wxHtmlFilterImage);
-            return TRUE;
+            return true;
         }
         virtual void OnExit() {}
 };
wxWidgets (Impactor)