From 47a5f42b78ea4b86e9bc39b3b9dc20623d89d9a5 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Fri, 23 Jul 2021 17:12:19 +0100
Subject: [PATCH] Don't intercept key with modifiers in wxChoice

Check that we're dealing with plain keys, don't override accelerators
using {Alt,Ctrl,Shift}-Return, for example.
---
 src/msw/choice.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/msw/choice.cpp b/src/msw/choice.cpp
index 4d3e985a4e..b681735fd3 100644
--- a/src/msw/choice.cpp
+++ b/src/msw/choice.cpp
@@ -123,7 +123,10 @@ bool wxChoice::Create(wxWindow *parent,
 
 bool wxChoice::MSWShouldPreProcessMessage(WXMSG *msg)
 {
-    if ( msg->message == WM_KEYDOWN )
+    if ( msg->message == WM_KEYDOWN &&
+            !(HIWORD(msg->lParam) & KF_ALTDOWN) &&
+                !wxIsShiftDown() &&
+                    !wxIsCtrlDown() )
     {
         switch ( msg->wParam )
         {