From dc302518e6bf48326d202475bf78874fedcb2d9c Mon Sep 17 00:00:00 2001
From: Dimitri Schoolwerth <dimitri.schoolwerth@gmail.com>
Date: Wed, 23 Jun 2004 22:12:30 +0000
Subject: [PATCH] fixed bug #976725: "RETURN closes dialog instead of combobox
 dropdown" (applied fix suggested in the bug's comment)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27985 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/choice.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index af029bf042..6abcdaef9a 100644
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -179,8 +179,9 @@ bool wxChoice::MSWShouldPreProcessMessage(WXMSG *pMsg)
 {
     MSG *msg = (MSG *) pMsg;
 
-    // don't preprocess "ESC" if combobox is dropped down
-    if ( msg->message == WM_KEYDOWN && msg->wParam == VK_ESCAPE )
+    // if the dropdown list is visible, don't preprocess certain keys
+    if ( msg->message == WM_KEYDOWN
+        && (msg->wParam == VK_ESCAPE || msg->wParam == VK_RETURN) )
     {
         if (::SendMessage(GetHwndOf(this), CB_GETDROPPEDSTATE, 0, 0))
         {
-- 
2.45.2