summaryrefslogtreecommitdiff
path: root/gtk
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>2001-03-08 17:13:11 +0000
committerTim Janik <timj@src.gnome.org>2001-03-08 17:13:11 +0000
commit73789e5aa77952a54f405707563a3cbd45be8b54 (patch)
tree84d7d7aedb11148db636bb25a66a0877e296145f /gtk
parent06718ecfed1751854486e5c4fbc3d1e0c3d37e00 (diff)
downloadgdk-pixbuf-73789e5aa77952a54f405707563a3cbd45be8b54.tar.gz
re-enabled event watcher emission hooks.
Thu Mar 8 18:13:20 2001 Tim Janik <timj@gtk.org> * gtk/testgtk.c: re-enabled event watcher emission hooks.
Diffstat (limited to 'gtk')
-rw-r--r--gtk/testgtk.c21
1 files changed, 10 insertions, 11 deletions
diff --git a/gtk/testgtk.c b/gtk/testgtk.c
index f8fa8ce72..cdfa2e0e8 100644
--- a/gtk/testgtk.c
+++ b/gtk/testgtk.c
@@ -6220,15 +6220,14 @@ static gboolean event_watcher_enter_id = 0;
static gboolean event_watcher_leave_id = 0;
static gboolean
-event_watcher (GtkObject *object,
- guint signal_id,
- guint n_params,
- GtkArg *params,
- gpointer data)
+event_watcher (GSignalInvocationHint *ihint,
+ guint n_param_values,
+ const GValue *param_values,
+ gpointer data)
{
g_print ("Watch: \"%s\" emitted for %s\n",
- gtk_signal_name (signal_id),
- gtk_type_name (GTK_OBJECT_TYPE (object)));
+ gtk_signal_name (ihint->signal_id),
+ gtk_type_name (GTK_OBJECT_TYPE (g_value_get_object (param_values + 0))));
return TRUE;
}
@@ -6241,10 +6240,10 @@ event_watcher_down (void)
guint signal_id;
signal_id = gtk_signal_lookup ("enter_notify_event", GTK_TYPE_WIDGET);
- // gtk_signal_remove_emission_hook (signal_id, event_watcher_enter_id);
+ g_signal_remove_emission_hook (signal_id, event_watcher_enter_id);
event_watcher_enter_id = 0;
signal_id = gtk_signal_lookup ("leave_notify_event", GTK_TYPE_WIDGET);
- // gtk_signal_remove_emission_hook (signal_id, event_watcher_leave_id);
+ g_signal_remove_emission_hook (signal_id, event_watcher_leave_id);
event_watcher_leave_id = 0;
}
}
@@ -6259,9 +6258,9 @@ event_watcher_toggle (void)
guint signal_id;
signal_id = gtk_signal_lookup ("enter_notify_event", GTK_TYPE_WIDGET);
- // event_watcher_enter_id = gtk_signal_add_emission_hook (signal_id, event_watcher, NULL);
+ event_watcher_enter_id = g_signal_add_emission_hook (signal_id, 0, event_watcher, NULL, NULL);
signal_id = gtk_signal_lookup ("leave_notify_event", GTK_TYPE_WIDGET);
- // event_watcher_leave_id = gtk_signal_add_emission_hook (signal_id, event_watcher, NULL);
+ event_watcher_leave_id = g_signal_add_emission_hook (signal_id, 0, event_watcher, NULL, NULL);
}
}