X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/223d09f6b523aac674ef9b72a883dfa8d37c5d4e..fed628b632d8ae95efded1f6a6894573c7a76bef:/src/generic/helphtml.cpp?ds=inline diff --git a/src/generic/helphtml.cpp b/src/generic/helphtml.cpp index 9358e52012..f8731d8d17 100644 --- a/src/generic/helphtml.cpp +++ b/src/generic/helphtml.cpp @@ -40,7 +40,7 @@ #include #endif -#ifndef __WINDOWS__ +#if !defined(__WINDOWS__) && !defined(__OS2__) #include #endif @@ -227,7 +227,7 @@ wxHTMLHelpControllerBase::DisplayContents() file = file.BeforeLast(wxT('#')); if(contents.Length() && wxFileExists(file)) rc = DisplaySection(CONTENTS_ID); - + // if not found, open homemade toc: return rc ? TRUE : KeywordSearch(wxT("")); } @@ -296,7 +296,7 @@ wxHTMLHelpControllerBase::KeywordSearch(const wxString& k) node = node->Next(); } } - + if(idx == 1) rc = DisplayHelp(urls[0]); else if(idx == 0)