don't crash when destroying window with scrollbars

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

diff --git a/src/gtk/app.cpp b/src/gtk/app.cpp
index b6e5363c0155b3b7e3b9285dbced55859f67b495..9be1cb13bff17db548db6d73715b6b3795d6a662 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


@@ -184,6 +184,28 @@ void wxApp::WakeUpIdle()
 extern "C"
 {
 
 extern "C"
 {
 

+// One-shot emission hook for "event" signal, to install idle handler.
+// This will be called when the "event" signal is issued on any GtkWidget object.
+static gboolean
+event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)
+{
+    wxapp_install_idle_handler();
+    // remove hook
+    return false;
+}
+
+// add emission hook for "event" signal, to re-install idle handler when needed
+static inline void wxAddEmissionHook()
+{
+    GType widgetType = GTK_TYPE_WIDGET;
+    // if GtkWidget type is loaded
+    if (g_type_class_peek(widgetType) != NULL)
+    {
+        guint sig_id = g_signal_lookup("event", widgetType);
+        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)


@@ -222,6 +244,9 @@ static gint wxapp_idle_callback( gpointer WXUNUSED(data) )
     // Release lock again
     gdk_threads_leave();
 
     // Release lock again
     gdk_threads_leave();
 

+    if (!moreIdles)
+        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;
 }


@@ -583,15 +608,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();

     }
 }
     }
 }