Changeset 3873 for trunk/src/user32/pmwindow.cpp

Timestamp:

Jul 20, 2000, 8:08:13 PM (25 years ago)

Author:

sandervl

Message:

SetWindowPlacement, CreateCaret & Set/GetCaretPos fixes

File:

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

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.99 2000-07-19 19:05:24 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.100 2000-07-20 18:08:12 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -293 +293 @@
         {
            Win32BaseWindow *wndAfter = Win32BaseWindow::GetWindowFromOS2Handle(pswp->hwndInsertBehind);
-           if(wndAfter) wp.hwndInsertAfter = wndAfter->getWindowHandle();
+           if(wndAfter) {
+                wp.hwndInsertAfter = wndAfter->getWindowHandle();
+           }
+           else wp.hwndInsertAfter = HWND_TOP_W;
         }
 
@@ -363 +366 @@
         } 
         else  OSLibMapSWPtoWINDOWPOS(pswp, &wp, &swpOld, OSLibQueryScreenHeight(), 0, 0, hwnd);
+
+        wp.hwnd = win32wnd->getWindowHandle();
+        if ((pswp->fl & SWP_ZORDER) && (pswp->hwndInsertBehind > HWND_BOTTOM))
+        {
+           Win32BaseWindow *wndAfter = Win32BaseWindow::GetWindowFromOS2Handle(pswp->hwndInsertBehind);
+           if(wndAfter) {
+                wp.hwndInsertAfter = wndAfter->getWindowHandle();
+           }
+           else wp.hwndInsertAfter = HWND_TOP_W;
+        }
 
         if(pswp->fl & SWP_ACTIVATE)