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

Timestamp:

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

Author:

cbratschi

Message:

* empty log message *

File:

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

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);