From a4251bbe4cbaebb7d64372f55b0426d10c273231 Mon Sep 17 00:00:00 2001
From: Susan Farley <susan@codeweavers.com>
Date: Tue, 24 Oct 2000 01:38:49 +0000
Subject: [PATCH] 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.

---
 controls/combo.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/controls/combo.c b/controls/combo.c
index 7a24964aef6..9be52c4ec79 100644
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -1873,9 +1873,6 @@ static inline LRESULT WINAPI ComboWndProc_locked( WND* pWnd, UINT message,
 	case WM_SETTEXT:
 	case WM_GETTEXTLENGTH:
 	case WM_CLEAR:
-	case WM_CUT:
-        case WM_PASTE:
-	case WM_COPY:
                 if ((message == WM_GETTEXTLENGTH) && !ISWIN31 && !(lphc->wState & CBF_EDIT))
                 {
                 int j = SendMessageA( lphc->hWndLBox, LB_GETCURSEL, 0, 0 );
@@ -1891,6 +1888,12 @@ static inline LRESULT WINAPI ComboWndProc_locked( WND* pWnd, UINT message,
 		    return ret;
 		}
 		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_DELETEITEM: