X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b445b6a76eddacd5bab45c71f640dad672d83393..5b8ee5dec95988e3931c5394fbeb607e48fb2931:/src/msw/combo.cpp

diff --git a/src/msw/combo.cpp b/src/msw/combo.cpp
index 255869e59f..124204b43f 100644
--- a/src/msw/combo.cpp
+++ b/src/msw/combo.cpp
@@ -531,25 +531,34 @@ wxCoord wxComboCtrl::GetNativeTextIndent() const
 
 bool wxComboCtrl::IsKeyPopupToggle(const wxKeyEvent& event) const
 {
-    int keycode = event.GetKeyCode();
-    bool isPopupShown = IsPopupShown();
+    const bool isPopupShown = IsPopupShown();
 
-    if ( isPopupShown && keycode == WXK_ESCAPE )
-        return true;
-
-    // On XP or with writable combo in Classic,
-    // Alt is required, in addition to up/down, to
-    // show the popup.
-    if ( keycode == WXK_DOWN || keycode == WXK_UP )
+    switch ( event.GetKeyCode() )
     {
-        if ( event.AltDown() ||
-                ( !isPopupShown &&
-                  HasFlag(wxCB_READONLY) &&
-                  !wxUxThemeEngine::GetIfActive()
-                ) )
-        {
-            return true;
-        }
+        case WXK_F4:
+            // F4 toggles the popup in the native comboboxes, so emulate them
+            if ( !event.AltDown() )
+                return true;
+            break;
+
+        case WXK_ESCAPE:
+            if ( isPopupShown )
+                return true;
+            break;
+
+        case WXK_DOWN:
+        case WXK_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) &&
+                      !wxUxThemeEngine::GetIfActive()
+                    ) )
+            {
+                return true;
+            }
+            break;
     }
 
     return false;