X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8ecff18117f8cabc0f515ad81aa4ad265e5e17d3..71cf399ff0f1ddb966b48e512b0fb4e690f5c440:/src/generic/helpext.cpp diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp index 7a8135133d..fcf5f1f82a 100644 --- a/src/generic/helpext.cpp +++ b/src/generic/helpext.cpp @@ -15,7 +15,7 @@ #pragma hdrstop #endif -#if wxUSE_HELP && !defined(__WXWINCE__) && (!defined(__WXMAC__) || defined(__WXMAC_OSX__)) +#if wxUSE_HELP && !defined(__WXWINCE__) #ifndef WX_PRECOMP #include "wx/list.h" @@ -457,10 +457,15 @@ bool wxExtHelpController::KeywordSearch(const wxString& k, break; default: - idx = wxGetSingleChoiceIndex( - showAll ? _("Help Index") : _("Relevant entries:"), - showAll ? _("Help Index") : _("Entries found"), - idx, choices); + if (showAll) + idx = wxGetSingleChoiceIndex(_("Help Index"), + _("Help Index"), + idx, choices); + else + idx = wxGetSingleChoiceIndex(_("Relevant entries:"), + _("Entries found"), + idx, choices); + if (idx >= 0) rc = DisplayHelp(urls[idx]); break;