From 87b3708781255019ea1731dce40d699217f1b675 Mon Sep 17 00:00:00 2001
From: Jaakko Salli <jaakko.salli@dnainternet.net>
Date: Tue, 1 Jun 2010 15:31:05 +0000
Subject: [PATCH] Interpret arrow keys correctly in wxMSW
 wxComboCtrl::IsKeyPopupToggle() (fixes #12114)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64458 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 docs/changes.txt  |  2 ++
 src/msw/combo.cpp | 14 +++-----------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/docs/changes.txt b/docs/changes.txt
index df26a84d93..1c49da3c2b 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -554,6 +554,8 @@ MSW:
 - Fix sending of wxEVT_COMMAND_LIST_COL_DRAGGING events in wxListCtrl.
 - Allow putting the UAC symbol on buttons (Chris Spencer).
 - Fix wxTaskBarIcon for older Windows systems (Daniel Wyatt).
+- Fixed wxOwnerDrawnComboBox keyboard handling: drop-down is no longer
+  displayed when arrow key is pressed (without Alt).
 - Fixed wxComboCtrl::SetButtonPosition() on Vista/Win7.
 
 i18n:
diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index 9d63aa4830..996728d4c4 100644
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -833,18 +833,10 @@ bool wxComboCtrl::IsKeyPopupToggle(const wxKeyEvent& event) const
         case WXK_UP:
         case WXK_NUMPAD_DOWN:
         case WXK_NUMPAD_UP:
-            // On XP or with writable combo in Classic, arrows don't open the
-            // popup but Alt-arrow does
-            if ( event.AltDown() ||
-                    ( !isPopupShown &&
-                      HasFlag(wxCB_READONLY)
-#if wxUSE_UXTHEME
-                      && !wxUxThemeEngine::GetIfActive()
-#endif
-                    ) )
-            {
+            // Arrow keys (and mouse wheel) toggle the popup in the native
+            // combo boxes
+            if ( event.AltDown() )
                 return true;
-            }
             break;
     }
 
-- 
2.50.0