Changeset 1263 for trunk/src

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

Location:

trunk/src/user32

Files:

• edit.cpp (modified) (5 diffs)
• oslibwin.cpp (modified) (3 diffs)
• win32dlg.cpp (modified) (3 diffs)
• windlg.cpp (modified) (3 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");
 }
 

trunk/src/user32/oslibwin.cpp

@@ -1 @@
-/* $Id: oslibwin.cpp,v 1.24 1999-10-12 18:51:38 sandervl Exp $ */
+/* $Id: oslibwin.cpp,v 1.25 1999-10-12 20:16:23 sandervl Exp $ */
 /*
  * Window API wrappers for OS/2
@@ -625 +625 @@
          y = pswpOld->y;
 
+//SvL: TEST
+#if 0
          if (!((y == 0) && (pswpOld->cy == 0)))
          {
             y = parentHeight - y - pswpOld->cy;
          }
-         else     y = parentHeight - y - cy;
+#endif
       }
-      else     y = parentHeight - y - cy;
  
       if (flags & SWP_SIZE)
@@ -643 +644 @@
          cy = pswpOld->cy;
       }
+      y  = parentHeight - y - cy;
+      
 
        if ((pswpOld->x == x) && (pswpOld->y == y))

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.11 1999-10-11 20:54:25 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.12 1999-10-12 20:16:23 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -561 +561 @@
         dlgtemplate = (LPCSTR)getControl( (WORD *)dlgtemplate, &info, dlgInfo.dialogEx );
 
+        dprintf(("Create CONTROL %d", info.id));
         hwndCtrl = CreateWindowExW( info.exStyle | WS_EX_NOPARENTNOTIFY,
                                     (LPCWSTR)info.className,
@@ -587 +588 @@
             idResult = ::GetWindowWord( hwndCtrl, GWW_ID );
         }
+        dprintf(("Create CONTROL %d DONE", info.id));
     }
     return TRUE;

trunk/src/user32/windlg.cpp

@@ -1 @@
-/* $Id: windlg.cpp,v 1.5 1999-10-11 16:04:52 cbratschi Exp $ */
+/* $Id: windlg.cpp,v 1.6 1999-10-12 20:16:24 sandervl Exp $ */
 /*
  * Win32 dialog apis for OS/2
@@ -221 +221 @@
 }
 //******************************************************************************
+//TODO: Can be used for any parent-child pair
 //******************************************************************************
 HWND WIN32API GetDlgItem(HWND hwnd, int id)
@@ -233 +234 @@
         return 0;
     }
-    dprintf(("USER32:  GetDlgItem\n"));
     dlgcontrol = dialog->getDlgItem(id);
     if(dlgcontrol) {
+        dprintf(("USER32: GetDlgItem %x %d returned %x\n", hwnd, id, dlgcontrol->getWindowHandle()));
         return dlgcontrol->getWindowHandle();
     }
+    dprintf(("USER32: GetDlgItem %x %d NOT FOUND!\n", hwnd, id));
     return 0;
 }