Use typesafe wxVariantList in wxVariant instead of wxList

[wxWidgets.git] / src / generic / helpext.cpp

diff --git a/src/generic/helpext.cpp b/src/generic/helpext.cpp
index 455c0224c0f2ac843b5eee0b78245aa550ebaddb..28a1eb02523851e25d94f6e32bf4e84c1b189f92 100644 (file)
--- a/src/generic/helpext.cpp
+++ b/src/generic/helpext.cpp
@@ -18,9 +18,9 @@
 #if wxUSE_HELP && !defined(__WXWINCE__) && (!defined(__WXMAC__) || defined(__WXMAC_OSX__))
 
 #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;