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

Timestamp:

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

Author:

sandervl

Message:

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

File:

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

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;