destroy m_impl even if an exception is thrown from the main loop

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

diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp
index 2b2bfa91c4f4c7c6a051e6e4f09f524e0d8ca4c0..16fa2087f26c1fa182f33cb1b014d1c7ca1a90a5 100644 (file)
--- a/src/gtk/evtloop.cpp
+++ b/src/gtk/evtloop.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #include "wx/evtloop.h"
 #endif
 
 #include "wx/evtloop.h"

+#include "wx/ptr_scpd.h"

 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"


@@ -55,6 +56,8 @@ private:
 // wxEventLoop implementation
 // ============================================================================
 
 // wxEventLoop implementation
 // ============================================================================
 

+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoopImpl)
+

 // ----------------------------------------------------------------------------
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------


@@ -71,17 +74,13 @@ int wxEventLoop::Run()
 
     wxEventLoopActivator activate(this);
 
 
     wxEventLoopActivator activate(this);
 

-    m_impl = new wxEventLoopImpl;
+    wxEventLoopImplTiedPtr impl(&m_impl, new wxEventLoopImpl);

 
     gtk_main();
 
     OnExit();
 
 
     gtk_main();
 
     OnExit();
 

-    int exitcode = m_impl->GetExitCode();
-    delete m_impl;
-    m_impl = NULL;
-
-    return exitcode;
+    return m_impl->GetExitCode();

 }
 
 void wxEventLoop::Exit(int rc)
 }
 
 void wxEventLoop::Exit(int rc)