Changeset 2781 for trunk/src/user32/win32wbase.cpp

Timestamp:

Feb 14, 2000, 6:30:11 PM (26 years ago)

Author:

cbratschi

Message:

merged combobox with core 20000212

File:

• trunk/src/user32/win32wbase.cpp (modified) (3 diffs)

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.160 2000-02-09 13:42:38 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.161 2000-02-14 17:30:11 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -334 +334 @@
         fCXDefault = TRUE;
   }
+  if (cs->style & (WS_POPUP | WS_CHILD))
+  {
+    fXDefault = FALSE;
+    if (fCXDefault)
+    {
+      fCXDefault = FALSE;
+      cs->cx = cs->cy = 0;
+    }
+  }
   if (fXDefault && !fCXDefault) fXDefault = FALSE; //CB: only x positioning doesn't work (calc.exe,cdrlabel.exe)
 
@@ -1352 +1361 @@
     {
         dprintf(("DefWndProc: WM_SETCURSOR for %x Msg %s", Win32Hwnd, GetMsgText(HIWORD(lParam))));
-        if(getStyle() & WS_CHILD && !(getExStyle() & WS_EX_NOPARENTNOTIFY) )
+        if((getStyle() & WS_CHILD) && !(getExStyle() & WS_EX_NOPARENTNOTIFY))
         {
             if(getParent()) {