From f75363eed1d32dd851f32485fd608122509eb7a5 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Thu, 15 Aug 2002 22:14:05 +0000 Subject: [PATCH] ExitOnFrame behaviour update for wxMac git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/mac/carbon/toplevel.cpp | 14 +------------- src/mac/toplevel.cpp | 14 +------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp index 56d3c0ded6..0572ffc79a 100644 --- a/src/mac/carbon/toplevel.cpp +++ b/src/mac/carbon/toplevel.cpp @@ -162,7 +162,7 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac() wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ; } - #if TARGET_CARBON +#if TARGET_CARBON if ( m_macEventHandler ) { ::RemoveEventHandler((EventHandlerRef) m_macEventHandler); @@ -171,21 +171,9 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac() #endif wxRemoveMacWindowAssociation( this ) ; - wxTopLevelWindows.DeleteObject(this); - if ( wxModelessWindows.Find(this) ) wxModelessWindows.DeleteObject(this); - // If this is the last top-level window, exit. - if ( wxTheApp && (wxTopLevelWindows.Number() == 0) ) - { - wxTheApp->SetTopWindow(NULL); - - if ( wxTheApp->GetExitOnFrameDelete() ) - { - wxTheApp->ExitMainLoop() ; - } - } DisposeRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ; } diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp index 56d3c0ded6..0572ffc79a 100644 --- a/src/mac/toplevel.cpp +++ b/src/mac/toplevel.cpp @@ -162,7 +162,7 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac() wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ; } - #if TARGET_CARBON +#if TARGET_CARBON if ( m_macEventHandler ) { ::RemoveEventHandler((EventHandlerRef) m_macEventHandler); @@ -171,21 +171,9 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac() #endif wxRemoveMacWindowAssociation( this ) ; - wxTopLevelWindows.DeleteObject(this); - if ( wxModelessWindows.Find(this) ) wxModelessWindows.DeleteObject(this); - // If this is the last top-level window, exit. - if ( wxTheApp && (wxTopLevelWindows.Number() == 0) ) - { - wxTheApp->SetTopWindow(NULL); - - if ( wxTheApp->GetExitOnFrameDelete() ) - { - wxTheApp->ExitMainLoop() ; - } - } DisposeRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ; }