X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/eafde5c739891e7385b572be3253f7da7b072923..84f6927eca931441abec9b6d21c0e412841eaab9:/src/cocoa/window.mm

diff --git a/src/cocoa/window.mm b/src/cocoa/window.mm
index 5358dfa354..91e48b8579 100644
--- a/src/cocoa/window.mm
+++ b/src/cocoa/window.mm
@@ -267,8 +267,8 @@ bool wxWindow::Create(wxWindow *parent, wxWindowID winid,
     {
         m_parent->AddChild(this);
         m_parent->CocoaAddChild(this);
+        SetInitialFrameRect(pos,size);
     }
-    SetInitialFrameRect(pos,size);
 
     return TRUE;
 }
@@ -304,6 +304,10 @@ void wxWindowCocoa::CocoaRemoveFromParent(void)
 
 void wxWindowCocoa::SetNSView(WX_NSView cocoaNSView)
 {
+    // Assume setting the NSView to NULL means this wxWindow is being destroyed
+    if(m_cocoaNSView && !cocoaNSView)
+        SendDestroyEvent();
+
     bool need_debug = cocoaNSView || m_cocoaNSView;
     if(need_debug) wxLogTrace(wxTRACE_COCOA_RetainRelease,wxT("wxWindowCocoa=%p::SetNSView [m_cocoaNSView=%p retainCount]=%d"),this,m_cocoaNSView,[m_cocoaNSView retainCount]);
     DisassociateNSView(m_cocoaNSView);