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

Timestamp:

Dec 27, 1999, 11:54:49 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.121 1999-12-27 17:08:08 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.122 1999-12-27 22:53:53 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -362 +362 @@
 
   /* Fix the coordinates */
-  if (cs->x == CW_USEDEFAULT || cs->x == CW_USEDEFAULT16)
+  if ((cs->x == CW_USEDEFAULT) || (cs->x == CW_USEDEFAULT16))
   {
 //        PDB *pdb = PROCESS_Current();
@@ -382 +382 @@
         * the one that comes with Win95 and NT)
         */
-        if (cs->y != CW_USEDEFAULT && cs->y != CW_USEDEFAULT16) sw = cs->y;
+        if ((cs->y != CW_USEDEFAULT) && (cs->y != CW_USEDEFAULT16)) sw = cs->y;
 
         /* We have saved cs->y, now we can trash it */
@@ -397 +397 @@
 //        }
   }
-  if (cs->cx == CW_USEDEFAULT || cs->cx == CW_USEDEFAULT16)
+  if ((cs->cx == CW_USEDEFAULT) || (cs->cx == CW_USEDEFAULT16))
   {
 #if 0
@@ -439 +439 @@
   {
         SetParent(0);
-        if (!cs->hwndParent || cs->hwndParent == windowDesktop->getWindowHandle()) {
+        if (!cs->hwndParent || (cs->hwndParent == windowDesktop->getWindowHandle())) {
             owner = NULL;
         }
@@ -784 +784 @@
     SendInternalMessageA(WM_NCDESTROY, 0, 0);
 
-    if (hwndHorzScroll && OSLibWinQueryWindow(hwndHorzScroll,QWOS_PARENT) == OSLibWinQueryObjectWindow()) OSLibWinDestroyWindow(hwndHorzScroll);
-    if (hwndVertScroll && OSLibWinQueryWindow(hwndVertScroll,QWOS_PARENT) == OSLibWinQueryObjectWindow()) OSLibWinDestroyWindow(hwndVertScroll);
+    if (hwndHorzScroll && (OSLibWinQueryWindow(hwndHorzScroll,QWOS_PARENT) == OSLibWinQueryObjectWindow())) OSLibWinDestroyWindow(hwndHorzScroll);
+    if (hwndVertScroll && (OSLibWinQueryWindow(hwndVertScroll,QWOS_PARENT) == OSLibWinQueryObjectWindow())) OSLibWinDestroyWindow(hwndVertScroll);
 
     TIMER_KillTimerFromWindow(OS2Hwnd);
@@ -991 +991 @@
 
         HWND hwndActive = GetActiveWindow();
-        if (hwndTop && getWindowHandle() != hwndActive)
+        if (hwndTop && (getWindowHandle() != hwndActive))
         {
                 LONG ret = SendInternalMessageA(WM_MOUSEACTIVATE, hwndTop,
@@ -1342 +1342 @@
     UINT uCommand = wParam & 0xFFF0;
 
-    if (getStyle() & WS_CHILD && uCommand != SC_KEYMENU )
+    if ((getStyle() & WS_CHILD) && (uCommand != SC_KEYMENU))
         ScreenToClient(getParent()->getWindowHandle(), pt32 );
 
@@ -2202 +2202 @@
         window = GetWindowFromHandle(hwnd++);
         if(window) {
-            if (window->getStyle() & WS_POPUP || (window->getStyle() & WS_CAPTION) == WS_CAPTION)
+            if ((window->getStyle() & WS_POPUP) || ((window->getStyle() & WS_CAPTION) == WS_CAPTION))
             {
 
@@ -2228 +2228 @@
         window = GetWindowFromHandle(hwnd++);
         if(window) {
-            if (window->getStyle() & WS_POPUP || (window->getStyle() & WS_CAPTION) == WS_CAPTION)
+            if ((window->getStyle() & WS_POPUP) || ((window->getStyle() & WS_CAPTION) == WS_CAPTION))
             {
 
@@ -3012 +3012 @@
   if(IsWindowDestroyed()) return;
 
-  //CB: todo: dwExStyle, creating new frame controls, destroy not used, WS_VISIBLE, ...
+  //CB: todo: dwExStyle, creating new frame controls, destroy not used controls, WS_VISIBLE, WS_CHILD, ...
   //    write test cases
-  if (dwStyle & 0xFFFF0000 != oldStyle & 0xFFFF0000)
+  if ((dwStyle & 0xFFFF0000) != (oldStyle & 0xFFFF0000))
+  {
+    //dprintf(("updateWindowStyle: %x %x",oldStyle,dwStyle));
     OSLibSetWindowStyle(OS2HwndFrame, dwStyle, fTaskList);
+  }
 }
 //******************************************************************************
@@ -3271 +3274 @@
         }
 
-        if (!child || child->getParent() != this)
+        if (!child || (child->getParent() != this))
         {
             retvalue = 0;
@@ -3339 +3342 @@
         }
 
-        if (!child || child->getParent() != this)
+        if (!child || (child->getParent() != this))
         {
             retvalue = 0;
@@ -3368 +3371 @@
     while (TRUE)
     {
-        if (!nextchild || nextchild->getStyle() & WS_GROUP)
+        if (!nextchild || (nextchild->getStyle() & WS_GROUP))
         {
             /* Wrap-around to the beginning of the group */