Index: controls/edit.c
===================================================================
RCS file: /home/wine/wine/controls/edit.c,v
retrieving revision 1.121
diff -u -r1.121 edit.c
--- controls/edit.c	17 Sep 2003 04:28:29 -0000	1.121
+++ controls/edit.c	19 Sep 2003 09:29:39 -0000
@@ -890,13 +890,6 @@
 		break;
 
 	case WM_MOUSEACTIVATE:
-		/*
-		 *	FIXME: maybe DefWindowProc() screws up, but it seems that
-		 *		modeless dialog boxes need this.  If we don't do this, the focus
-		 *		will _not_ be set by DefWindowProc() for edit controls in a
-		 *		modeless dialog box ???
-		 */
-		SetFocus(hwnd);
 		result = MA_ACTIVATE;
 		break;
 
@@ -4238,6 +4231,7 @@
 	INT e;
 	BOOL after_wrap;
 
+        SetFocus(es->hwndSelf);
 	if (!(es->flags & EF_FOCUSED))
 		return 0;