[patch] Patch to wxGTK to fix the leaking of timer handles when the application is not active

wxGTK-2.8.10.1-fix-timer-leak.patch (text/plain), 1.42 KB, created by Richard Ash on 2010-01-18 21:24:50 UTC

Index: /wxWidgets/branches/WX_2_8_BRANCH/src/gtk/app.cpp
===================================================================
--- /wxWidgets/branches/WX_2_8_BRANCH/src/gtk/app.cpp (revision 60784)
+++ /wxWidgets/branches/WX_2_8_BRANCH/src/gtk/app.cpp (revision 62397)
@@ -150,7 +150,9 @@
 // This will be called when the "event" signal is issued on any GtkWidget object.
 static gboolean
-event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer)
+event_emission_hook(GSignalInvocationHint*, guint, const GValue*, gpointer data)
 {
     wxapp_install_idle_handler();
+    bool* hook_installed = (bool*)data;
+    *hook_installed = false;
     // remove hook
     return false;
@@ -160,10 +162,15 @@
 static inline void wxAddEmissionHook()
 {
+    static bool hook_installed;
     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);
+    // if hook not installed and GtkWidget type is loaded
+    if (!hook_installed && g_type_class_peek(widgetType))
+    {
+        static guint sig_id;
+        if (sig_id == 0)
+            sig_id = g_signal_lookup("event", widgetType);
+        hook_installed = true;
+        g_signal_add_emission_hook(
+            sig_id, 0, event_emission_hook, &hook_installed, NULL);
     }
 }