Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more wxHTML Unicode fixes (removed wxPrivate_ReadString), wxSearchEngine-->wxHtmlSearchEngine

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@17821 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-11-11 00:15:57 +00:00
parent 987b309827
commit 4581a29d2d
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/html/htmlfilt.cpp
View File

@@ -31,7 +31,7 @@
#include "wx/html/htmlwin.h" #include "wx/html/htmlwin.h"
// utility function: read a wxString from a wxInputStream // utility function: read a wxString from a wxInputStream
void wxPrivate_ReadString(wxString& str, wxInputStream* s, wxMBConv& conv) static void ReadString(wxString& str, wxInputStream* s, wxMBConv& conv)
{ {
size_t streamSize = s->GetSize(); size_t streamSize = s->GetSize();
@@ -88,7 +88,7 @@ wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file) const
wxString doc, doc2; wxString doc, doc2;
if (s == NULL) return wxEmptyString; if (s == NULL) return wxEmptyString;
wxPrivate_ReadString(doc, s, wxConvISO8859_1); ReadString(doc, s, wxConvISO8859_1);
doc.Replace(wxT("&"), wxT("&"), TRUE); doc.Replace(wxT("&"), wxT("&"), TRUE);
doc.Replace(wxT("<"), wxT("&lt;"), TRUE); doc.Replace(wxT("<"), wxT("&lt;"), TRUE);
@@ -136,19 +136,10 @@ wxString wxHtmlFilterImage::ReadFile(const wxFSFile& file) const
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
// wxHtmlFilterPlainText // wxHtmlFilterHTML
// filter for text/plain or uknown // 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) IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterHTML, wxHtmlFilter)
@@ -184,12 +175,12 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
{ {
wxString charset = file.GetMimeType().Mid(charsetPos + 10); wxString charset = file.GetMimeType().Mid(charsetPos + 10);
wxCSConv conv(charset); wxCSConv conv(charset);
wxPrivate_ReadString(doc, s, conv); ReadString(doc, s, conv);
} }
else else
{ {
wxString tmpdoc; wxString tmpdoc;
wxPrivate_ReadString(tmpdoc, s, wxConvISO8859_1); ReadString(tmpdoc, s, wxConvISO8859_1);
wxString charset = wxHtmlParser::ExtractCharsetInformation(tmpdoc); wxString charset = wxHtmlParser::ExtractCharsetInformation(tmpdoc);
if (charset.empty()) if (charset.empty())
doc = tmpdoc; doc = tmpdoc;
@@ -200,7 +191,7 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
} }
} }
#else // !wxUSE_UNICODE #else // !wxUSE_UNICODE
wxPrivate_ReadString(doc, s, wxConvLibc); ReadString(doc, s, wxConvLibc);
// add meta tag if we obtained this through http: // add meta tag if we obtained this through http:
if (!file.GetMimeType().empty()) if (!file.GetMimeType().empty())
{ {