Changeset 2426 for trunk/src/user32/new/pmframe.cpp

Timestamp:

Jan 13, 2000, 2:54:55 PM (26 years ago)

Author:

sandervl

Message:

wm_activate fixes, scrollbar fix, drawframe fix

File:

• trunk/src/user32/new/pmframe.cpp (modified) (7 diffs)

trunk/src/user32/new/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.14 2000-01-12 22:07:28 cbratschi Exp $ */
+/* $Id: pmframe.cpp,v 1.15 2000-01-13 13:54:52 sandervl Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -263 +263 @@
         if ((pswp->fl & (SWP_SIZE | SWP_MOVE | SWP_ZORDER)) == 0)
         {
-                swpClient.hwnd = win32wnd->getOS2WindowHandle();
-                swpClient.hwndInsertBehind = 0;
-                swpClient.x  = 0;
-                swpClient.y  = 0;
-                swpClient.cx = 0;
-                swpClient.cy = 0;
-                swpClient.fl = pswp->fl & ~SWP_ZORDER;
-                WinSetMultWindowPos(thdb->hab, &swpClient, 1);
-                goto PosChangedEnd;
+                goto RunDefFrameProc;
         }
 
@@ -284 +276 @@
         OSLibMapSWPtoWINDOWPOSFrame(pswp, &wp, &swpOld, hParent, hwnd);
 
+        if(pswp->fl & SWP_ACTIVATE)
+        {
+             WinSendMsg(hwnd, WM_ACTIVATE, (MPARAM)TRUE, (MPARAM)hwnd);
+        }
+
         if(pswp->fl & (SWP_MOVE | SWP_SIZE))
         {
-          win32wnd->setWindowRect(wp.x, wp.y, wp.x+wp.cx, wp.y+wp.cy);
-
-          win32wnd->MsgFormatFrame();
+          //Note: Also updates the new window rectangle
+          win32wnd->MsgFormatFrame(&wp);
+
           //CB: todo: use result for WM_CALCVALIDRECTS
           mapWin32ToOS2Rect(WinQueryWindow(hwnd,QW_PARENT),hwnd,win32wnd->getClientRectPtr(),(PRECTLOS2)&rect);
@@ -328 +325 @@
             {
               WinInvalidateRect(hwnd,NULL,TRUE);
-            } else
+            } 
+            else
             {
               HPS hps = WinGetPS(hwnd);
@@ -362 +360 @@
             }
           }
-        } else
+        } 
+        else
         {
           //update child positions: rectWindow is in window coordinates
@@ -390 +389 @@
         USHORT flags = WinQueryWindowUShort(hwnd,QWS_FLAGS);
 
+        dprintf(("PMFRAME: WM_ACTIVATE %x %x", hwnd, mp2));
         if (win32wnd->IsWindowCreated())
         {
@@ -449 +449 @@
   SWP swpClient = {0};
 
-        win32wnd->MsgFormatFrame();
+        win32wnd->MsgFormatFrame(NULL);
         //CB: todo: use result for WM_CALCVALIDRECTS
         mapWin32ToOS2Rect(WinQueryWindow(win32wnd->getOS2FrameWindowHandle(),QW_PARENT),win32wnd->getOS2FrameWindowHandle(),win32wnd->getClientRectPtr(),(PRECTLOS2)&rect);