diff --git a/controls/combo.c b/controls/combo.c index 8059e4578574cc3941e894f475ebbe208475cb17..cb1d2a97f984cbdcadd0bcc43fd479f75bb0bf39 100644 --- a/controls/combo.c +++ b/controls/combo.c @@ -1422,9 +1422,7 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd ) /* do not roll up if selection is being tracked * by arrowkeys in the dropdown listbox */ - - if( (lphc->dwStyle & CBS_SIMPLE) || - ((lphc->wState & CBF_DROPPED) && !(lphc->wState & CBF_NOROLLUP)) ) + if( ((lphc->wState & CBF_DROPPED) && !(lphc->wState & CBF_NOROLLUP)) ) { CBRollUp( lphc, (HIWORD(wParam) == LBN_SELCHANGE), TRUE ); } diff --git a/controls/listbox.c b/controls/listbox.c index f50fe9ab10bbc9e4fad2b4c1327e5238ad3b0993..252cff7e587e30f04fea68843f8507d6ce9b5d1f 100644 --- a/controls/listbox.c +++ b/controls/listbox.c @@ -2307,7 +2307,7 @@ static LRESULT LISTBOX_HandleKeyDown( WND *wnd, LB_DESCR *descr, WPARAM wParam ) LISTBOX_SetSelection( wnd, descr, caret, TRUE, FALSE); if (descr->style & LBS_NOTIFY) { - if( descr->lphc && CB_GETTYPE(descr->lphc) != CBS_SIMPLE ) + if( descr->lphc ) { /* make sure that combo parent doesn't hide us */ descr->lphc->wState |= CBF_NOROLLUP;