don't declare inline function with dllexport declaration, this provokes mingw32 warni...

[wxWidgets.git] / src / gtk / evtloop.cpp

diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp
index 11406deb0b8ed6a1bd53c9d057b2bc861bc11803..25806a312c11d5afff4c7460a447b007c7859167 100644 (file)
--- a/src/gtk/evtloop.cpp
+++ b/src/gtk/evtloop.cpp
@@ -25,6 +25,7 @@
 #endif
 
 #include "wx/evtloop.h"
+#include "wx/ptr_scpd.h"
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
@@ -55,6 +56,8 @@ private:
 // wxEventLoop implementation
 // ============================================================================
 
+wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoopImpl)
+
 // ----------------------------------------------------------------------------
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
@@ -71,17 +74,13 @@ int wxEventLoop::Run()
 
     wxEventLoopActivator activate(this);
 
-    m_impl = new wxEventLoopImpl;
+    wxEventLoopImplTiedPtr impl(&m_impl, new wxEventLoopImpl);
 
     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)
@@ -99,14 +98,14 @@ void wxEventLoop::Exit(int rc)
 
 bool wxEventLoop::Pending() const
 {
-    if (wxTheApp)
-    {
-        // We need to remove idle callbacks or gtk_events_pending will
-        // never return false.
-        wxTheApp->RemoveIdleSource();
-    }
-
-    return gtk_events_pending();
+    bool pending;
+    wxApp* app = wxTheApp;
+    if (app != NULL)
+        // app->EventsPending() avoids false positives from our idle source
+        pending = app->EventsPending();
+    else
+        pending = gtk_events_pending() != 0;
+    return pending;
 }
 
 bool wxEventLoop::Dispatch()