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
This commit is contained in:
David Elliott 2004-02-09 04:44:30 +00:00
parent 1d2fe15e71
commit 6ba13ca442

View File

@ -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);