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

Timestamp:

Dec 24, 2000, 3:54:07 PM (25 years ago)

Author:

sandervl

Message:

MDI + SetParent + activation fixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.225 2000-12-17 15:04:11 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.226 2000-12-24 14:54:07 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -2374 +2374 @@
 void Win32BaseWindow::NotifyFrameChanged(WINDOWPOS *wpos, RECT *oldClientRect)
 {
+ HRGN hrgn, hrgnClient;
+ RECT rect;
+
     MsgFormatFrame(NULL);
     if(RECT_WIDTH(rectClient) != RECT_WIDTH(*oldClientRect) ||
@@ -2384 +2387 @@
     SendInternalMessageA(WM_WINDOWPOSCHANGING, 0, (LPARAM)wpos);
 
-    UnionRect(oldClientRect, oldClientRect, &rectClient);
-    OffsetRect(oldClientRect, -rectClient.left, -rectClient.top);
-    InvalidateRect(getWindowHandle(), oldClientRect, TRUE);
-
     if ((wpos->hwndInsertAfter != wpOld.hwndInsertAfter) ||
         (wpos->x != wpOld.x) || (wpos->y != wpOld.y) || (wpos->cx != wpOld.cx) || (wpos->cy != wpOld.cy) || (wpos->flags != wpOld.flags))
@@ -2395 +2394 @@
     }
     else SendInternalMessageA(WM_WINDOWPOSCHANGED, 0, (LPARAM)wpos);
+
+    rect = rectWindow;
+    OffsetRect(&rect, -rectWindow.left, -rectWindow.top);
+    hrgn = CreateRectRgnIndirect(&rect);
+    if (!hrgn) {
+         dprintf(("ERROR: NotifyFrameChanged, CreateRectRgnIndirect failed!!"));
+         return;
+    }
+    rect = rectClient;
+    OffsetRect(&rect, -rectClient.left, -rectClient.top);
+    hrgnClient = CreateRectRgnIndirect(&rect);
+    if (!hrgn) {
+         dprintf(("ERROR: NotifyFrameChanged, CreateRectRgnIndirect failed!!"));
+         return;
+    }
+    CombineRgn(hrgn, hrgn, hrgnClient, RGN_DIFF);
+    DeleteObject(hrgnClient);
+
+    if(!EqualRect(oldClientRect, &rectClient)) {
+         UnionRect(oldClientRect, oldClientRect, &rectClient);
+         OffsetRect(oldClientRect, -rectClient.left, -rectClient.top);
+         hrgnClient = CreateRectRgnIndirect(oldClientRect);
+         if (!hrgn) {
+              dprintf(("ERROR: NotifyFrameChanged, CreateRectRgnIndirect failed!!"));
+              return;
+         }
+         CombineRgn(hrgn, hrgn, hrgnClient, RGN_OR);
+         DeleteObject(hrgnClient);
+    }
+    InvalidateRgn(getWindowHandle(), hrgn, TRUE);
+    DeleteObject(hrgn);
 }
 //******************************************************************************
@@ -2552 +2582 @@
    if(fCreated && (getStyle() & WS_VISIBLE)) {
         ShowWindow(SW_HIDE);
-    fShow = TRUE;
+        fShow = TRUE;
    }
 
@@ -2563 +2593 @@
         if(!(getStyle() & WS_CHILD))
         {
-        //TODO: Send WM_STYLECHANGED msg?
+            //TODO: Send WM_STYLECHANGED msg?
             setStyle(getStyle() | WS_CHILD);
             if(getWindowId())
@@ -2586 +2616 @@
    */
    if(fCreated) {
-    SetWindowPos(HWND_TOPMOST, 0, 0, 0, 0,
-                 SWP_NOMOVE|SWP_NOSIZE|(fShow? SWP_SHOWWINDOW : 0));
+        SetWindowPos(HWND_TOPMOST, 0, 0, 0, 0,
+                     SWP_NOACTIVATE|SWP_NOMOVE|SWP_NOSIZE|(fShow? SWP_SHOWWINDOW : 0));
 
    /* FIXME: a WM_MOVE is also generated (in the DefWindowProc handler
@@ -2978 +3008 @@
         }
     }
-
-    if(OSLibWinSetActiveWindow(OS2Hwnd) == FALSE) {
-        dprintf(("OSLibWinSetActiveWindow %x returned FALSE!", OS2Hwnd));
-    }
+    SetWindowPos(HWND_TOP, 0,0,0,0, SWP_NOSIZE | SWP_NOMOVE );
+
+//    if(OSLibWinSetActiveWindow(OS2Hwnd) == FALSE) {
+//        dprintf(("OSLibWinSetActiveWindow %x returned FALSE!", OS2Hwnd));
+//    }
     hwndActive = GetActiveWindow();
     return (hwndActive) ? hwndActive : windowDesktop->getWindowHandle(); //pretend the desktop was active