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

Timestamp:

Oct 15, 1999, 3:52:56 PM (26 years ago)

Author:

sandervl

Message:

Window destruction fixes

File:

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

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.44 1999-10-15 10:03:15 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.45 1999-10-15 13:52:54 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -101 +101 @@
   fInternalMsg     = FALSE;
   fNoSizeMsg       = FALSE;
+  fIsDestroyed     = FALSE;
 
   windowNameA      = NULL;
@@ -161 +162 @@
 Win32BaseWindow::~Win32BaseWindow()
 {
-  OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32WNDPTR, 0);
-  OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32PM_MAGIC, 0);
-
-  if (isOwnDC())
+    OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32WNDPTR, 0);
+    OSLibWinSetWindowULong(OS2Hwnd, OFFSET_WIN32PM_MAGIC, 0);
+
+    if(getParent() && getParent()->getFirstChild() == this && getNextChild() == NULL)
+    {
+        //if we're the last child that's being destroyed and our
+        //parent window was also destroyed, then we delete the parent object
+        if(getParent()->IsWindowDestroyed())
+        {
+            dprintf(("Last Child (%x) destroyed, get rid of our parent window (%x)", getWindowHandle(), getParent()->getWindowHandle()));
+            delete getParent();
+            setParent(NULL);  //or else we'll crash in the dtor of the ChildWindow class
+        }
+    }
+    if (isOwnDC())
         releaseOwnDC (ownDC);
 
-  if(Win32Hwnd)
+    if(Win32Hwnd)
         HwFreeWindowHandle(Win32Hwnd);
 
-  if(userWindowLong)
+    if(userWindowLong)
         free(userWindowLong);
-  if(windowNameA) {
+    if(windowNameA) {
         free(windowNameA);
         windowNameA = NULL;
-  }
-  if(windowNameW) {
+    }
+    if(windowNameW) {
         free(windowNameW);
         windowNameW = NULL;
-  }
-  if(vertScrollInfo) {
+    }
+    if(vertScrollInfo) {
         free(vertScrollInfo);
         vertScrollInfo = NULL;
-  }
-  if(horzScrollInfo) {
+    }
+    if(horzScrollInfo) {
         free(horzScrollInfo);
         horzScrollInfo = NULL;
-  }
+    }
   //TODO: Destroy windows if they're not associated with our window anymore (showwindow false)?
 //  hwndHorzScroll
@@ -197 +209 @@
 BOOL Win32BaseWindow::isChild()
 {
-    return (dwStyle & WS_CHILD) != 0;
+    return ((dwStyle & WS_CHILD) != 0);
 }
 //******************************************************************************
@@ -655 +667 @@
         return 0; //app handles this message
   }
-  delete this;
   return 1;
 }
@@ -663 +674 @@
 {
  ULONG rc;
-
-  rc = SendInternalMessageA(WM_DESTROY, 0, 0);
-  delete this;
-  return rc;
+ Win32BaseWindow *child;
+
+    //According to the SDK, WM_PARENTNOTIFY messages are sent to the parent (this window)
+    //before any window destruction has begun
+    child = (Win32BaseWindow *)getFirstChild();
+    while(child) {
+        child->NotifyParent(WM_DESTROY, 0, 0);
+
+        child = (Win32BaseWindow *)child->getNextChild();
+    }
+    SendInternalMessageA(WM_DESTROY, 0, 0);
+
+    fIsDestroyed = TRUE;
+    if(getFirstChild() == NULL) {
+        delete this;
+    }
+    return 1;
 }
 //******************************************************************************
@@ -1661 +1685 @@
 
         case WM_DESTROY:
+                win32wndproc(getWindowHandle(), WM_NCDESTROY, 0, 0);
                 rc = win32wndproc(getWindowHandle(), WM_DESTROY, 0, 0);
                 break;
@@ -1714 +1739 @@
         case WM_DESTROY:
                 win32wndproc(getWindowHandle(), WM_NCDESTROY, 0, 0);
-                NotifyParent(Msg, wParam, lParam);
                 rc = win32wndproc(getWindowHandle(), WM_DESTROY, 0, 0);
                 break;
@@ -1762 +1786 @@
         case WM_DESTROY:
                 win32wndproc(getWindowHandle(), WM_NCDESTROY, 0, 0);
-                NotifyParent(Msg, wParam, lParam);
                 rc = win32wndproc(getWindowHandle(), WM_DESTROY, 0, 0);
                 break;
@@ -1810 +1833 @@
         case WM_DESTROY:
                 win32wndproc(getWindowHandle(), WM_NCDESTROY, 0, 0);
-                NotifyParent(Msg, wParam, lParam);
                 rc = win32wndproc(getWindowHandle(), WM_DESTROY, 0, 0);
                 break;