X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77611ad4da9df336a0805508276a81b8f4437107..80a24267cbc17d85e278e1f10cdfdaea12199639:/src/html/htmlfilt.cpp diff --git a/src/html/htmlfilt.cpp b/src/html/htmlfilt.cpp index 95f90552d1..874ccaf991 100644 --- a/src/html/htmlfilt.cpp +++ b/src/html/htmlfilt.cpp @@ -15,7 +15,7 @@ #include "wx/wxprec.h" #include "wx/defs.h" -#if wxUSE_HTML +#if wxUSE_HTML && wxUSE_STREAMS #ifdef __BORDLANDC__ #pragma hdrstop @@ -143,7 +143,7 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const if (s == NULL) { - wxLogError(_("Cannot open HTML document: %s"), file.GetLocation().mb_str()); + wxLogError(_("Cannot open HTML document: %s"), file.GetLocation().c_str()); return wxEmptyString; } src = new char[s -> GetSize() + 1]; @@ -160,7 +160,7 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const return s; } - else return doc; + return doc; }