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

Timestamp:

Mar 18, 2000, 5:13:41 PM (25 years ago)

Author:

cbratschi

Message:

merged with Corel 20000317, small icon

File:

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

trunk/src/user32/edit.cpp

@@ -1 @@
-/* $Id: edit.cpp,v 1.37 2000-03-06 22:39:03 sandervl Exp $ */
+/* $Id: edit.cpp,v 1.38 2000-03-18 16:13:26 cbratschi Exp $ */
 /*
  *      Edit control
@@ -9 +9 @@
  *      Copyright  1999 Christoph Bratschi
  *
- * Corel version: 20000212
- * WINE version: 991212
+ * Corel version: 20000317
+ * (WINE version: 991212)
  *
  * Status:  complete
@@ -590 +590 @@
         case WM_GETDLGCODE:
                 //DPRINTF_EDIT_MSG32("WM_GETDLGCODE");
-                result = (es->style & ES_MULTILINE) ?
-                                DLGC_WANTALLKEYS | DLGC_HASSETSEL | DLGC_WANTCHARS | DLGC_WANTARROWS :
-                                DLGC_HASSETSEL | DLGC_WANTCHARS | DLGC_WANTARROWS;
-                break;
+                result = DLGC_HASSETSEL | DLGC_WANTCHARS | DLGC_WANTARROWS;
+                if (es->style & ES_WANTRETURN)
+                {
+                   LPMSG msg = (LPMSG)lParam;
+                   if (msg && (msg->message == WM_KEYDOWN) && (msg->wParam == VK_RETURN))
+                      result |= DLGC_WANTMESSAGE;
+                }
+                break;
 
         case WM_CHAR:
@@ -1259 +1263 @@
         HLOCAL hNew32;
 
-        if (size <= es->buffer_size)
-                return TRUE;
         if (size > es->buffer_limit) {
                 EDIT_NOTIFY_PARENT(hwnd, EN_MAXTEXT);
                 return FALSE;
         }
+        if (size <= es->buffer_size)
+                return TRUE;
         size = ((size / GROWLENGTH) + 1) * GROWLENGTH;
         if (size > es->buffer_limit)
@@ -2222 +2226 @@
         nyoff = MAX(0, es->y_offset + dy);
 
-        //SvL: If nyoff > nr lines in control -> last line in control 
+        //SvL: If nyoff > nr lines in control -> last line in control
         //     window should show last line of control
         //     Wine code shows last line at the top of the control
         //     (Quake 3 startup edit control shows the problem)
         if (nyoff >= es->line_count) {
-                if(es->line_count <= vlc) {
-                        nyoff = es->y_offset;   //no need to scroll
-                }
-                else    nyoff = es->line_count - vlc - 1;
+                if(es->line_count <= vlc) {
+                        nyoff = es->y_offset;   //no need to scroll
+                }
+                else    nyoff = es->line_count - vlc - 1;
         }
         dy = (es->y_offset - nyoff) * es->line_height;
@@ -4039 +4043 @@
              while processing WM_SETTEXT */
           EDIT_NOTIFY_PARENT(hwnd, EN_CHANGE);
-          es->flags &= EF_UPDATE;
+          es->flags &= ~EF_UPDATE;
         }
 }