Changeset 1724 for trunk/src/user32/edit.cpp

Timestamp:

Nov 13, 1999, 5:42:43 PM (26 years ago)

Author:

cbratschi

Message:

merged with wine-991031, fixed edit bugs

File:

• trunk/src/user32/edit.cpp (modified) (8 diffs)

trunk/src/user32/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.13 1999-11-12 17:16:36 cbratschi Exp $ */
+/* $Id: edit.cpp,v 1.14 1999-11-13 16:42:41 cbratschi Exp $ */
 /*
  *      Edit control
@@ -9 +9 @@
  *      Copyright  1999 Christoph Bratschi
  *
- * WINE version: 990923
+ * WINE version: 991031
  */
 
@@ -184 +184 @@
 static BOOL     EDIT_EM_FmtLines(HWND hwnd, EDITSTATE *es, BOOL add_eol);
 static HLOCAL   EDIT_EM_GetHandle(HWND hwnd, EDITSTATE *es);
-static HLOCAL16 EDIT_EM_GetHandle16(HWND hwnd, EDITSTATE *es);
 static INT      EDIT_EM_GetLine(HWND hwnd, EDITSTATE *es, INT line, LPSTR lpch);
 static LRESULT  EDIT_EM_GetSel(HWND hwnd, EDITSTATE *es, LPUINT start, LPUINT end);
@@ -1077 +1076 @@
         EDIT_GetLineRect(hwnd, es, 0, start, end, &line_rect);
         if (IntersectRect(&rc, &line_rect, &es->format_rect))
-                InvalidateRect(hwnd, &rc, FALSE);
+        {
+          if (es->flags & EF_FOCUSED) HideCaret(hwnd);
+          InvalidateRect(hwnd, &rc, FALSE);
+          if (es->flags & EF_FOCUSED) ShowCaret(hwnd);
+        }
 }
 
@@ -1117 +1120 @@
         GetClientRect(hwnd, &rc1);
         IntersectRect(&rcWnd, &rc1, &es->format_rect);
+        if (es->flags & EF_FOCUSED) HideCaret(hwnd);
         if (sl == el) {
                 EDIT_GetLineRect(hwnd, es, sl, sc, ec, &rcLine);
@@ -1140 +1144 @@
                         InvalidateRect(hwnd, &rcUpdate, FALSE);
         }
+        if (es->flags & EF_FOCUSED) ShowCaret(hwnd);
 }
 
@@ -1181 +1186 @@
 {
         HLOCAL hNew32;
-        HLOCAL16 hNew16;
 
         if (size <= es->buffer_size)
@@ -2623 +2627 @@
         switch (c) {
         case '\r':
-            /* If the edit doesn't want the return, do nothing */
-            if(!(es->style & ES_WANTRETURN))
-                break;
+            /* 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) {