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

Timestamp:

Oct 12, 1999, 10:16:24 PM (26 years ago)

Author:

sandervl

Message:

Bugfix for SetPos bugfix, Edit controls now work, experimental fix in Edit control for VPBuddy

File:

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

trunk/src/user32/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.3 1999-10-12 18:14:54 sandervl Exp $ */
+/* $Id: edit.cpp,v 1.4 1999-10-12 20:16:22 sandervl Exp $ */
 /*
  *      Edit control
@@ -1853 +1853 @@
         i = EDIT_EM_LineIndex(hwnd, es, line);
         src = es->text + i;
-        len = MIN(*(WORD *)lpch, EDIT_EM_LineLength(hwnd, es, i));
+        //SvL: Shouldn't this be *lpch-1? For terminating 0
+        //len = MIN(*(WORD *)lpch-1, EDIT_EM_LineLength(hwnd, es, i));
+        len = MIN(*(WORD *)lpch, EDIT_EM_LineLength(hwnd, es, i));
         for (i = 0 ; i < len ; i++) {
                 *lpch = *src;
@@ -1859 +1861 @@
                 lpch++;
         }
+        //SvL: Terminate string
+        //*lpch = 0;
         return (LRESULT)len;
 }
@@ -3172 +3176 @@
         BOOL after_wrap;
 
+        //SvL: Set focus
+        SetFocus(hwnd);
+
         if (!(es->flags & EF_FOCUSED))
                 return 0;
@@ -3457 +3464 @@
                 EDIT_InvalidateText(hwnd, es, es->selection_start, es->selection_end);
         ShowCaret(hwnd);
-        EDIT_NOTIFY_PARENT(hwnd, EN_SETFOCUS, "EN_SETFOCUS");
+//SvL: TEST
+//        EDIT_NOTIFY_PARENT(hwnd, EN_SETFOCUS, "EN_SETFOCUS");
 }