X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..7807a2b4998ef075b5ac7c05ab48274c28b477ba:/src/html/htmlfilt.cpp diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp index 85cc8b74b2..025a19e155 100644 --- a/src/html/htmlfilt.cpp +++ b/src/html/htmlfilt.cpp @@ -1,26 +1,20 @@ ///////////////////////////////////////////////////////////////////////////// -// 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 ///////////////////////////////////////////////////////////////////////////// - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "htmlfilt.h" -#endif - #include "wx/wxprec.h" -#include "wx/defs.h" -#if wxUSE_HTML && wxUSE_STREAMS - #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif +#if wxUSE_HTML && wxUSE_STREAMS + #ifndef WXPRECOMP #include "wx/log.h" #include "wx/intl.h" @@ -77,7 +71,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterPlainText, wxHtmlFilter) bool wxHtmlFilterPlainText::CanRead(const wxFSFile& WXUNUSED(file)) const { - return TRUE; + return true; } @@ -90,9 +84,9 @@ wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file) const if (s == NULL) return wxEmptyString; ReadString(doc, s, wxConvISO8859_1); - doc.Replace(wxT("&"), wxT("&"), TRUE); - doc.Replace(wxT("<"), wxT("<"), TRUE); - doc.Replace(wxT(">"), wxT(">"), TRUE); + doc.Replace(wxT("&"), wxT("&"), true); + doc.Replace(wxT("<"), wxT("<"), true); + doc.Replace(wxT(">"), wxT(">"), true); doc2 = wxT("
\n") + doc + wxT("\n"); return doc2; } @@ -165,12 +159,12 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const return wxEmptyString; } - // NB: We convert input file to wchar_t here in Unicode mode, based on + // NB: We convert input file to wchar_t here in Unicode mode, based on // either Content-Type header or tags. In ANSI mode, we don't // do it as it is done by wxHtmlParser (for this reason, we add // tag if we used Content-Type header). #if wxUSE_UNICODE - int charsetPos; + int charsetPos; if ((charsetPos = file.GetMimeType().Find(_T("; charset="))) != wxNOT_FOUND) { wxString charset = file.GetMimeType().Mid(charsetPos + 10); @@ -219,7 +213,7 @@ class wxHtmlFilterModule : public wxModule { wxHtmlWindow::AddFilter(new wxHtmlFilterHTML); wxHtmlWindow::AddFilter(new wxHtmlFilterImage); - return TRUE; + return true; } virtual void OnExit() {} };