ExitOnFrame behaviour update for wxMac

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/mac/carbon/toplevel.cpp b/src/mac/carbon/toplevel.cpp
index 56d3c0ded67cd315e2ac89c2ad7c1df32245f4eb..0572ffc79a21f28628944b308fcb38bb2b1dd739 100644 (file)
--- 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 ) ) ;
     }
  
         wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ;
     }
  

- #if TARGET_CARBON
+#if TARGET_CARBON

     if ( m_macEventHandler )
     {
         ::RemoveEventHandler((EventHandlerRef) m_macEventHandler);
     if ( m_macEventHandler )
     {
         ::RemoveEventHandler((EventHandlerRef) m_macEventHandler);


@@ -171,21 +171,9 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac()
 #endif   
     wxRemoveMacWindowAssociation( this ) ;
 
 #endif   
     wxRemoveMacWindowAssociation( this ) ;
 

-    wxTopLevelWindows.DeleteObject(this);
-

     if ( wxModelessWindows.Find(this) )
         wxModelessWindows.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 ) ;
 }
 
     DisposeRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ;
 }
 

diff --git a/src/mac/toplevel.cpp b/src/mac/toplevel.cpp
index 56d3c0ded67cd315e2ac89c2ad7c1df32245f4eb..0572ffc79a21f28628944b308fcb38bb2b1dd739 100644 (file)
--- a/src/mac/toplevel.cpp
+++ b/src/mac/toplevel.cpp
@@ -162,7 +162,7 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac()
         wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ;
     }
  
         wxPendingDelete.Append( new wxMacDeferredWindowDeleter( (WindowRef) m_macWindow ) ) ;
     }
  

- #if TARGET_CARBON
+#if TARGET_CARBON

     if ( m_macEventHandler )
     {
         ::RemoveEventHandler((EventHandlerRef) m_macEventHandler);
     if ( m_macEventHandler )
     {
         ::RemoveEventHandler((EventHandlerRef) m_macEventHandler);


@@ -171,21 +171,9 @@ wxTopLevelWindowMac::~wxTopLevelWindowMac()
 #endif   
     wxRemoveMacWindowAssociation( this ) ;
 
 #endif   
     wxRemoveMacWindowAssociation( this ) ;
 

-    wxTopLevelWindows.DeleteObject(this);
-

     if ( wxModelessWindows.Find(this) )
         wxModelessWindows.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 ) ;
 }
 
     DisposeRgn( (RgnHandle) m_macNoEraseUpdateRgn ) ;
 }