add emission hook from RemoveIdleSource (was RemoveIdleTag); minor cleanup

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

diff --git a/include/wx/gtk/app.h b/include/wx/gtk/app.h
index eb24a3a675b8a0ab9c96334cf726bb280b150489..dc9d3f50de911f558040840b513a80b53af1d7fd 100644 (file)
--- a/include/wx/gtk/app.h
+++ b/include/wx/gtk/app.h
@@ -53,7 +53,7 @@ public:
 #endif // __WXDEBUG__
 
     guint m_idleTag;
 #endif // __WXDEBUG__
 
     guint m_idleTag;

-    void RemoveIdleTag();
+    void RemoveIdleSource();

 
     // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual
     // selection.
 
     // Used by the the wxGLApp and wxGLCanvas class for GL-based X visual
     // selection.

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index 7422385af052edf46a3a6d2065e730593c7804f8..8eebbeb35c5bebd03da37c3878e010750dd3a660 100644 (file)
--- a/src/gtk/app.cpp
+++ b/src/gtk/app.cpp
@@ -135,7 +135,7 @@ bool wxApp::Yield(bool onlyIfNeeded)
 
     // We need to remove idle callbacks or the loop will
     // never finish.
 
     // We need to remove idle callbacks or the loop will
     // never finish.

-    wxTheApp->RemoveIdleTag();
+    RemoveIdleSource();

 
 #if wxUSE_LOG
     // disable log flushing from here because a call to wxYield() shouldn't
 
 #if wxUSE_LOG
     // disable log flushing from here because a call to wxYield() shouldn't


@@ -194,6 +194,13 @@ event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)
     return false;
 }
 
     return false;
 }
 

+static inline void wxAddEmissionHook()
+{
+    // add emission hook for "event" signal, to re-install idle handler when needed
+    guint sig_id = g_signal_lookup("event", GTK_TYPE_WIDGET);
+    g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL);
+}
+

 static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
     if (!wxTheApp)
 static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
 {
     if (!wxTheApp)


@@ -233,11 +240,7 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     gdk_threads_leave();
 
     if (!moreIdles)
     gdk_threads_leave();
 
     if (!moreIdles)

-    {
-        // add emission hook for "event" signal, to re-install idle handler when needed
-        guint sig_id = g_signal_lookup("event", GTK_TYPE_WIDGET);
-        g_signal_add_emission_hook(sig_id, 0, event_emission_hook, NULL, NULL);
-    }
+        wxAddEmissionHook();

 
     // Return FALSE if no more idle events are to be sent
     return moreIdles;
 
     // Return FALSE if no more idle events are to be sent
     return moreIdles;


@@ -600,15 +603,16 @@ void wxApp::OnAssertFailure(const wxChar *file,
 
 #endif // __WXDEBUG__
 
 
 #endif // __WXDEBUG__
 

-void wxApp::RemoveIdleTag()
+void wxApp::RemoveIdleSource()

 {
 #if wxUSE_THREADS
     wxMutexLocker lock(gs_idleTagsMutex);
 #endif
 {
 #if wxUSE_THREADS
     wxMutexLocker lock(gs_idleTagsMutex);
 #endif

-    if (!g_isIdle)
+    if (m_idleTag != 0)

     {
     {

-        g_source_remove( wxTheApp->m_idleTag );
-        wxTheApp->m_idleTag = 0;
+        g_source_remove(m_idleTag);
+        m_idleTag = 0;

         g_isIdle = true;
         g_isIdle = true;

+        wxAddEmissionHook();

     }
 }
     }
 }

diff --git a/src/gtk/evtloop.cpp b/src/gtk/evtloop.cpp
index 2c9fe3c6eaa9d25789f18eb8c47099c45dc8db92..fbdd81bd2d9f308df2694adc338d257141e53439 100644 (file)
--- a/src/gtk/evtloop.cpp
+++ b/src/gtk/evtloop.cpp
@@ -101,7 +101,7 @@ bool wxEventLoop::Pending() const
     {
         // We need to remove idle callbacks or gtk_events_pending will
         // never return false.
     {
         // We need to remove idle callbacks or gtk_events_pending will
         // never return false.

-        wxTheApp->RemoveIdleTag();
+        wxTheApp->RemoveIdleSource();

     }
 
     return gtk_events_pending();
     }
 
     return gtk_events_pending();