Added wxBitmap::Rescale() from 2_4

[wxWidgets.git] / src / common / appcmn.cpp

diff --git a/src/common/appcmn.cpp b/src/common/appcmn.cpp
index c081dc4ed8a03d64478aa2a61b303f1aef445450..0f013b66d3b10b6b66e4dda1b5037ace7c834cef 100644 (file)
--- 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
@@ -156,10 +140,10 @@ void wxAppBase::CleanUp()
     delete wxTheColourDatabase;
     wxTheColourDatabase = NULL;
 
-#if wxUSE_THREADS
     delete wxPendingEvents;
     wxPendingEvents = NULL;
 
+#if wxUSE_THREADS
     delete wxPendingEventsLocker;
     wxPendingEventsLocker = NULL;
 
@@ -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
@@ -286,7 +270,7 @@ void wxAppBase::ExitMainLoop()
 #if wxUSE_EVTLOOP_IN_APP
     // we should exit from the main event loop, not just any currently active
     // (e.g. modal dialog) event loop
-    if ( m_mainLoop )
+    if ( m_mainLoop && m_mainLoop->IsRunning() )
     {
         m_mainLoop->Exit(0);
     }
@@ -313,7 +297,7 @@ bool wxAppBase::Dispatch()
     // see comment in Pending()
     wxEventLoop * const loop = wxEventLoop::GetActive();
 
-    return loop ? loop->Dispatch() : true;
+    return loop && loop->Dispatch();
 #else // wxUSE_EVTLOOP_IN_APP
     return true;
 #endif // wxUSE_EVTLOOP_IN_APP/!wxUSE_EVTLOOP_IN_APP