Changeset 2340 for trunk/src

Timestamp:

Jan 6, 2000, 6:05:52 PM (26 years ago)

Author:

cbratschi

Message:

* empty log message *

Location:

trunk/src/user32/new

Files:

• oslibgdi.cpp (modified) (2 diffs)
• pmframe.cpp (modified) (9 diffs)
• win32wbase.cpp (modified) (5 diffs)

trunk/src/user32/new/oslibgdi.cpp

@@ -1 @@
-/* $Id: oslibgdi.cpp,v 1.10 2000-01-05 21:25:03 cbratschi Exp $ */
+/* $Id: oslibgdi.cpp,v 1.11 2000-01-06 17:05:52 cbratschi Exp $ */
 /*
  * Window GDI wrapper functions for OS/2
@@ -437 +437 @@
   WinMapWindowPoints((os2From == OSLIB_HWND_DESKTOP) ? HWND_DESKTOP:os2From,(os2To == OSLIB_HWND_DESKTOP) ? HWND_DESKTOP:os2To,(PPOINTL)&rect,2);
   mapOS2ToWin32Rect(os2To,(PRECTLOS2)&rect,rectWin32);
+
+  return TRUE;
 }
 //******************************************************************************

trunk/src/user32/new/pmframe.cpp

@@ -1 @@
-/* $Id: pmframe.cpp,v 1.5 2000-01-05 21:25:05 cbratschi Exp $ */
+/* $Id: pmframe.cpp,v 1.6 2000-01-06 17:05:52 cbratschi Exp $ */
 /*
  * Win32 Frame Managment Code for OS/2
@@ -302 +302 @@
     case WM_BUTTON3UP:
     case WM_BUTTON3DBLCLK:
+    {
+        SWP swp;
+
+        WinQueryWindowPos(hwnd,&swp);
+        if ((swp.fl & SWP_MINIMIZE) == SWP_MINIMIZE)
+          goto RunDefFrameProc;
         if (win32wnd->IsWindowCreated())
         {
@@ -308 +314 @@
         }
         return (MRESULT)TRUE;
+    }
 
     case WM_BUTTON2MOTIONSTART:
@@ -323 +330 @@
     case WM_MOUSEMOVE:
     {
+        SWP swp;
+
+        WinQueryWindowPos(hwnd,&swp);
+        if ((swp.fl & SWP_MINIMIZE) == SWP_MINIMIZE)
+          goto RunDefFrameProc;
         //OS/2 Window coordinates -> Win32 Window coordinates
         if (win32wnd->IsWindowCreated())
@@ -333 +345 @@
     {
       DWORD res;
+      SWP swp;
+
+      WinQueryWindowPos(hwnd,&swp);
+      if ((swp.fl & SWP_MINIMIZE) == SWP_MINIMIZE)
+        goto RunDefFrameProc;
 
       // Only send this message if the window is enabled
@@ -355 +372 @@
 
     case WM_PAINT:
-        //CB: todo: call defframe if minimized
+    {
+        SWP swp;
+
+        WinQueryWindowPos(hwnd,&swp);
+        if ((swp.fl & SWP_MINIMIZE) == SWP_MINIMIZE)
+          goto RunDefFrameProc;
         dprintf(("PMFRAME: WM_PAINT"));
         if (win32wnd->IsWindowCreated())
           win32wnd->MsgNCPaint();
         goto RunDefWndProc;
+    }
 
     case WM_SIZE:
@@ -453 +476 @@
 
         win32wnd->setWindowRect(wp.x, wp.y, wp.x+wp.cx, wp.y+wp.cy);
-dprintf(("CB: %d %d %d %d",wp.x,wp.y,wp.x+wp.cx,wp.y+wp.cy));
+
         if(win32wnd->CanReceiveSizeMsgs())
           win32wnd->MsgPosChanged((LPARAM)&wp);
@@ -472 +495 @@
       UINT res = CVR_ALIGNLEFT | CVR_ALIGNTOP;
 
-//CB: todo: use WM_NCCALCSIZE
+//CB: todo: use WM_NCCALCSIZE result
       if (win32wnd->getWindowClass())
       {
@@ -483 +506 @@
       } else res |= CVR_REDRAW;
 
-      //CB: PM updates window frame (and unfortunately all other frame controls)
+      //CB: PM sets client window position
       RestoreOS2TIB();
       OldFrameProc(hwnd,msg,mp1,mp2);

trunk/src/user32/new/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.22 2000-01-05 21:25:07 cbratschi Exp $ */
+/* $Id: win32wbase.cpp,v 1.23 2000-01-06 17:05:52 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -700 +700 @@
   rectWindow.bottom = cs->y+cs->cy;
   rectClient = rectWindow; //dummy client rect
-  MapWindowPoints(getParent() ? getParent()->getWindowHandle():OSLIB_HWND_DESKTOP,0,(PPOINT)&rectWindow,2);
+  if (getParent()) MapWindowPoints(getParent()->getWindowHandle(),0,(PPOINT)&rectWindow,2);
   /* Send the WM_CREATE message
    * Perhaps we shouldn't allow width/height changes as well.
@@ -721 +721 @@
         rectWindow.bottom = cs->y+cs->cy;
         rectClient = rectWindow;
-        MapWindowPoints(getParent() ? getParent()->getWindowHandle():OSLIB_HWND_DESKTOP,0,(PPOINT)&rectWindow,2);
+        if (getParent()) MapWindowPoints(getParent()->getWindowHandle(),0,(PPOINT)&rectWindow,2);
         OffsetRect(&rectWindow, maxPos.x - rectWindow.left, maxPos.y - rectWindow.top);
         //set the window size and update the client
         rect = rectWindow;
-        MapWindowPoints(0,getParent() ? getParent()->getWindowHandle():OSLIB_HWND_DESKTOP,(PPOINT)&rect,2);
+        if (getParent()) MapWindowPoints(0,getParent()->getWindowHandle(),(PPOINT)&rect,2);
         SetWindowPos(hwndLinkAfter,rect.left,rect.top,rect.right-rect.left,rect.bottom-rect.top,SWP_NOACTIVATE | SWP_NOREDRAW | SWP_FRAMECHANGED);
         fNoSizeMsg = FALSE;
@@ -1118 +1118 @@
   wndPos.hwndInsertAfter = 0;
   rect = rectWindow;
-  MapWindowPoints(Win32Hwnd,(getParent()) ? getParent()->getWindowHandle():HWND_DESKTOP,(PPOINT)&rect,2);
+  if (getParent()) MapWindowPoints(0,getParent()->getWindowHandle(),(PPOINT)&rect,2);
   wndPos.x = rect.left;
   wndPos.y = rect.top;
@@ -1553 +1553 @@
 
   clientRect = &((NCCALCSIZE_PARAMS*)winRect)->rgrc[2];
-  clientRect->left = 0;
-  clientRect->right = rectWindow.right-rectWindow.left;
-  clientRect->top = 0;
-  clientRect->bottom = rectWindow.bottom-rectWindow.top;
-  mapWin32Rect(OS2HwndFrame,getParent() ? getParent()->getWindowHandle():OSLIB_HWND_DESKTOP,clientRect);
+  *clientRect = rectWindow;
+  if (getParent()) MapWindowPoints(0,getParent()->getOS2WindowHandle(),(PPOINT)clientRect,2);
 
   if(!(dwStyle & WS_MINIMIZE))