diff options
| author | Elliot Lee <sopwith@src.gnome.org> | 1998-07-21 04:13:42 +0000 |
|---|---|---|
| committer | Elliot Lee <sopwith@src.gnome.org> | 1998-07-21 04:13:42 +0000 |
| commit | 7c30f2a15fbfa5f50d4859d635ab15ad1d6e1d37 (patch) | |
| tree | fd630d133421ca0ea39f55a4130ced3e34c029ff /gtk/gtklist.c | |
| parent | cebb7bfc9f6cff18b06716fb8e536998f1a3df9a (diff) | |
| download | gtk+-7c30f2a15fbfa5f50d4859d635ab15ad1d6e1d37.tar.gz | |
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 :-)
Diffstat (limited to 'gtk/gtklist.c')
| -rw-r--r-- | gtk/gtklist.c | 30 |
1 files changed, 3 insertions, 27 deletions
diff --git a/gtk/gtklist.c b/gtk/gtklist.c index 9c5809712e..09a5a1a8f9 100644 --- a/gtk/gtklist.c +++ b/gtk/gtklist.c @@ -29,12 +29,6 @@ enum { LAST_SIGNAL }; - -typedef void (*GtkListSignal) (GtkObject *object, - gpointer arg1, - gpointer data); - - static void gtk_list_class_init (GtkListClass *klass); static void gtk_list_init (GtkList *list); static void gtk_list_shutdown (GtkObject *object); @@ -69,10 +63,6 @@ static void gtk_real_list_select_child (GtkList *list, static void gtk_real_list_unselect_child (GtkList *list, GtkWidget *child); -static void gtk_list_marshal_signal (GtkObject *object, - GtkSignalFunc func, - gpointer func_data, - GtkArg *args); static GtkType gtk_list_child_type (GtkContainer *container); @@ -123,14 +113,14 @@ gtk_list_class_init (GtkListClass *class) GTK_RUN_FIRST, object_class->type, GTK_SIGNAL_OFFSET (GtkListClass, selection_changed), - gtk_signal_default_marshaller, + gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); list_signals[SELECT_CHILD] = gtk_signal_new ("select_child", GTK_RUN_FIRST, object_class->type, GTK_SIGNAL_OFFSET (GtkListClass, select_child), - gtk_list_marshal_signal, + gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_WIDGET); list_signals[UNSELECT_CHILD] = @@ -138,7 +128,7 @@ gtk_list_class_init (GtkListClass *class) GTK_RUN_FIRST, object_class->type, GTK_SIGNAL_OFFSET (GtkListClass, unselect_child), - gtk_list_marshal_signal, + gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_WIDGET); @@ -1079,17 +1069,3 @@ gtk_real_list_unselect_child (GtkList *list, break; } } - - -static void -gtk_list_marshal_signal (GtkObject *object, - GtkSignalFunc func, - gpointer func_data, - GtkArg *args) -{ - GtkListSignal rfunc; - - rfunc = (GtkListSignal) func; - - (* rfunc) (object, GTK_VALUE_OBJECT (args[0]), func_data); -} |