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

Timestamp:

Dec 17, 1999, 6:18:04 PM (26 years ago)

Author:

cbratschi

Message:

MDI cascade/tile, WM_PARENTNOTIFY cursor pos mapping, free timers after WM_DESTROY

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.112 1999-12-16 00:47:21 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.113 1999-12-17 17:18:03 cbratschi Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -42 +42 @@
 #include "winmouse.h"
 #include <win\hook.h>
+#define INCL_TIMERWIN32
+#include "timer.h"
 
 #define HAS_DLGFRAME(style,exStyle) \
@@ -807 +809 @@
     SendInternalMessageA(WM_DESTROY, 0, 0);
     if(::IsWindow(hwnd) == FALSE) {
-        //object already destroyed, so return immediately
-        return 1;
+        //object already destroyed, so return immediately
+        return 1;
     }
     SendInternalMessageA(WM_NCDESTROY, 0, 0);
@@ -814 +816 @@
     if (hwndHorzScroll && OSLibWinQueryWindow(hwndHorzScroll,QWOS_PARENT) == OSLibWinQueryObjectWindow()) OSLibWinDestroyWindow(hwndHorzScroll);
     if (hwndVertScroll && OSLibWinQueryWindow(hwndVertScroll,QWOS_PARENT) == OSLibWinQueryObjectWindow()) OSLibWinDestroyWindow(hwndVertScroll);
+
+    TIMER_KillTimerFromWindow(OS2Hwnd);
 
     if(getFirstChild() == NULL) {
@@ -1989 +1993 @@
         case WM_MBUTTONDOWN:
         case WM_RBUTTONDOWN:
-                NotifyParent(Msg, wParam, lParam);
+        {
+                if (getParent())
+                {
+                  POINTS pt = MAKEPOINTS(lParam);
+                  POINT point;
+
+                  point.x = pt.x;
+                  point.y = pt.y;
+                  MapWindowPoints(getParent()->getWindowHandle(),Win32Hwnd,&point,1);
+                  NotifyParent(Msg,wParam,MAKELPARAM(point.x,point.y));
+                }
                 rc = win32wndproc(getWindowHandle(), Msg, wParam, lParam);
                 break;
+        }
 
         case WM_DESTROY: