X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/43147cef6c33e9024ef1d1ae7b659fa4c696f2dd..c084a1ac064cff672b777e1e6a3624fd838387e7:/src/generic/combog.cpp diff --git a/src/generic/combog.cpp b/src/generic/combog.cpp index 29b9d21f96..7f354a8f3c 100644 --- a/src/generic/combog.cpp +++ b/src/generic/combog.cpp @@ -32,6 +32,7 @@ #include "wx/combobox.h" #include "wx/dcclient.h" #include "wx/settings.h" + #include "wx/textctrl.h" #endif #include "wx/dcbuffer.h" @@ -236,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 @@ -429,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; }