From 7c30f2a15fbfa5f50d4859d635ab15ad1d6e1d37 Mon Sep 17 00:00:00 2001 From: Elliot Lee Date: Tue, 21 Jul 1998 04:13:42 +0000 Subject: Use common marshalling routines instead of having widget-private ones. It Use common marshalling routines instead of having widget-private ones. It compiles & links. testgtk segfaults. I'm convinced that is Somebody Else's Problem (marshalling routine gets func_data=0x0 and blithely passes it on) but the fact that it happens now & not before makes me wrong :-) --- gtk/gtkhandlebox.c | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) (limited to 'gtk/gtkhandlebox.c') diff --git a/gtk/gtkhandlebox.c b/gtk/gtkhandlebox.c index de2c856694..6dd34f117d 100644 --- a/gtk/gtkhandlebox.c +++ b/gtk/gtkhandlebox.c @@ -38,10 +38,6 @@ enum SIGNAL_LAST }; -typedef void (*SignalChildAttached) (GtkObject *object, - GtkWidget *widget, - gpointer func_data); - static void gtk_handle_box_class_init (GtkHandleBoxClass *klass); static void gtk_handle_box_init (GtkHandleBox *handle_box); static void gtk_handle_box_destroy (GtkObject *object); @@ -104,19 +100,6 @@ gtk_handle_box_get_type (void) return handle_box_type; } -static void -gtk_handle_box_marshal_child_attached (GtkObject *object, - GtkSignalFunc func, - gpointer func_data, - GtkArg *args) -{ - SignalChildAttached sfunc = (SignalChildAttached) func; - - (* sfunc) (object, - (GtkWidget*) GTK_VALUE_OBJECT (args[0]), - func_data); -} - static void gtk_handle_box_class_init (GtkHandleBoxClass *class) { @@ -135,7 +118,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class) GTK_RUN_FIRST, object_class->type, GTK_SIGNAL_OFFSET (GtkHandleBoxClass, child_attached), - gtk_handle_box_marshal_child_attached, + gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_WIDGET); handle_box_signals[SIGNAL_CHILD_DETACHED] = @@ -143,7 +126,7 @@ gtk_handle_box_class_init (GtkHandleBoxClass *class) GTK_RUN_FIRST, object_class->type, GTK_SIGNAL_OFFSET (GtkHandleBoxClass, child_detached), - gtk_handle_box_marshal_child_attached, + gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_WIDGET); gtk_object_class_add_signals (object_class, handle_box_signals, SIGNAL_LAST); -- cgit v1.2.1