X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bc60925fb3dbcd8011b82f019d71106b2f8dd64f..e5ef1cae0f424be0bffbd651cb10052dfb208396:/src/gtk/listbox.cpp

diff --git a/src/gtk/listbox.cpp b/src/gtk/listbox.cpp
index 634f2fd26e..5c1bbc56b1 100644
--- a/src/gtk/listbox.cpp
+++ b/src/gtk/listbox.cpp
@@ -178,10 +178,19 @@ gtk_listbox_key_press_callback( GtkWidget *WXUNUSED(widget),
         (gdk_event->keyval == GDK_ISO_Enter) ||
         (gdk_event->keyval == GDK_KP_Enter))
     {
-        int index = listbox->GetSelection();
-        if (index != wxNOT_FOUND)
+        int index = -1;
+        if (!listbox->HasMultipleSelection())
+            index = listbox->GetSelection();
+        else
         {
+            wxArrayInt sels;
+            if (listbox->GetSelections( sels ) < 1)
+                return FALSE;
+            index = sels[0];
+        }
         
+        if (index != wxNOT_FOUND)
+        {
             wxCommandEvent event(wxEVT_COMMAND_LISTBOX_DOUBLECLICKED, listbox->GetId() );
             event.SetEventObject( listbox );