Skip to content

W
wine-winehq
Commit 4782b0e5 authored by Guy L. Albertelli's avatar Guy L. Albertelli Committed by Alexandre Julliard
Browse files
Options

- When painting the text, if the control is OWNERDRAWN the issue the

WM_DRAWITEM message. - Set the focused status at the end of the end of the Setfocus routine. - Flip the order of updating the list box and issuing the WM_NOTIFY for CBN_EDITUPDATE to match native.
parent e939eae0
Show whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
controls/combo.c
View file @ 4782b0e5
......@@ -758,6 +758,7 @@ static void CBPaintText(
} else return;
}
else
if( !CB_OWNERDRAWN(lphc) )
return;
if( lphc->wState & CBF_EDIT )
......@@ -1284,6 +1285,7 @@ static void COMBO_SetFocus( LPHEADCOMBO lphc )
InvalidateRect(CB_HWND(lphc), &lphc->textRect, TRUE);
CB_NOTIFY( lphc, CBN_SETFOCUS );
lphc->wState |= CBF_FOCUSED;
}
}
......@@ -1355,9 +1357,6 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd )
* checks a flag that is set in these occasions and ignores the
* notification.
*/
if (!(lphc->wState & CBF_NOEDITNOTIFY))
CB_NOTIFY( lphc, CBN_EDITCHANGE );
if (lphc->wState & CBF_NOLBSELECT)
{
lphc->wState &= ~CBF_NOLBSELECT;
......@@ -1366,6 +1365,9 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd )
{
CBUpdateLBox( lphc, lphc->wState & CBF_DROPPED );
}
if (!(lphc->wState & CBF_NOEDITNOTIFY))
CB_NOTIFY( lphc, CBN_EDITCHANGE );
break;
case (EN_UPDATE >> 8):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment