When destroying the window, only remove it from its Cocoa parent if

the Cocoa window for its wxWindows parent is its Cocoa parent.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25679 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index 2bcdeb8c73ee34229eb40ee4665f75414e53dd13..28ea18d0ead587cd1e76b0bca263af9680f07e3b 100644 (file)
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -279,7 +279,10 @@ wxWindow::~wxWindow()
     wxAutoNSAutoreleasePool pool;
     DestroyChildren();
 
-    CocoaRemoveFromParent();
+    // Make sure our parent (in the wxWindows sense) is our superview
+    // before we go removing from it.
+    if(m_parent && m_parent->GetNSView()==[GetNSViewForSuperview() superview])
+        CocoaRemoveFromParent();
     delete m_cocoaHider;
     delete m_cocoaScroller;
     SetNSView(NULL);