fix edit focus

Huw D M Davies h.davies1 at physics.ox.ac.uk
Mon Nov 3 11:36:07 CST 2003


        Huw Davies <huw at codeweavers.com>
        WM_LBUTTONDOWN calls SetFocus under Windows.  Remove the SetFocus in
	WM_MOUSEACTIVATE.
	
-- 
Huw Davies
huw at codeweavers.com

Index: controls/edit.c
===================================================================
RCS file: /home/wine/wine/controls/edit.c,v
retrieving revision 1.122
diff -u -r1.122 edit.c
--- controls/edit.c	21 Oct 2003 23:49:03 -0000	1.122
+++ controls/edit.c	3 Nov 2003 17:33:19 -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;
 
@@ -4242,6 +4235,7 @@
 	INT e;
 	BOOL after_wrap;
 
+        SetFocus(es->hwndSelf);
 	if (!(es->flags & EF_FOCUSED))
 		return 0;
 



More information about the wine-patches mailing list