From 6213ab3a8902500b785630501c8d23bb30dbbeda Mon Sep 17 00:00:00 2001
From: Aric Stewart <aric@codeweavers.com>
Date: Tue, 5 Dec 2000 21:12:05 +0000
Subject: [PATCH] Fixed a problem where the string in a combo box flickers if
 you rapidly reset the content and then replace the content.

---
 controls/combo.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/controls/combo.c b/controls/combo.c
index 52a57f53dca..d8ca4357d41 100644
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -1999,7 +1999,10 @@ static inline LRESULT WINAPI ComboWndProc_locked( WND* pWnd, UINT message,
 	case CB_RESETCONTENT16: 
 	case CB_RESETCONTENT:
 		SendMessageA( lphc->hWndLBox, LB_RESETCONTENT, 0, 0 );
-		InvalidateRect(CB_HWND(lphc), NULL, TRUE);
+                if( CB_HASSTRINGS(lphc) )
+                    SendMessageA( lphc->hWndEdit, WM_SETTEXT, 0, (LPARAM)"" );
+                else
+                    InvalidateRect(CB_HWND(lphc), NULL, TRUE);
 		return  TRUE;
 	case CB_INITSTORAGE:
 		return  SendMessageA( lphc->hWndLBox, LB_INITSTORAGE, wParam, lParam);
-- 
2.11.4.GIT