user32: Let ComboBox edit control handle the redraw even if CBF_NOREDRAW is set.

Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

user32: Let ComboBox edit control handle the redraw even if CBF_NOREDRAW is set.
910129fc · Piotr Caban · Alexandre Julliard · 030803b4 · 910129fc
Commit 910129fc authored Jan 05, 2018 by Piotr Caban Committed by Alexandre Julliard Jan 05, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 3 deletions

combo.c dlls/user32/combo.c +2 -3

No files found.
--- a/dlls/user32/combo.c
+++ b/dlls/user32/combo.c
@@ -703,8 +703,6 @@ static void CBPaintText(
   INT	id, size = 0;
   LPWSTR pText = NULL;

-   if( lphc->wState & CBF_NOREDRAW ) return;
-
   TRACE("\n");

   /* follow Windows combobox that sends a bunch of text
@@ -733,8 +731,9 @@ static void CBPaintText(
 	if( lphc->wState & CBF_FOCUSED )
           SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, -1);
   }
-   else if( IsWindowVisible( lphc->self )) /* paint text field ourselves */
+   else if(!(lphc->wState & CBF_NOREDRAW) && IsWindowVisible( lphc->self ))
   {
+     /* paint text field ourselves */
     HDC hdc = hdc_paint ? hdc_paint : GetDC(lphc->self);
     UINT itemState = ODS_COMBOBOXEDIT;
     HFONT hPrevFont = (lphc->hFont) ? SelectObject(hdc, lphc->hFont) : 0;