X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4dd31ff527b70ef0228f773475a0a58b6072456a..a87f2821adee59d00f99cad1f9bcf61b0accbcb6:/src/generic/odcombo.cpp

diff --git a/src/generic/odcombo.cpp b/src/generic/odcombo.cpp
index 4d39e83afa..c72efc280c 100644
--- a/src/generic/odcombo.cpp
+++ b/src/generic/odcombo.cpp
@@ -410,17 +410,24 @@ void wxVListBoxComboPopup::OnLeftClick(wxMouseEvent& WXUNUSED(event))
 
 void wxVListBoxComboPopup::OnKey(wxKeyEvent& event)
 {
-    // Select item if ENTER is pressed
-    if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER )
-    {
-        DismissWithEvent();
-    }
-    // Hide popup if ESC is pressed
-    else if ( event.GetKeyCode() == WXK_ESCAPE )
+    // Hide popup if certain key or key combination was pressed
+    if ( m_combo->IsKeyPopupToggle(event) )
     {
         StopPartialCompletion();
         Dismiss();
     }
+    else if ( event.AltDown() )
+    {
+        // On both wxGTK and wxMSW, pressing Alt down seems to
+        // completely freeze things in popup (ie. arrow keys and
+        // enter won't work).
+        return;
+    }
+    // Select item if ENTER is pressed
+    else if ( event.GetKeyCode() == WXK_RETURN || event.GetKeyCode() == WXK_NUMPAD_ENTER )
+    {
+        DismissWithEvent();
+    }
     else
     {
         int comboStyle = m_combo->GetWindowStyle();
@@ -1046,7 +1053,7 @@ void wxOwnerDrawnComboBox::OnDrawBackground(wxDC& dc, const wxRect& rect, int it
     {
         int focusFlag = wxCONTROL_SELECTED;
 
-        if ( flags & wxODCB_PAINTING_CONTROL != wxODCB_PAINTING_CONTROL )
+        if ( (flags & wxODCB_PAINTING_CONTROL) != wxODCB_PAINTING_CONTROL )
             focusFlag |= wxCONTROL_ISSUBMENU;
 
         DrawFocusBackground(dc, rect, focusFlag );