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/gtknotebook.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/gtknotebook.c')
| -rw-r--r-- | gtk/gtknotebook.c | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c index d5ae15904..744ab3d21 100644 --- a/gtk/gtknotebook.c +++ b/gtk/gtknotebook.c @@ -62,11 +62,6 @@ enum { CHILD_ARG_POSITION }; -typedef void (*GtkNotebookSignal) (GtkObject *object, - GtkNotebookPage *arg1, - gint arg2, - gpointer data); - static void gtk_notebook_class_init (GtkNotebookClass *klass); static void gtk_notebook_init (GtkNotebook *notebook); static void gtk_notebook_set_arg (GtkObject *object, @@ -157,10 +152,6 @@ static void gtk_notebook_switch_focus_tab (GtkNotebook *notebook, static void gtk_real_notebook_switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num); -static void gtk_notebook_marshal_signal (GtkObject *object, - GtkSignalFunc func, - gpointer func_data, - GtkArg *args); static void gtk_notebook_menu_switch_page (GtkWidget *widget, GtkNotebookPage *page); static void gtk_notebook_update_labels (GtkNotebook *notebook, @@ -235,7 +226,7 @@ gtk_notebook_class_init (GtkNotebookClass *class) GTK_RUN_LAST, object_class->type, GTK_SIGNAL_OFFSET (GtkNotebookClass, switch_page), - gtk_notebook_marshal_signal, + gtk_marshal_NONE__POINTER_UINT, GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_UINT); @@ -3070,20 +3061,6 @@ gtk_notebook_switch_page (GtkNotebook *notebook, page_num); } -static void -gtk_notebook_marshal_signal (GtkObject *object, - GtkSignalFunc func, - gpointer func_data, - GtkArg *args) -{ - GtkNotebookSignal rfunc; - - rfunc = (GtkNotebookSignal) func; - - (* rfunc) (object, GTK_VALUE_POINTER (args[0]), GTK_VALUE_INT (args[1]), - func_data); -} - static gint gtk_notebook_focus (GtkContainer *container, GtkDirectionType direction) |