Changeset 10061 for trunk/src

Timestamp:

May 2, 2003, 7:18:57 PM (22 years ago)

Author:

sandervl

Message:

PF: WM_PARENTNOTIFY bugfix; minimize & titlebar (de)activation corrections

Location:

trunk/src/user32

Files:

• pmwindow.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (3 diffs)

trunk/src/user32/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.213 2003-05-02 15:33:15 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.214 2003-05-02 17:18:55 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -1335 +1335 @@
             dprintf(("WARNING: WM_ADJUSTWINDOWPOS with SWP_NOADJUST flag!!"));
             break;
-        }
+
+        }
+      
+        //PF Pure flags should not cause any subsequent messages to win32 windows
+        //we should route them to DefFrameWndProc and check highlight.
+ 
         if ((pswp->fl == SWP_FOCUSACTIVATE) || (pswp->fl == SWP_FOCUSDEACTIVATE))
         {
-           dprintf(("Pure focus flags are not sent to win32 windows"));
+           if (fOS2Look)
+           {
+             if(pswp->fl == SWP_FOCUSACTIVATE)
+             {
+                 dprintf2(("TBM_QUERYHILITE returned %d", WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_QUERYHILITE, 0, 0)));
+                 WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_SETHILITE, (MPARAM)1, 0);
+             }
+             else
+             {
+                 dprintf2(("TBM_QUERYHILITE returned %d", WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_QUERYHILITE, 0, 0)));
+                 WinSendDlgItemMsg(hwnd, FID_TITLEBAR, TBM_SETHILITE, 0, 0);
+             }
+           }
            goto RunDefFrameWndProc;
         }
@@ -1712 +1729 @@
               goto RunDefFrameWndProc;
 
+        //PF This is the final step of PM minimization - shoukd end up
+        //in default handler
+        if (win32wnd->getStyle() & WS_MINIMIZE_W && pswp->fl & SWP_MINIMIZE)
+              goto RunDefFrameWndProc;
+
 PosChangedEnd:
         rc = (MRESULT)FALSE;

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.370 2003-05-02 15:33:16 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.371 2003-05-02 17:18:57 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1179 +1179 @@
         {
                 if (getParent())
-                {
-                    POINTS pt = MAKEPOINTS(msg->lParam);
-                    POINT point;
-
-                    point.x = pt.x;
-                    point.y = pt.y;
-                    MapWindowPoints(getWindowHandle(), getParent()->getWindowHandle(), &point, 1);
-                    NotifyParent(msg->message, msg->wParam, MAKELPARAM(point.x,point.y));
-                }
+                    NotifyParent(msg->message, msg->wParam, 0);
                 break;
         }
@@ -2307 +2299 @@
                 parentwindow = window->getParent();
                 if(parentwindow) {
+                    /* PF We should map points for each window accordingly! */
+                    if (Msg == WM_LBUTTONDOWN || Msg == WM_MBUTTONDOWN || Msg == WM_RBUTTONDOWN)
+                    {
+                      POINTS pt = MAKEPOINTS(lParam);
+                      POINT point;
+
+                      point.x = pt.x;
+                      point.y = pt.y;
+
+                      MapWindowPoints(getWindowHandle(),parentwindow->getWindowHandle(), &point, 1);
+                      lParam = MAKELPARAM(point.x, point.y);
+                    }
                     SendMessageA(parentwindow->getWindowHandle(), WM_PARENTNOTIFY, MAKEWPARAM(Msg, getWindowId()), lParam );
                 }
+
         }
         else    break;