X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eae20a30ea20e0292b050d41ad190c0c08c75ec1..a2ee1945871d7b9d71ec18954ffb2f0f239c2e57:/src/generic/combog.cpp

diff --git a/src/generic/combog.cpp b/src/generic/combog.cpp
index f2cb9abf67..7f354a8f3c 100644
--- a/src/generic/combog.cpp
+++ b/src/generic/combog.cpp
@@ -237,7 +237,7 @@ void wxGenericComboCtrl::OnPaintEvent( wxPaintEvent& WXUNUSED(event) )
         // Set border colour
         wxPen pen1( wxSystemSettings::GetColour(wxSYS_COLOUR_GRAYTEXT),
                     customBorder,
-                    wxSOLID );
+                    wxPENSTYLE_SOLID);
         dc.SetPen( pen1 );
 
         // area around both controls
@@ -430,7 +430,8 @@ bool wxGenericComboCtrl::IsKeyPopupToggle(const wxKeyEvent& event) const
     }
     else
     {
-        if ( keycode == WXK_DOWN && event.AltDown() )
+        if ( (keycode == WXK_DOWN && event.AltDown()) ||
+             (keycode == WXK_F4) )
             return true;
     }