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

Timestamp:

Oct 22, 2000, 6:07:48 PM (25 years ago)

Author:

sandervl

Message:

missing OBM_TNTYPE + fix for messages sent to windows after they received WM_DESTROY & WM_NCDESTORY

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.218 2000-10-18 17:10:49 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.219 2000-10-22 16:07:48 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -169 +169 @@
 {
     if(hTaskList) {
-    OSLibWinRemoveFromTasklist(hTaskList);
+        OSLibWinRemoveFromTasklist(hTaskList);
     }
 
@@ -668 +668 @@
         if (cs->style & (WS_POPUP | WS_CHILD))
         {
-          fXDefault = FALSE;
-          if (fCXDefault)
-          {
-            fCXDefault = FALSE;
-            cs->cx = cs->cy = 0;
-          }
+            fXDefault = FALSE;
+            if (fCXDefault)
+            {
+                fCXDefault = FALSE;
+                cs->cx = cs->cy = 0;
+            }
         }
         //update rect
@@ -706 +706 @@
                 {
                     getParent()->SendInternalMessageA(WM_PARENTNOTIFY, MAKEWPARAM(WM_CREATE, getWindowId()), (LPARAM)getWindowHandle());
-        }
+                }
                 if(!::IsWindow(getWindowHandle()))
                 {
@@ -715 +715 @@
 
             if(cs->style & WS_VISIBLE) {
-        dwStyle &= ~WS_VISIBLE;
-        ShowWindow(sw);
+                dwStyle &= ~WS_VISIBLE;
+                ShowWindow(sw);
             }
 
@@ -778 +778 @@
     if(getFirstChild() == NULL) {
         delete this;
+    }
+    else {
+        //make sure no message can ever arrive for this window again (PM or from other win32 windows)
+        OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32WNDPTR, 0);
+        OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32PM_MAGIC, 0);
+        if(Win32Hwnd) {
+            HwFreeWindowHandle(Win32Hwnd);
+            Win32Hwnd = 0;
+        }
     }
     return 1;