don't pass garbage to SetData() in wxURLDataObject::SetURL()

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

diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp
index 16fa2087f26c1fa182f33cb1b014d1c7ca1a90a5..9cfac6466afdc74e79f2a411b4ae847fe8590140 100644 (file)
--- a/src/gtk/evtloop.cpp
+++ b/src/gtk/evtloop.cpp
@@ -62,12 +62,12 @@ wxDEFINE_TIED_SCOPED_PTR_TYPE(wxEventLoopImpl)
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 
 // wxEventLoop running and exiting
 // ----------------------------------------------------------------------------
 

-wxEventLoop::~wxEventLoop()
+wxGUIEventLoop::~wxGUIEventLoop()

 {
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
 }
 
 {
     wxASSERT_MSG( !m_impl, _T("should have been deleted in Run()") );
 }
 

-int wxEventLoop::Run()
+int wxGUIEventLoop::Run()

 {
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );
 {
     // event loops are not recursive, you need to create another loop!
     wxCHECK_MSG( !IsRunning(), -1, _T("can't reenter a message loop") );


@@ -83,7 +83,7 @@ int wxEventLoop::Run()
     return m_impl->GetExitCode();
 }
 
     return m_impl->GetExitCode();
 }
 

-void wxEventLoop::Exit(int rc)
+void wxGUIEventLoop::Exit(int rc)

 {
     wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
 
 {
     wxCHECK_RET( IsRunning(), _T("can't call Exit() if not running") );
 


@@ -96,19 +96,19 @@ void wxEventLoop::Exit(int rc)
 // wxEventLoop message processing dispatching
 // ----------------------------------------------------------------------------
 
 // wxEventLoop message processing dispatching
 // ----------------------------------------------------------------------------
 

-bool wxEventLoop::Pending() const
+bool wxGUIEventLoop::Pending() const

 {
 {

-    if (wxTheApp)
-    {
-        // We need to remove idle callbacks or gtk_events_pending will
-        // never return false.
-        wxTheApp->SuspendIdleCallback();
-    }
-
-    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()
+bool wxGUIEventLoop::Dispatch()

 {
     wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") );
 
 {
     wxCHECK_MSG( IsRunning(), false, _T("can't call Dispatch() if not running") );