X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bcddc59c8d2d5d28e97aed65d3ceb2fce577879..2a31049201e9c1ff9f515eb9d144ae392f4b4e5a:/src/generic/helphtml.cpp diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp index c595157f3f..f8731d8d17 100644 --- a/src/generic/helphtml.cpp +++ b/src/generic/helphtml.cpp @@ -36,9 +36,11 @@ #include #include +#ifndef __MWERKS__ #include +#endif -#ifndef __WINDOWS__ +#if !defined(__WINDOWS__) && !defined(__OS2__) #include #endif @@ -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 @@ -294,7 +296,7 @@ wxHTMLHelpControllerBase::KeywordSearch(const wxString& k) node = node->Next(); } } - + if(idx == 1) rc = DisplayHelp(urls[0]); else if(idx == 0)