From a33ce89fec11b48cf4b9e10b8a1c4520bbcccbdc Mon Sep 17 00:00:00 2001
From: Paul Cornett <paulcor@users.noreply.github.com>
Date: Sun, 11 Feb 2018 22:16:48 -0800
Subject: [PATCH] Avoid always consuming mouse wheel event in wxComboCtrl.

Allow further processing when key up/down is not handled.
See #18073
---
 src/common/combocmn.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/common/combocmn.cpp b/src/common/combocmn.cpp
index 3dc6901f82..283b0f687c 100644
--- a/src/common/combocmn.cpp
+++ b/src/common/combocmn.cpp
@@ -1994,7 +1994,9 @@ void wxComboCtrlBase::HandleNormalMouseEvent( wxMouseEvent& event )
             kevent.m_keyCode = event.GetWheelRotation() > 0
                                ? WXK_UP
                                : WXK_DOWN;
-            GetEventHandler()->ProcessEvent(kevent);
+
+            if (!GetEventHandler()->ProcessEvent(kevent))
+                event.Skip();
         }
         else
         {