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/gtkinputdialog.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/gtkinputdialog.c')
| -rw-r--r-- | gtk/gtkinputdialog.c | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/gtk/gtkinputdialog.c b/gtk/gtkinputdialog.c index 81aa60e7fb..d219668fce 100644 --- a/gtk/gtkinputdialog.c +++ b/gtk/gtkinputdialog.c @@ -45,10 +45,6 @@ #include "gtktable.h" #include "gtkvbox.h" -typedef void (*GtkInputDialogSignal1) (GtkObject *object, - int arg1, - gpointer data); - typedef struct { gint index; GtkWidget *entry; @@ -71,10 +67,6 @@ enum /* Forward declarations */ -static void gtk_input_dialog_marshal_signal1 (GtkObject *object, - GtkSignalFunc func, - gpointer func_data, - GtkArg *args); static void gtk_input_dialog_class_init (GtkInputDialogClass *klass); static void gtk_input_dialog_init (GtkInputDialog *inputd); static GdkDeviceInfo *gtk_input_dialog_get_device_info(guint32 deviceid); @@ -101,18 +93,6 @@ static void gtk_input_dialog_fill_keys (GtkInputDialog *inputd, static GtkObjectClass *parent_class = NULL; static guint input_dialog_signals[LAST_SIGNAL] = { 0 }; -static void -gtk_input_dialog_marshal_signal1 (GtkObject *object, - GtkSignalFunc func, - gpointer func_data, - GtkArg *args) -{ - GtkInputDialogSignal1 rfunc; - - rfunc = (GtkInputDialogSignal1) func; - (* rfunc) (object, GTK_VALUE_INT(args[0]), func_data); -} - static GdkDeviceInfo * gtk_input_dialog_get_device_info(guint32 deviceid) { @@ -167,7 +147,7 @@ gtk_input_dialog_class_init (GtkInputDialogClass *klass) GTK_RUN_LAST, object_class->type, GTK_SIGNAL_OFFSET (GtkInputDialogClass, enable_device), - gtk_input_dialog_marshal_signal1, + gtk_marshal_NONE__INT, GTK_TYPE_NONE, 1, GTK_TYPE_INT); input_dialog_signals[DISABLE_DEVICE] = @@ -175,7 +155,7 @@ gtk_input_dialog_class_init (GtkInputDialogClass *klass) GTK_RUN_LAST, object_class->type, GTK_SIGNAL_OFFSET (GtkInputDialogClass, disable_device), - gtk_input_dialog_marshal_signal1, + gtk_marshal_NONE__INT, GTK_TYPE_NONE, 1, GTK_TYPE_INT); gtk_object_class_add_signals (object_class, input_dialog_signals, |