X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f61815af20ebb943000d36ea01489f6115e4061c..a5bb451448bc5abdadd4ded3f3bc18dbbf07fedd:/src/html/htmlfilter.cpp
diff --git a/src/html/htmlfilter.cpp b/src/html/htmlfilter.cpp
index 508824b431..87a104c37d 100644
--- a/src/html/htmlfilter.cpp
+++ b/src/html/htmlfilter.cpp
@@ -13,14 +13,13 @@
#include "wx/wxprec.h"
-#if wxUSE_HTML
-
-#ifdef __BORDLANDC__
-#pragma hdrstop
+#ifdef __BORLANDC__
+ #pragma hdrstop
#endif
+#if wxUSE_HTML
+
#ifndef WXPRECOMP
-#include "wx/wx.h"
#endif
#include "wx/html/htmlfilter.h"
@@ -42,7 +41,7 @@ IMPLEMENT_ABSTRACT_CLASS(wxHtmlFilter, wxObject)
IMPLEMENT_DYNAMIC_CLASS(wxHtmlFilterPlainText, wxHtmlFilter)
-bool wxHtmlFilterPlainText::CanRead(const wxFSFile& file) const
+bool wxHtmlFilterPlainText::CanRead(const wxFSFile& WXUNUSED(file)) const
{
return TRUE;
}
@@ -62,9 +61,9 @@ wxString wxHtmlFilterPlainText::ReadFile(const wxFSFile& file) const
doc = src;
delete [] src;
- doc.Replace("<", "<", TRUE);
- doc.Replace(">", ">", TRUE);
- doc2 = "\n" + doc + "\n
";
+ doc.Replace(wxT("<"), wxT("<"), TRUE);
+ doc.Replace(wxT(">"), wxT(">"), TRUE);
+ doc2 = wxT("\n") + doc + wxT("\n");
return doc2;
}
@@ -128,7 +127,7 @@ bool wxHtmlFilterHTML::CanRead(const wxFSFile& file) const
// This is true in most case but some page can return:
// "text/html; char-encoding=...."
// So we use Find instead
- return (file.GetMimeType().Find(_T("text/html")) == 0);
+ return (file.GetMimeType().Find(wxT("text/html")) == 0);
}
@@ -140,11 +139,11 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
wxString doc;
if (s == NULL) return wxEmptyString;
- src = (char*) malloc(s -> GetSize() + 1);
+ src = new char[s -> GetSize() + 1];
src[s -> GetSize()] = 0;
s -> Read(src, s -> GetSize());
doc = src;
- free(src);
+ delete[] src;
return doc;
}