Skip to content

W
wine-winehq
Commit a4251bbe authored by Susan Farley's avatar Susan Farley Committed by Alexandre Julliard
Browse files
Options

Do not block CBN_EDITCHANGE for WM_PASTE or WM_CUT with the

NOEDITNOTIFY flag, as these msgs can come directly from the app to the combo wndproc.
parent ff59c33d
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
controls/combo.c
View file @ a4251bbe
...@@ -1873,9 +1873,6 @@ static inline LRESULT WINAPI ComboWndProc_locked( WND* pWnd, UINT message, ...@@ -1873,9 +1873,6 @@ static inline LRESULT WINAPI ComboWndProc_locked( WND* pWnd, UINT message,
case WM_SETTEXT: case WM_SETTEXT:
case WM_GETTEXTLENGTH: case WM_GETTEXTLENGTH:
case WM_CLEAR: case WM_CLEAR:
case WM_CUT:
case WM_PASTE:
case WM_COPY:
if ((message == WM_GETTEXTLENGTH) && !ISWIN31 && !(lphc->wState & CBF_EDIT)) if ((message == WM_GETTEXTLENGTH) && !ISWIN31 && !(lphc->wState & CBF_EDIT))
{ {
int j = SendMessageA( lphc->hWndLBox, LB_GETCURSEL, 0, 0 ); int j = SendMessageA( lphc->hWndLBox, LB_GETCURSEL, 0, 0 );
...@@ -1891,6 +1888,12 @@ static inline LRESULT WINAPI ComboWndProc_locked( WND* pWnd, UINT message, ...@@ -1891,6 +1888,12 @@ static inline LRESULT WINAPI ComboWndProc_locked( WND* pWnd, UINT message,
return ret; return ret;
} }
else return CB_ERR; else return CB_ERR;
case WM_CUT:
case WM_PASTE:
case WM_COPY:
if( lphc->wState & CBF_EDIT )
return SendMessageA( lphc->hWndEdit, message, wParam, lParam );
else return CB_ERR;
case WM_DRAWITEM: case WM_DRAWITEM:
case WM_DELETEITEM: case WM_DELETEITEM:
......
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