summaryrefslogtreecommitdiff
path: root/gtk/gtksignal.c
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>2000-12-12 07:32:32 +0000
committerTim Janik <timj@src.gnome.org>2000-12-12 07:32:32 +0000
commit53d7e430600186e34426965ea6dfadbe9cdcaa84 (patch)
tree66c589512250065ec89c8c13b0b1c1c6c6fd461e /gtk/gtksignal.c
parent0cdc00ec0b5364bcbe9b0567be64bd9efdda3074 (diff)
downloadgdk-pixbuf-53d7e430600186e34426965ea6dfadbe9cdcaa84.tar.gz
get rid of object_signal:: GtkObject argument uses, use GObject
Tue Dec 12 08:24:42 2000 Tim Janik <timj@gtk.org> * gtk/testgtk.c: (create_tooltips): (create_statusbar): get rid of object_signal:: GtkObject argument uses, use GObject swapped_signal:: properties instead. * gtk/gtkcellrenderertoggle.c: * gtk/gtkcellrenderertextpixbuf.c: * gtk/gtkcellrenderertext.c: * gtk/gtkcellrendererpixbuf.c: * gtk/gtkcellrenderer.c: * gtk/gtktreeviewcolumn.c: s/[sg]et_param/[sg]et_property/, fixed missing warnings for invalid property ids, install properties with g_object_class_install_property() now. * gtk/gtksignal.c: (gtk_signal_emit): let g_signal_emit_valist() collect the values for us.
Diffstat (limited to 'gtk/gtksignal.c')
-rw-r--r--gtk/gtksignal.c20
1 files changed, 18 insertions, 2 deletions
diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index e399423e2..c1dc0e62e 100644
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -44,7 +44,7 @@ gtk_signal_newv (const gchar *name,
g_return_val_if_fail (n_params < SIGNAL_MAX_PARAMS, 0);
- closure = g_signal_type_closure_new (object_type, function_offset);
+ closure = g_signal_type_cclosure_new (object_type, function_offset);
return g_signal_newv (name, object_type, signal_flags, closure, NULL, marshaller, return_val, n_params, params);
}
@@ -309,7 +309,7 @@ gtk_signal_emitv (GtkObject *object,
g_signal_query (signal_id, &query);
g_return_if_fail (query.signal_id != 0);
- g_return_if_fail (g_type_conforms_to (GTK_OBJECT_TYPE (object), query.itype));
+ g_return_if_fail (g_type_is_a (GTK_OBJECT_TYPE (object), query.itype));
g_return_if_fail (query.n_params < SIGNAL_MAX_PARAMS);
if (query.n_params > 0)
g_return_if_fail (args != NULL);
@@ -401,6 +401,7 @@ gtk_signal_collect_args (GtkArg *args,
return failed;
}
+#if 0
void
gtk_signal_emit (GtkObject *object,
guint signal_id,
@@ -428,6 +429,21 @@ gtk_signal_emit (GtkObject *object,
if (!abort)
gtk_signal_emitv (object, signal_id, args);
}
+#endif
+
+void
+gtk_signal_emit (GtkObject *object,
+ guint signal_id,
+ ...)
+{
+ va_list var_args;
+
+ g_return_if_fail (GTK_IS_OBJECT (object));
+
+ va_start (var_args, signal_id);
+ g_signal_emit_valist (G_OBJECT (object), signal_id, 0, var_args);
+ va_end (var_args);
+}
void
gtk_signal_emit_by_name (GtkObject *object,