commit 5ca2ec428812962e1eb64a6059305eb26b27aff6
author Stephane Lussier <stephane@macadamian.com> Mon Sep 27 11:45:07 1999 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Sep 27 11:45:07 1999 +0000
tree 9e2ec7bd21f4bd44250563b5658b7983a9aac6ec
parent ec09a400a7dd15bcf3d071217753a78cfd4b5a4a

Return key should not be ignored in multiline edit even if
ES_WANTRETURN flag isn't set.

controls/edit.c

diff --git a/controls/edit.c b/controls/edit.c
index a2318c8..1e53fb7 100644
--- a/controls/edit.c
+++ b/controls/edit.c
@@ -2896,8 +2896,8 @@
         BOOL control = GetKeyState(VK_CONTROL) & 0x8000;
 	switch (c) {
 	case '\r':
-	    /* If the edit doesn't want the return, do nothing */
-	    if(!(es->style & ES_WANTRETURN))
+	    /* If the edit doesn't want the return and it's not a multiline edit, do nothing */
+	    if(!(es->style & ES_MULTILINE) && !(es->style & ES_WANTRETURN))
 		break;
 	case '\n':
 		if (es->style & ES_MULTILINE) {