From c1f7d193f66ae9669ed96102a939159b2e16bd5c Mon Sep 17 00:00:00 2001 From: David Elliott Date: Mon, 24 Mar 2003 20:00:22 +0000 Subject: [PATCH] CocoaRemoveFromParent can (and will) be called when !m_cocoaNSView. However, if there is m_dummyNSView then there must be m_cocoaNSView. Therefore, moved wxASSERT(m_cocoaNSView) inside if(m_dummyNSView) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19770 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/cocoa/window.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm index 85b60e41a9..92adb08bc4 100644 --- a/src/cocoa/window.mm +++ b/src/cocoa/window.mm @@ -87,9 +87,9 @@ void wxWindowCocoa::CocoaAddChild(wxWindowCocoa *child) void wxWindowCocoa::CocoaRemoveFromParent(void) { - wxASSERT(m_cocoaNSView); if(m_dummyNSView) { + wxASSERT(m_cocoaNSView); // balances the alloc [m_dummyNSView removeFromSuperview]; // But since we also retained it ourselves -- 2.45.2