From b7341fe06f10dbe562f077c9a5ed9ea7afa9195a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 11 Mar 2009 16:11:54 +0000 Subject: [PATCH] reset the associated view frame pointer when the frame is deleted directly instead of being closed gracefully git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59484 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/docview.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/wx/docview.h b/include/wx/docview.h index 610dd0c6f6..55fa2c7920 100644 --- a/include/wx/docview.h +++ b/include/wx/docview.h @@ -530,6 +530,14 @@ public: view->SetDocChildFrame(this); } + ~wxDocChildFrameAnyBase() + { + // prevent the view from deleting us if we're being deleted directly + // (and not via Close() + Destroy()) + if ( m_childView ) + m_childView->SetDocChildFrame(NULL); + } + wxDocument *GetDocument() const { return m_childDocument; } wxView *GetView() const { return m_childView; } void SetDocument(wxDocument *doc) { m_childDocument = doc; }