X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/75799719334c85392638ce5c7d0e90a8b74b7e5a..b1f50e652c0e105c0ed8ab627be837c45f7a1a00:/src/common/docmdi.cpp diff --git a/src/common/docmdi.cpp b/src/common/docmdi.cpp index 4a9857983f..281953afa2 100644 --- a/src/common/docmdi.cpp +++ b/src/common/docmdi.cpp @@ -9,7 +9,7 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "docmdi.h" #endif @@ -165,11 +165,9 @@ void wxDocMDIChildFrame::OnCloseWindow(wxCloseEvent& event) // ...since it will be deleted by wxWindows if we return TRUE. if (m_childView) { - bool ans = FALSE; - if (!event.CanVeto()) - ans = TRUE; // Must delete. - else - ans = m_childView->Close(FALSE); // FALSE means don't delete associated window + bool ans = event.CanVeto() + ? m_childView->Close(FALSE) // FALSE means don't delete associated window + : TRUE; // Must delete. if (ans) {