Changeset 340 for trunk/src/user32/new/win32wnd.cpp

Timestamp:

Jul 19, 1999, 8:40:44 PM (26 years ago)

Author:

sandervl

Message:

Point/Rectangle bug fixes

File:

• trunk/src/user32/new/win32wnd.cpp (modified) (5 diffs)

trunk/src/user32/new/win32wnd.cpp

@@ -1 @@
-/* $Id: win32wnd.cpp,v 1.15 1999-07-19 13:58:38 sandervl Exp $ */
+/* $Id: win32wnd.cpp,v 1.16 1999-07-19 18:40:44 sandervl Exp $ */
 /*
  * Win32 Window Code for OS/2
@@ -391 +391 @@
         OffsetRect(&rectWindow, maxPos.x - rectWindow.left,
                                           maxPos.y - rectWindow.top);
-    dprintf(("Sending WM_CREATE"));
+        dprintf(("Sending WM_CREATE"));
         if( (SendInternalMessage(WM_CREATE, 0, (LPARAM)cs )) != -1 )
         {
             SetWindowPos(HWND_TOP, rectClient.left, rectClient.top,
-             rectClient.right-rectClient.left,
-             rectClient.bottom-rectClient.top,
-             SWP_NOACTIVATE);
+                         rectClient.right-rectClient.left,
+                         rectClient.bottom-rectClient.top,
+                         SWP_NOACTIVATE);
 
             if (cs->style & WS_VISIBLE) ShowWindow( sw );
@@ -1241 +1241 @@
  RECT rect;
 
-  if(OSLibWinQueryUpdateRect(OS2Hwnd, &rect))
-  {//update region not empty
-    SendInternalMessageA((isIcon) ? WM_PAINTICON : WM_PAINT, 0, 0);
-  }
-  return TRUE;
+    if(OSLibWinQueryUpdateRect(OS2Hwnd, &rect))
+    {//update region not empty
+        SendInternalMessageA((isIcon) ? WM_PAINTICON : WM_PAINT, 0, 0);
+    }
+    return TRUE;
 }
 //******************************************************************************
@@ -1251 +1251 @@
 BOOL Win32Window::IsIconic()
 {
-  return OSLibWinIsIconic(OS2Hwnd);
+    return OSLibWinIsIconic(OS2Hwnd);
 }
 //******************************************************************************
@@ -1263 +1263 @@
  HWND          hwndRelated;
 
-  dprintf(("GetWindow %x %d NOT COMPLETE", getWindowHandle(), uCmd));
-  switch(uCmd)
-  {
-    case GW_CHILD:
-        getcmd = QWOS_TOP;
-        break;
-    case GW_HWNDFIRST:
-        if(getParent()) {
-            getcmd = QWOS_TOP; //top of child windows
-        }
-        else    getcmd = QWOS_TOP; //TODO
-        break;
-    case GW_HWNDLAST:
-        if(getParent()) {
-            getcmd = QWOS_BOTTOM; //bottom of child windows
-        }
-        else    getcmd = QWOS_BOTTOM; //TODO
-        break;
-    case GW_HWNDNEXT:
-        getcmd = QWOS_NEXT;
-        break;
-    case GW_HWNDPREV:
-        getcmd = QWOS_PREV;
-        break;
-    case GW_OWNER:
-        if(owner) {
-            return owner->getWindowHandle();
-        }
-        else    return 0;
-  }
-  hwndRelated = OSLibWinQueryWindow(OS2Hwnd, getcmd);
-  if(hwndRelated)
-  {
-    win32wnd = (Win32Window *)OSLibWinGetWindowULong(hwndRelated, OFFSET_WIN32WNDPTR);
-    magic    = OSLibWinGetWindowULong(hwndRelated, OFFSET_WIN32PM_MAGIC);
-    if(CheckMagicDword(magic) && win32wnd)
+    dprintf(("GetWindow %x %d NOT COMPLETE", getWindowHandle(), uCmd));
+    switch(uCmd)
     {
-        return win32wnd->getWindowHandle();
+        case GW_CHILD:
+            getcmd = QWOS_TOP;
+            break;
+        case GW_HWNDFIRST:
+            if(getParent()) {
+                    getcmd = QWOS_TOP; //top of child windows
+            }
+            else    getcmd = QWOS_TOP; //TODO
+            break;
+        case GW_HWNDLAST:
+            if(getParent()) {
+                    getcmd = QWOS_BOTTOM; //bottom of child windows
+            }
+            else    getcmd = QWOS_BOTTOM; //TODO
+            break;
+        case GW_HWNDNEXT:
+            getcmd = QWOS_NEXT;
+            break;
+        case GW_HWNDPREV:
+            getcmd = QWOS_PREV;
+            break;
+        case GW_OWNER:
+            if(owner) {
+                    return owner->getWindowHandle();
+            }
+            else    return 0;
     }
-  }
-  return 0;
+    hwndRelated = OSLibWinQueryWindow(OS2Hwnd, getcmd);
+    if(hwndRelated)
+    {
+        win32wnd = (Win32Window *)OSLibWinGetWindowULong(hwndRelated, OFFSET_WIN32WNDPTR);
+        magic    = OSLibWinGetWindowULong(hwndRelated, OFFSET_WIN32PM_MAGIC);
+        if(CheckMagicDword(magic) && win32wnd)
+        {
+            return win32wnd->getWindowHandle();
+        }
+    }
+    return 0;
 }
 //******************************************************************************