X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bcddc59c8d2d5d28e97aed65d3ceb2fce577879..12db77cab1054d288a2b3e2d07e58ad1d6386a53:/src/generic/helphtml.cpp diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp index c595157f3f..9358e52012 100644 --- a/src/generic/helphtml.cpp +++ b/src/generic/helphtml.cpp @@ -36,7 +36,9 @@ #include #include +#ifndef __MWERKS__ #include +#endif #ifndef __WINDOWS__ #include @@ -141,7 +143,7 @@ wxHTMLHelpControllerBase::LoadFile(const wxString& ifile) { newfile = WXEXTHELP_SEPARATOR; const wxChar *cptr = wxGetLocale()->GetName().c_str(); - while(*cptr && *cptr != _T('_')) + while(*cptr && *cptr != wxT('_')) newfile << *(cptr++); if(wxDirExists(newfile)) file = newfile; @@ -221,13 +223,13 @@ wxHTMLHelpControllerBase::DisplayContents() bool rc = FALSE; wxString file; file << m_MapFile << WXEXTHELP_SEPARATOR << contents; - if(file.Contains(_T('#'))) - file = file.BeforeLast(_T('#')); + if(file.Contains(wxT('#'))) + file = file.BeforeLast(wxT('#')); if(contents.Length() && wxFileExists(file)) rc = DisplaySection(CONTENTS_ID); // if not found, open homemade toc: - return rc ? TRUE : KeywordSearch(_T("")); + return rc ? TRUE : KeywordSearch(wxT("")); } bool