X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b8c3d6306cbc4d08483f91a8fb964aa9afc6f215..1fee6e257780f17b4d53b48aa0e7d2ac69664595:/src/generic/helpext.cpp diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp index 455c0224c0..fcf5f1f82a 100644 --- a/src/generic/helpext.cpp +++ b/src/generic/helpext.cpp @@ -15,12 +15,12 @@ #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" #include "wx/string.h" #include "wx/utils.h" - #include "wx/list.h" #include "wx/intl.h" #include "wx/msgdlg.h" #include "wx/choicdlg.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;