X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1cbee0b42c9755a98104e3b1d8fd1133483ea54f..70ddb200c10bb6f1075f4a39452fdcf77f84fdf5:/src/common/toplvcmn.cpp diff --git a/src/common/toplvcmn.cpp b/src/common/toplvcmn.cpp index fd659ac2b6..4c640caae4 100644 --- a/src/common/toplvcmn.cpp +++ b/src/common/toplvcmn.cpp @@ -4,7 +4,7 @@ // Author: Julian Smart, Vadim Zeitlin // Created: 01/02/97 // Id: $Id$ -// Copyright: (c) 1998 Robert Roebling, Julian Smart and Markus Holzem +// Copyright: (c) 1998 Robert Roebling and Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -30,6 +30,7 @@ #ifndef WX_PRECOMP #include "wx/toplevel.h" #include "wx/dcclient.h" + #include "wx/app.h" #endif // WX_PRECOMP // ---------------------------------------------------------------------------- @@ -45,10 +46,7 @@ END_EVENT_TABLE() // implementation // ============================================================================ -// FIXME: some platforms don't have wxTopLevelWindow yet -#ifdef wxTopLevelWindowNative - IMPLEMENT_DYNAMIC_CLASS(wxTopLevelWindow, wxWindow) -#endif +IMPLEMENT_DYNAMIC_CLASS(wxTopLevelWindow, wxWindow) // ---------------------------------------------------------------------------- // construction/destruction @@ -85,12 +83,12 @@ bool wxTopLevelWindowBase::Destroy() return TRUE; } -/* static */ -bool wxTopLevelWindowBase::IsLastBeforeExit() +bool wxTopLevelWindowBase::IsLastBeforeExit() const { // we exit the application if there are no more top level windows left // normally but wxApp can prevent this from happening - return (wxTopLevelWindows.GetCount() == 1) && + return wxTopLevelWindows.GetCount() == 1 && + wxTopLevelWindows.GetFirst()->GetData() == (wxWindow *)this && wxTheApp && wxTheApp->GetExitOnFrameDelete(); }