Changeset 6317 for trunk/src

Timestamp:

Jul 13, 2001, 4:31:39 PM (24 years ago)

Author:

sandervl

Message:

remove wrong check for negative x & y coordinates during window creation

Location:

trunk/src/user32

Files:

• win32wbase.cpp (modified) (2 diffs)
• windowclass.cpp (modified) (3 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.275 2001-07-05 10:45:25 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.276 2001-07-13 14:31:15 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -410 +410 @@
     if (fXDefault && !fCXDefault) fXDefault = FALSE; //CB: only x positioning doesn't work (calc.exe,cdrlabel.exe)
 
-    if (cs->x < 0) cs->x = 0;
-    if (cs->y < 0) cs->y = 0;
-
     //Allocate window words
     nrUserWindowBytes = windowClass->getExtraWndBytes();

trunk/src/user32/windowclass.cpp

@@ -1 @@
-/* $Id: windowclass.cpp,v 1.21 2001-06-09 14:50:26 sandervl Exp $ */
+/* $Id: windowclass.cpp,v 1.22 2001-07-13 14:31:39 sandervl Exp $ */
 /*
  * Win32 Window Class Code for OS/2
@@ -68 +68 @@
     int iSmIconHeight = GetSystemMetrics(SM_CYSMICON);
 
-    wc.hIconSm = CopyImage(wc.hIcon, IMAGE_ICON, iSmIconWidth, iSmIconHeight,
-                           LR_COPYFROMRESOURCE);
+    if(wc.hIcon)
+        wc.hIconSm = CopyImage(wc.hIcon, IMAGE_ICON, iSmIconWidth, iSmIconHeight,
+                               LR_COPYFROMRESOURCE);
 
     wclass = new Win32WndClass(&wc,FALSE);
@@ -138 +139 @@
     int iSmIconHeight = GetSystemMetrics(SM_CYSMICON);
 
-    wc.hIconSm = CopyImage(wc.hIcon, IMAGE_ICON, iSmIconWidth, iSmIconHeight,
-                           LR_COPYFROMRESOURCE);
+    if(wc.hIcon)
+        wc.hIconSm = CopyImage(wc.hIcon, IMAGE_ICON, iSmIconWidth, iSmIconHeight,
+                               LR_COPYFROMRESOURCE);
 
     dprintf(("RegisterClassW"));