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/gtktree.c | |
| parent | cebb7bfc9f6cff18b06716fb8e536998f1a3df9a (diff) | |
| download | gdk-pixbuf-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/gtktree.c')
| -rw-r--r-- | gtk/gtktree.c | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/gtk/gtktree.c b/gtk/gtktree.c index de464300a..ecaf7f2d3 100644 --- a/gtk/gtktree.c +++ b/gtk/gtktree.c @@ -29,11 +29,6 @@ enum { LAST_SIGNAL }; -typedef void (*GtkTreeSignal) (GtkObject *object, - gpointer arg1, - gpointer data); - - static void gtk_tree_class_init (GtkTreeClass *klass); static void gtk_tree_init (GtkTree *tree); static void gtk_tree_destroy (GtkObject *object); @@ -65,10 +60,6 @@ static void gtk_real_tree_select_child (GtkTree *tree, static void gtk_real_tree_unselect_child (GtkTree *tree, GtkWidget *child); -static void gtk_tree_marshal_signal (GtkObject *object, - GtkSignalFunc func, - gpointer func_data, - GtkArg *args); static GtkType gtk_tree_child_type (GtkContainer *container); static GtkContainerClass *parent_class = NULL; @@ -117,14 +108,14 @@ gtk_tree_class_init (GtkTreeClass *class) GTK_RUN_FIRST, object_class->type, GTK_SIGNAL_OFFSET (GtkTreeClass, selection_changed), - gtk_signal_default_marshaller, + gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0); tree_signals[SELECT_CHILD] = gtk_signal_new ("select_child", GTK_RUN_FIRST, object_class->type, GTK_SIGNAL_OFFSET (GtkTreeClass, select_child), - gtk_tree_marshal_signal, + gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_WIDGET); tree_signals[UNSELECT_CHILD] = @@ -132,7 +123,7 @@ gtk_tree_class_init (GtkTreeClass *class) GTK_RUN_FIRST, object_class->type, GTK_SIGNAL_OFFSET (GtkTreeClass, unselect_child), - gtk_tree_marshal_signal, + gtk_marshal_NONE__POINTER, GTK_TYPE_NONE, 1, GTK_TYPE_WIDGET); @@ -609,19 +600,6 @@ gtk_tree_map (GtkWidget *widget) } } -static void -gtk_tree_marshal_signal (GtkObject *object, - GtkSignalFunc func, - gpointer func_data, - GtkArg *args) -{ - GtkTreeSignal rfunc; - - rfunc = (GtkTreeSignal) func; - - (* rfunc) (object, GTK_VALUE_OBJECT (args[0]), func_data); -} - static gint gtk_tree_motion_notify (GtkWidget *widget, GdkEventMotion *event) |