From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 17 Sep 2003 23:31:58 +0000 (+0000)
Subject: use standard tied pointer now
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/efbfda9d66e2de907cc773531c434583fbe1ad66

use standard tied pointer now


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

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index a76039c80f..d3d562d3e6 100644
--- a/src/common/appcmn.cpp
+++ b/src/common/appcmn.cpp
@@ -65,23 +65,7 @@ WX_CHECK_BUILD_OPTIONS("wxCore")
 // ----------------------------------------------------------------------------
 
 // this defines wxEventLoopPtr
-wxDEFINE_SCOPED_PTR_TYPE(wxEventLoop);
-
-// but we need a smart pointer tied to wxAppBase::m_mainLoop, so we define
-// another helper class
-class wxTiedEventLoopPtr : public wxEventLoopPtr
-{
-public:
-    wxTiedEventLoopPtr(wxEventLoop **ppEvtLoop, wxEventLoop *pLoop)
-        : wxEventLoopPtr(*ppEvtLoop = pLoop), m_ppEvtLoop(ppEvtLoop)
-        {
-        }
-
-    ~wxTiedEventLoopPtr() { *m_ppEvtLoop = NULL; }
-
-private:
-    wxEventLoop **m_ppEvtLoop;
-};
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoop);
 
 // ============================================================================
 // wxAppBase implementation
@@ -273,7 +257,7 @@ bool wxAppBase::OnCmdLineParsed(wxCmdLineParser& parser)
 int wxAppBase::MainLoop()
 {
 #if wxUSE_EVTLOOP_IN_APP
-    wxTiedEventLoopPtr mainLoop(&m_mainLoop, new wxEventLoop);
+    wxEventLoopTiedPtr mainLoop(&m_mainLoop, new wxEventLoop);
 
     return m_mainLoop->Run();
 #else // !wxUSE_EVTLOOP_IN_APP