Skip to content

W
wine-cw
Commit 2e34030a authored by Huw D M Davies's avatar Huw D M Davies Committed by Alexandre Julliard
Browse files
Options

Stop a WM_SETTEXT message (and friends) to a combo sending CBN_EDIT*

messages to the parent.
parent fdc1065b
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 11 deletions
controls/combo.c
View file @ 2e34030a
...@@ -1110,8 +1110,8 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index ) ...@@ -1110,8 +1110,8 @@ static void CBUpdateEdit( LPHEADCOMBO lphc , INT index )
} }
lphc->wState |= CBF_NOEDITNOTIFY; lphc->wState |= CBF_NOEDITNOTIFY;
SendMessageA( lphc->hWndEdit, WM_SETTEXT, 0, pText ? (LPARAM)pText : (LPARAM)"" ); SendMessageA( lphc->hWndEdit, WM_SETTEXT, 0, pText ? (LPARAM)pText : (LPARAM)"" );
lphc->wState &= ~CBF_NOEDITNOTIFY;
if( pText ) if( pText )
HeapFree( GetProcessHeap(), 0, pText ); HeapFree( GetProcessHeap(), 0, pText );
...@@ -1380,20 +1380,15 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd ) ...@@ -1380,20 +1380,15 @@ static LRESULT COMBO_Command( LPHEADCOMBO lphc, WPARAM wParam, HWND hWnd )
* checks a flag that is set in these occasions and ignores the * checks a flag that is set in these occasions and ignores the
* notification. * notification.
*/ */
if (lphc->wState & CBF_NOEDITNOTIFY) if (!(lphc->wState & CBF_NOEDITNOTIFY))
{
lphc->wState &= ~CBF_NOEDITNOTIFY;
}
else
{
CB_NOTIFY( lphc, CBN_EDITCHANGE ); CB_NOTIFY( lphc, CBN_EDITCHANGE );
}
CBUpdateLBox( lphc ); CBUpdateLBox( lphc );
break; break;
case (EN_UPDATE >> 8): case (EN_UPDATE >> 8):
CB_NOTIFY( lphc, CBN_EDITUPDATE ); if (!(lphc->wState & CBF_NOEDITNOTIFY))
CB_NOTIFY( lphc, CBN_EDITUPDATE );
break; break;
case (EN_ERRSPACE >> 8): case (EN_ERRSPACE >> 8):
...@@ -1887,9 +1882,11 @@ static inline LRESULT WINAPI ComboWndProc_locked( WND* pWnd, UINT message, ...@@ -1887,9 +1882,11 @@ static inline LRESULT WINAPI ComboWndProc_locked( WND* pWnd, UINT message,
} }
else if( lphc->wState & CBF_EDIT ) else if( lphc->wState & CBF_EDIT )
{ {
LRESULT ret;
lphc->wState |= CBF_NOEDITNOTIFY; lphc->wState |= CBF_NOEDITNOTIFY;
ret = SendMessageA( lphc->hWndEdit, message, wParam, lParam );
return SendMessageA( lphc->hWndEdit, message, wParam, lParam ); lphc->wState &= ~CBF_NOEDITNOTIFY;
return ret;
} }
else return CB_ERR; else return CB_ERR;
......
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