From 0e799c6d7bfefcce10323680ecd249286046cce4 Mon Sep 17 00:00:00 2001 From: Dmitry Timoshkov Date: Wed, 19 Dec 2007 17:36:36 +0800 Subject: [PATCH] user32: Set the edit text in a combobox only if combobox has strings. --- dlls/user32/combo.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index b8466184163..6f0fd84cf2d 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -1030,9 +1030,12 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index ) } } - lphc->wState |= (CBF_NOEDITNOTIFY | CBF_NOLBSELECT); - SendMessageW(lphc->hWndEdit, WM_SETTEXT, 0, pText ? (LPARAM)pText : (LPARAM)empty_stringW); - lphc->wState &= ~(CBF_NOEDITNOTIFY | CBF_NOLBSELECT); + if( CB_HASSTRINGS(lphc) ) + { + lphc->wState |= (CBF_NOEDITNOTIFY | CBF_NOLBSELECT); + SendMessageW(lphc->hWndEdit, WM_SETTEXT, 0, pText ? (LPARAM)pText : (LPARAM)empty_stringW); + lphc->wState &= ~(CBF_NOEDITNOTIFY | CBF_NOLBSELECT); + } if( lphc->wState & CBF_FOCUSED ) SendMessageW(lphc->hWndEdit, EM_SETSEL, 0, (LPARAM)(-1));