Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow m_docManager to be NULL (patch #12435)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@66911 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2011-02-16 21:31:33 +00:00
parent 44c1bdc56a
commit b8ea9cd583
2 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/common/docmdi.cpp
View File

@@ -80,15 +80,17 @@ bool wxDocMDIParentFrame::ProcessEvent(wxEvent& event)
void wxDocMDIParentFrame::OnCloseWindow(wxCloseEvent& event) void wxDocMDIParentFrame::OnCloseWindow(wxCloseEvent& event)
{ {
if (m_docManager->Clear(!event.CanVeto())) if ( m_docManager && !m_docManager->Clear(!event.CanVeto()) )
{ {
this->Destroy(); // The user decided not to close finally, abort.
} event.Veto();
else }
event.Veto(); else
{
this->Destroy();
}
} }
/* /*
* Default document child frame for MDI children * Default document child frame for MDI children
*/ */

9
src/common/docview.cpp
View File

@@ -2010,12 +2010,15 @@ bool wxDocParentFrame::ProcessEvent(wxEvent& event)
// - must delete all frames except for the main one. // - must delete all frames except for the main one.
void wxDocParentFrame::OnCloseWindow(wxCloseEvent& event) void wxDocParentFrame::OnCloseWindow(wxCloseEvent& event)
{ {
if (m_docManager->Clear(!event.CanVeto())) if ( m_docManager && !m_docManager->Clear(!event.CanVeto()) )
{
// The user decided not to close finally, abort.
event.Veto();
}
else
{ {
this->Destroy(); this->Destroy();
} }
else
event.Veto();
} }
#if wxUSE_PRINTING_ARCHITECTURE #if wxUSE_PRINTING_ARCHITECTURE