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

diff --git a/docs/changes.txt b/docs/changes.txt
index df26a84d93875a1c2a3516c226ef6f718ab0c3b5..1c49da3c2be0780643ff0eb4812e70a1293333ed 100644 (file)
--- 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 9d63aa48300d0cfc072dd96fb1464e10614c3906..996728d4c4f0d4099363d5a8de25c7675e008514 100644 (file)
--- 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;
     }