summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorElliot Lee <sopwith@src.gnome.org>1998-07-21 04:13:42 +0000
committerElliot Lee <sopwith@src.gnome.org>1998-07-21 04:13:42 +0000
commit7c30f2a15fbfa5f50d4859d635ab15ad1d6e1d37 (patch)
treefd630d133421ca0ea39f55a4130ced3e34c029ff
parentcebb7bfc9f6cff18b06716fb8e536998f1a3df9a (diff)
downloadgtk+-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
-rwxr-xr-xgtk/genmarshal.pl59
-rw-r--r--gtk/gtkaccelgroup.c40
-rw-r--r--gtk/gtkadjustment.c4
-rw-r--r--gtk/gtkbutton.c10
-rw-r--r--gtk/gtkcheckmenuitem.c2
-rw-r--r--gtk/gtkclist.c128
-rw-r--r--gtk/gtkcolorsel.c2
-rw-r--r--gtk/gtkcontainer.c85
-rw-r--r--gtk/gtkctree.c82
-rw-r--r--gtk/gtkcurve.c2
-rw-r--r--gtk/gtkdata.c2
-rw-r--r--gtk/gtkeditable.c106
-rw-r--r--gtk/gtkhandlebox.c21
-rw-r--r--gtk/gtkinputdialog.c24
-rw-r--r--gtk/gtkitem.c6
-rw-r--r--gtk/gtklist.c30
-rw-r--r--gtk/gtkmarshal.c420
-rw-r--r--gtk/gtkmarshal.h182
-rw-r--r--gtk/gtkmarshal.list36
-rw-r--r--gtk/gtkmarshalers.list36
-rw-r--r--gtk/gtkmenuitem.c2
-rw-r--r--gtk/gtkmenushell.c4
-rw-r--r--gtk/gtknotebook.c25
-rw-r--r--gtk/gtkobject.c2
-rw-r--r--gtk/gtksignal.c11
-rw-r--r--gtk/gtkstatusbar.c23
-rw-r--r--gtk/gtktipsquery.c54
-rw-r--r--gtk/gtktogglebutton.c2
-rw-r--r--gtk/gtktoolbar.c27
-rw-r--r--gtk/gtktree.c28
-rw-r--r--gtk/gtktreeitem.c8
-rw-r--r--gtk/gtkwidget.c260
-rw-r--r--gtk/gtkwindow.c29
33 files changed, 804 insertions, 948 deletions
diff --git a/gtk/genmarshal.pl b/gtk/genmarshal.pl
index dc4ce54d64..43652b3f6c 100755
--- a/gtk/genmarshal.pl
+++ b/gtk/genmarshal.pl
@@ -11,18 +11,28 @@
"BOXED"=>"gpointer", "FOREIGN"=>"gpointer",
"CALLBACK"=>"gpointer", "POINTER"=>"gpointer",
"ARGS"=>"gpointer", "SIGNAL"=>"gpointer",
- "C_CALLBACK"=>"gpointer", "OBJECT"=>"gpointer");
+ "C_CALLBACK"=>"gpointer", "OBJECT"=>"gpointer",
+ "STYLE"=>"gpointer", "GDK_EVENT"=>"gpointer");
-open(IL, "<".$ENV{'srcdir'}."/gtkmarshal.list") || die("Open failed: $!");
-open(OH, "|indent >".$ENV{'srcdir'}."/gtkmarshal.h") || die("Open failed: $!");
-open(OS, "|indent >".$ENV{'srcdir'}."/gtkmarshal.c") || die("Open failed: $!");
+$srcdir = $ENV{'srcdir'} || '.';
+
+open(IL, "<$srcdir/gtkmarshal.list") || die("Open failed: $!");
+open(OH, "|indent > $srcdir/gtkmarshal.h") || die("Open failed: $!");
+open(OS, "|indent > $srcdir/gtkmarshal.c") || die("Open failed: $!");
print OH <<EOT;
#ifndef __GTKMARSHAL_H__
#define __GTKMARSHAL_H__ 1
-#include "gtktypeutils.h"
-#include "gtkobject.h"
+#include <gtk/gtktypeutils.h>
+#include <gtk/gtkobject.h>
+
+#ifdef __cplusplus
+extern "C" {
+#pragma }
+#endif /* __cplusplus */
+
+#define gtk_signal_default_marshaller gtk_marshal_NONE__NONE
EOT
@@ -33,32 +43,46 @@ while(chomp($aline = <IL>)) {
@params = split(/\s*,\s*/, $paramlist);
my $funcname = $retval."__".join("_",@params);
+ my $defname;
next if (exists $defs{$funcname});
$doequiv = 0;
for (@params, $retval) {
- if ($trans{$_} eq "gpointer") {
+ if ($trans{$_} eq "gpointer" && $_ ne "POINTER") {
$doequiv = 1;
last;
- }
+ }
+ if($_ eq "ENUM" || $_ eq "UINT" || $_ eq "ULONG") {
+ $doequiv = 1;
+ last;
+ }
}
# Translate all function pointers to gpointer
- $defname = "";
+ $defname = $funcname;
if($doequiv) {
print OH "#define gtk_marshal_$funcname ";
$defs{$defname} = 1;
for (@params, $retval) {
- if ($trans{$_} eq "gpointer") {
- $_ = "POINTER";
- }
+ if ($trans{$_} eq "gpointer") {
+ $_ = "POINTER";
+ }
+ if($_ eq "ENUM") {
+ $_ = "UINT";
+ }
+ if($_ eq "UINT") {
+ $_ = "INT"; # Unvalidated assumption - please check
+ }
+ if($_ eq "ULONG") {
+ $_ = "LONG";
+ }
}
$funcname = $retval."__".join("_",@params);
- print OH "gtk_marshal_$funcname\n";
+ print OH "gtk_marshal_$funcname\n\n";
next if (exists $defs{$funcname});
}
$defs{$funcname} = 1;
@@ -103,6 +127,13 @@ EOT
print OS " func_data);\n}\n\n";
}
-print OH "#endif\n";
+print OH <<EOT;
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __GTKMARSHAL_H__ */
+EOT
close(IL); close(OH); close(OS);
diff --git a/gtk/gtkaccelgroup.c b/gtk/gtkaccelgroup.c
index 9a65f07318..f698e19aaf 100644
--- a/gtk/gtkaccelgroup.c
+++ b/gtk/gtkaccelgroup.c
@@ -649,7 +649,7 @@ gtk_accel_group_create_add (GtkType class_type,
signal_flags,
class_type,
handler_offset,
- gtk_accel_group_marshal_add,
+ gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM,
GTK_TYPE_NONE, 5,
GTK_TYPE_UINT,
GTK_TYPE_ACCEL_GROUP,
@@ -669,49 +669,13 @@ gtk_accel_group_create_remove (GtkType class_type,
signal_flags,
class_type,
handler_offset,
- gtk_accel_group_marshal_remove,
+ gtk_marshal_NONE__POINTER_UINT_UINT,
GTK_TYPE_NONE, 3,
GTK_TYPE_ACCEL_GROUP,
GTK_TYPE_UINT,
GTK_TYPE_GDK_MODIFIER_TYPE);
}
-void
-gtk_accel_group_marshal_add (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkSignalAddAccelerator signal_func;
-
- signal_func = (GtkSignalAddAccelerator) func;
-
- signal_func (object,
- GTK_VALUE_UINT (args[0]),
- GTK_VALUE_BOXED (args[1]),
- GTK_VALUE_UINT (args[2]),
- GTK_VALUE_UINT (args[3]),
- GTK_VALUE_ENUM (args[4]),
- func_data);
-}
-
-void
-gtk_accel_group_marshal_remove (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkSignalRemoveAccelerator signal_func;
-
- signal_func = (GtkSignalRemoveAccelerator) func;
-
- signal_func (object,
- GTK_VALUE_BOXED (args[0]),
- GTK_VALUE_UINT (args[1]),
- GTK_VALUE_UINT (args[2]),
- func_data);
-}
-
GSList*
gtk_accel_groups_from_object (GtkObject *object)
{
diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c
index 5f0b4128b3..03c09c537f 100644
--- a/gtk/gtkadjustment.c
+++ b/gtk/gtkadjustment.c
@@ -71,14 +71,14 @@ gtk_adjustment_class_init (GtkAdjustmentClass *class)
GTK_RUN_FIRST | GTK_RUN_NO_RECURSE,
object_class->type,
GTK_SIGNAL_OFFSET (GtkAdjustmentClass, changed),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
adjustment_signals[VALUE_CHANGED] =
gtk_signal_new ("value_changed",
GTK_RUN_FIRST | GTK_RUN_NO_RECURSE,
object_class->type,
GTK_SIGNAL_OFFSET (GtkAdjustmentClass, value_changed),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, adjustment_signals, LAST_SIGNAL);
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index d8002c62f1..1ebc69b27f 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -140,35 +140,35 @@ gtk_button_class_init (GtkButtonClass *klass)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkButtonClass, pressed),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
button_signals[RELEASED] =
gtk_signal_new ("released",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkButtonClass, released),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
button_signals[CLICKED] =
gtk_signal_new ("clicked",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkButtonClass, clicked),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
button_signals[ENTER] =
gtk_signal_new ("enter",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkButtonClass, enter),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
button_signals[LEAVE] =
gtk_signal_new ("leave",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkButtonClass, leave),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, button_signals, LAST_SIGNAL);
diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
index e9130247ff..62ff1644d8 100644
--- a/gtk/gtkcheckmenuitem.c
+++ b/gtk/gtkcheckmenuitem.c
@@ -140,7 +140,7 @@ gtk_check_menu_item_class_init (GtkCheckMenuItemClass *klass)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCheckMenuItemClass, toggled),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, check_menu_item_signals, LAST_SIGNAL);
diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c
index 1844e6a31e..ae07979e8b 100644
--- a/gtk/gtkclist.c
+++ b/gtk/gtkclist.c
@@ -350,31 +350,6 @@ static void extend_selection (GtkCList *clist,
gfloat position,
gboolean auto_start_selection);
-
-/* Signals */
-static void gtk_clist_marshal_signal_1 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-static void gtk_clist_marshal_signal_2 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-static void gtk_clist_marshal_signal_3 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-static void gtk_clist_marshal_signal_4 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-static void gtk_clist_marshal_signal_5 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
-
-
/* Fill in data after widget is realized and has style */
static void add_style_data (GtkCList * clist);
@@ -426,21 +401,24 @@ gtk_clist_class_init (GtkCListClass * klass)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, select_row),
- gtk_clist_marshal_signal_1,
- GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
+ gtk_marshal_NONE__INT_INT_POINTER,
+ GTK_TYPE_NONE, 3,
+ GTK_TYPE_INT,
+ GTK_TYPE_INT,
+ GTK_TYPE_GDK_EVENT);
clist_signals[UNSELECT_ROW] =
gtk_signal_new ("unselect_row",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, unselect_row),
- gtk_clist_marshal_signal_1,
+ gtk_marshal_NONE__INT_INT_POINTER,
GTK_TYPE_NONE, 3, GTK_TYPE_INT, GTK_TYPE_INT, GTK_TYPE_GDK_EVENT);
clist_signals[CLICK_COLUMN] =
gtk_signal_new ("click_column",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, click_column),
- gtk_clist_marshal_signal_3,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1, GTK_TYPE_INT);
clist_signals[TOGGLE_FOCUS_ROW] =
@@ -448,56 +426,56 @@ gtk_clist_class_init (GtkCListClass * klass)
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, toggle_focus_row),
- gtk_clist_marshal_signal_2,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
clist_signals[SELECT_ALL] =
gtk_signal_new ("select_all",
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, select_all),
- gtk_clist_marshal_signal_2,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
clist_signals[UNSELECT_ALL] =
gtk_signal_new ("unselect_all",
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, unselect_all),
- gtk_clist_marshal_signal_2,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
clist_signals[UNDO_SELECTION] =
gtk_signal_new ("undo_selection",
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, undo_selection),
- gtk_clist_marshal_signal_2,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
clist_signals[START_SELECTION] =
gtk_signal_new ("start_selection",
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, start_selection),
- gtk_clist_marshal_signal_2,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
clist_signals[END_SELECTION] =
gtk_signal_new ("end_selection",
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, end_selection),
- gtk_clist_marshal_signal_2,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
clist_signals[TOGGLE_ADD_MODE] =
gtk_signal_new ("toggle_add_mode",
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, toggle_add_mode),
- gtk_clist_marshal_signal_2,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
clist_signals[EXTEND_SELECTION] =
gtk_signal_new ("extend_selection",
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, extend_selection),
- gtk_clist_marshal_signal_5,
+ gtk_marshal_NONE__ENUM_FLOAT_BOOL,
GTK_TYPE_NONE, 3,
GTK_TYPE_ENUM, GTK_TYPE_FLOAT, GTK_TYPE_BOOL);
clist_signals[SCROLL_VERTICAL] =
@@ -505,21 +483,21 @@ gtk_clist_class_init (GtkCListClass * klass)
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, scroll_vertical),
- gtk_clist_marshal_signal_4,
+ gtk_marshal_NONE__ENUM_FLOAT,
GTK_TYPE_NONE, 2, GTK_TYPE_ENUM, GTK_TYPE_FLOAT);
clist_signals[SCROLL_HORIZONTAL] =
gtk_signal_new ("scroll_horizontal",
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, scroll_horizontal),
- gtk_clist_marshal_signal_4,
+ gtk_marshal_NONE__ENUM_FLOAT,
GTK_TYPE_NONE, 2, GTK_TYPE_ENUM, GTK_TYPE_FLOAT);
clist_signals[ABORT_COLUMN_RESIZE] =
gtk_signal_new ("abort_column_resize",
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCListClass, abort_column_resize),
- gtk_clist_marshal_signal_2,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
@@ -766,76 +744,6 @@ gtk_clist_class_init (GtkCListClass * klass)
}
static void
-gtk_clist_marshal_signal_1 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkCListSignal1 rfunc;
-
- rfunc = (GtkCListSignal1) func;
-
- (*rfunc) (object, GTK_VALUE_INT (args[0]),
- GTK_VALUE_INT (args[1]),
- GTK_VALUE_POINTER (args[2]),
- func_data);
-}
-
-static void
-gtk_clist_marshal_signal_2 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkCListSignal2 rfunc;
-
- rfunc = (GtkCListSignal2) func;
-
- (*rfunc) (object, func_data);
-}
-
-static void
-gtk_clist_marshal_signal_3 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkCListSignal3 rfunc;
-
- rfunc = (GtkCListSignal3) func;
-
- (*rfunc) (object, GTK_VALUE_INT (args[0]), func_data);
-}
-
-static void
-gtk_clist_marshal_signal_4 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkCListSignal4 rfunc;
-
- rfunc = (GtkCListSignal4) func;
-
- (*rfunc) (object, GTK_VALUE_INT (args[0]),
- GTK_VALUE_FLOAT (args[1]), func_data);
-}
-
-static void
-gtk_clist_marshal_signal_5 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkCListSignal5 rfunc;
-
- rfunc = (GtkCListSignal5) func;
-
- (*rfunc) (object, GTK_VALUE_INT (args[0]), GTK_VALUE_FLOAT (args[1]),
- GTK_VALUE_BOOL (args[2]), func_data);
-}
-
-static void
gtk_clist_init (GtkCList * clist)
{
clist->flags = 0;
diff --git a/gtk/gtkcolorsel.c b/gtk/gtkcolorsel.c
index e4d6681f2e..25c964aaab 100644
--- a/gtk/gtkcolorsel.c
+++ b/gtk/gtkcolorsel.c
@@ -236,7 +236,7 @@ gtk_color_selection_class_init (GtkColorSelectionClass *klass)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkColorSelectionClass, color_changed),
- gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
+ gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, color_selection_signals, LAST_SIGNAL);
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 6d4027216b..8f3696f32e 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -51,35 +51,6 @@ struct _GtkChildArgInfo
guint seq_id;
};
-
-typedef void (*GtkContainerSignal1) (GtkObject *object,
- gpointer arg1,
- gpointer data);
-typedef void (*GtkContainerSignal2) (GtkObject *object,
- GtkFunction arg1,
- gpointer arg2,
- gpointer data);
-typedef gint (*GtkContainerSignal3) (GtkObject *object,
- gint arg1,
- gpointer data);
-typedef gint (*GtkContainerSignal4) (GtkObject *object,
- gpointer data);
-
-
-static void gtk_container_marshal_signal_1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-static void gtk_container_marshal_signal_2 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-static void gtk_container_marshal_signal_3 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-
-
static void gtk_container_base_class_init (GtkContainerClass *klass);
static void gtk_container_class_init (GtkContainerClass *klass);
static void gtk_container_init (GtkContainer *container);
@@ -189,7 +160,7 @@ gtk_container_class_init (GtkContainerClass *class)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkContainerClass, add),
- gtk_container_marshal_signal_1,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
container_signals[REMOVE] =
@@ -197,7 +168,7 @@ gtk_container_class_init (GtkContainerClass *class)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkContainerClass, remove),
- gtk_container_marshal_signal_1,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
container_signals[CHECK_RESIZE] =
@@ -205,14 +176,14 @@ gtk_container_class_init (GtkContainerClass *class)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkContainerClass, check_resize),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
container_signals[FOREACH] =
gtk_signal_new ("foreach",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkContainerClass, foreach),
- gtk_container_marshal_signal_2,
+ gtk_marshal_NONE__C_CALLBACK,
GTK_TYPE_NONE, 1,
GTK_TYPE_C_CALLBACK);
container_signals[FOCUS] =
@@ -220,7 +191,7 @@ gtk_container_class_init (GtkContainerClass *class)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkContainerClass, focus),
- gtk_container_marshal_signal_3,
+ gtk_marshal_ENUM__ENUM,
GTK_TYPE_DIRECTION_TYPE, 1,
GTK_TYPE_DIRECTION_TYPE);
container_signals[SET_FOCUS_CHILD] =
@@ -228,7 +199,7 @@ gtk_container_class_init (GtkContainerClass *class)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkContainerClass, set_focus_child),
- gtk_container_marshal_signal_1,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_WIDGET);
gtk_object_class_add_signals (object_class, container_signals, LAST_SIGNAL);
@@ -1303,50 +1274,6 @@ gtk_container_real_set_focus_child (GtkContainer *container,
}
}
-static void
-gtk_container_marshal_signal_1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkContainerSignal1 rfunc;
-
- rfunc = (GtkContainerSignal1) func;
-
- (* rfunc) (object, GTK_VALUE_OBJECT (args[0]), func_data);
-}
-
-static void
-gtk_container_marshal_signal_2 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkContainerSignal2 rfunc;
-
- rfunc = (GtkContainerSignal2) func;
-
- (* rfunc) (object,
- GTK_VALUE_C_CALLBACK(args[0]).func,
- GTK_VALUE_C_CALLBACK(args[0]).func_data,
- func_data);
-}
-
-static void
-gtk_container_marshal_signal_3 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkContainerSignal3 rfunc;
- gint *return_val;
-
- rfunc = (GtkContainerSignal3) func;
- return_val = GTK_RETLOC_ENUM (args[1]);
-
- *return_val = (* rfunc) (object, GTK_VALUE_ENUM(args[0]), func_data);
-}
-
static gint
gtk_container_real_focus (GtkContainer *container,
GtkDirectionType direction)
diff --git a/gtk/gtkctree.c b/gtk/gtkctree.c
index 759f845004..f9c9dbb41c 100644
--- a/gtk/gtkctree.c
+++ b/gtk/gtkctree.c
@@ -168,22 +168,6 @@ static void gtk_ctree_unlink (GtkCTree *ctree,
gboolean update_focus_row);
static GList * gtk_ctree_last_visible (GtkCTree *ctree,
GList *node);
-static void gtk_ctree_marshal_signal_1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-static void gtk_ctree_marshal_signal_2 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-static void gtk_ctree_marshal_signal_3 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-static void gtk_ctree_marshal_signal_4 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
static gboolean ctree_is_hot_spot (GtkCTree *ctree,
GList *node,
gint row,
@@ -275,60 +259,6 @@ gtk_ctree_get_type (void)
}
static void
-gtk_ctree_marshal_signal_1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkCTreeSignal1 rfunc;
-
- rfunc = (GtkCTreeSignal1) func;
-
- (*rfunc) (object, GTK_VALUE_POINTER (args[0]), GTK_VALUE_INT (args[1]),
- func_data);
-}
-
-static void
-gtk_ctree_marshal_signal_2 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkCTreeSignal2 rfunc;
-
- rfunc = (GtkCTreeSignal2) func;
-
- (*rfunc) (object, GTK_VALUE_POINTER (args[0]), GTK_VALUE_POINTER (args[1]),
- GTK_VALUE_POINTER (args[2]), func_data);
-}
-
-static void
-gtk_ctree_marshal_signal_3 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkCTreeSignal3 rfunc;
-
- rfunc = (GtkCTreeSignal3) func;
-
- (*rfunc) (object, GTK_VALUE_POINTER (args[0]), func_data);
-}
-
-static void
-gtk_ctree_marshal_signal_4 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkCTreeSignal4 rfunc;
-
- rfunc = (GtkCTreeSignal4) func;
-
- (*rfunc) (object, GTK_VALUE_ENUM (args[0]), func_data);
-}
-
-static void
gtk_ctree_class_init (GtkCTreeClass *klass)
{
GtkObjectClass *object_class;
@@ -348,35 +278,35 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_select_row),
- gtk_ctree_marshal_signal_1,
+ gtk_marshal_NONE__POINTER_INT,
GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_INT);
ctree_signals[TREE_UNSELECT_ROW] =
gtk_signal_new ("tree_unselect_row",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_unselect_row),
- gtk_ctree_marshal_signal_1,
+ gtk_marshal_NONE__POINTER_INT,
GTK_TYPE_NONE, 2, GTK_TYPE_POINTER, GTK_TYPE_INT);
ctree_signals[TREE_EXPAND] =
gtk_signal_new ("tree_expand",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_expand),
- gtk_ctree_marshal_signal_3,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
ctree_signals[TREE_COLLAPSE] =
gtk_signal_new ("tree_collapse",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_collapse),
- gtk_ctree_marshal_signal_3,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1, GTK_TYPE_POINTER);
ctree_signals[TREE_MOVE] =
gtk_signal_new ("tree_move",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkCTreeClass, tree_move),
- gtk_ctree_marshal_signal_2,
+ gtk_marshal_NONE__POINTER_POINTER_POINTER,
GTK_TYPE_NONE, 3, GTK_TYPE_POINTER, GTK_TYPE_POINTER,
GTK_TYPE_POINTER);
ctree_signals[CHANGE_FOCUS_ROW_EXPANSION] =
@@ -385,7 +315,7 @@ gtk_ctree_class_init (GtkCTreeClass *klass)
object_class->type,
GTK_SIGNAL_OFFSET (GtkCTreeClass,
change_focus_row_expansion),
- gtk_ctree_marshal_signal_4,
+ gtk_marshal_NONE__ENUM,
GTK_TYPE_NONE, 1, GTK_TYPE_ENUM);
gtk_object_class_add_signals (object_class, ctree_signals, LAST_SIGNAL);
diff --git a/gtk/gtkcurve.c b/gtk/gtkcurve.c
index 404e61e67b..b867e6b7a1 100644
--- a/gtk/gtkcurve.c
+++ b/gtk/gtkcurve.c
@@ -87,7 +87,7 @@ gtk_curve_class_init (GtkCurveClass *class)
curve_type_changed_signal =
gtk_signal_new ("curve_type_changed", GTK_RUN_FIRST, object_class->type,
GTK_SIGNAL_OFFSET (GtkCurveClass, curve_type_changed),
- gtk_signal_default_marshaller, GTK_TYPE_NONE, 0);
+ gtk_marshal_NONE__NONE, GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, &curve_type_changed_signal, 1);
object_class->finalize = gtk_curve_finalize;
diff --git a/gtk/gtkdata.c b/gtk/gtkdata.c
index e92d0e9e83..c268abeb60 100644
--- a/gtk/gtkdata.c
+++ b/gtk/gtkdata.c
@@ -69,7 +69,7 @@ gtk_data_class_init (GtkDataClass *class)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkDataClass, disconnect),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, data_signals, LAST_SIGNAL);
diff --git a/gtk/gtkeditable.c b/gtk/gtkeditable.c
index cdd6d88f17..b7e8c18ef4 100644
--- a/gtk/gtkeditable.c
+++ b/gtk/gtkeditable.c
@@ -88,41 +88,12 @@ static void gtk_editable_real_paste_clipboard (GtkEditable *editable);
static void gtk_editable_real_set_editable (GtkEditable *editable,
gboolean is_editable);
-
-static void gtk_editable_marshal_signal_1 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-static void gtk_editable_marshal_signal_2 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-static void gtk_editable_marshal_signal_3 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
-
static GtkWidgetClass *parent_class = NULL;
static guint editable_signals[LAST_SIGNAL] = { 0 };
static GdkAtom ctext_atom = GDK_NONE;
static GdkAtom text_atom = GDK_NONE;
static GdkAtom clipboard_atom = GDK_NONE;
-typedef void (*GtkEditableSignal1) (GtkObject * object,
- gchar *arg1,
- gint arg2,
- gint *arg3,
- gpointer data);
-
-typedef void (*GtkEditableSignal2) (GtkObject * object,
- gint arg1,
- gint arg2,
- gpointer data);
-
-typedef void (*GtkEditableSignal3) (GtkObject * object,
- gint arg1,
- gpointer data);
-
GtkType
gtk_editable_get_type (void)
{
@@ -164,7 +135,7 @@ gtk_editable_class_init (GtkEditableClass *class)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, changed),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
editable_signals[INSERT_TEXT] =
@@ -172,7 +143,7 @@ gtk_editable_class_init (GtkEditableClass *class)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, insert_text),
- gtk_editable_marshal_signal_1,
+ gtk_marshal_NONE__POINTER_INT_POINTER,
GTK_TYPE_NONE,
3,
GTK_TYPE_STRING,
@@ -184,7 +155,7 @@ gtk_editable_class_init (GtkEditableClass *class)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, delete_text),
- gtk_editable_marshal_signal_2,
+ gtk_marshal_NONE__INT_INT,
GTK_TYPE_NONE,
2,
GTK_TYPE_INT,
@@ -195,7 +166,7 @@ gtk_editable_class_init (GtkEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, activate),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
editable_signals[SET_EDITABLE] =
@@ -203,7 +174,7 @@ gtk_editable_class_init (GtkEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, set_editable),
- gtk_editable_marshal_signal_3,
+ gtk_marshal_NONE__BOOL,
GTK_TYPE_NONE, 1,
GTK_TYPE_BOOL);
@@ -212,7 +183,7 @@ gtk_editable_class_init (GtkEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, move_cursor),
- gtk_editable_marshal_signal_2,
+ gtk_marshal_NONE__INT_INT,
GTK_TYPE_NONE, 2,
GTK_TYPE_INT,
GTK_TYPE_INT);
@@ -222,7 +193,7 @@ gtk_editable_class_init (GtkEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, move_word),
- gtk_editable_marshal_signal_3,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
@@ -231,7 +202,7 @@ gtk_editable_class_init (GtkEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, move_page),
- gtk_editable_marshal_signal_2,
+ gtk_marshal_NONE__INT_INT,
GTK_TYPE_NONE, 2,
GTK_TYPE_INT,
GTK_TYPE_INT);
@@ -241,7 +212,7 @@ gtk_editable_class_init (GtkEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, move_to_row),
- gtk_editable_marshal_signal_3,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
@@ -250,7 +221,7 @@ gtk_editable_class_init (GtkEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, move_to_column),
- gtk_editable_marshal_signal_3,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
@@ -259,7 +230,7 @@ gtk_editable_class_init (GtkEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, kill_char),
- gtk_editable_marshal_signal_3,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
@@ -268,7 +239,7 @@ gtk_editable_class_init (GtkEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, kill_word),
- gtk_editable_marshal_signal_3,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
@@ -277,7 +248,7 @@ gtk_editable_class_init (GtkEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, kill_line),
- gtk_editable_marshal_signal_3,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
@@ -286,7 +257,7 @@ gtk_editable_class_init (GtkEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, cut_clipboard),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
editable_signals[COPY_CLIPBOARD] =
@@ -294,7 +265,7 @@ gtk_editable_class_init (GtkEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, copy_clipboard),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
editable_signals[PASTE_CLIPBOARD] =
@@ -302,7 +273,7 @@ gtk_editable_class_init (GtkEditableClass *class)
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkEditableClass, paste_clipboard),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, editable_signals, LAST_SIGNAL);
@@ -974,48 +945,3 @@ gtk_editable_changed (GtkEditable *editable)
gtk_signal_emit (GTK_OBJECT (editable), editable_signals[CHANGED]);
}
-
-static void
-gtk_editable_marshal_signal_1 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkEditableSignal1 rfunc;
-
- rfunc = (GtkEditableSignal1) func;
-
- (*rfunc) (object, GTK_VALUE_STRING (args[0]),
- GTK_VALUE_INT (args[1]),
- GTK_VALUE_POINTER (args[2]),
- func_data);
-}
-
-static void
-gtk_editable_marshal_signal_2 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkEditableSignal2 rfunc;
-
- rfunc = (GtkEditableSignal2) func;
-
- (*rfunc) (object, GTK_VALUE_INT (args[0]),
- GTK_VALUE_INT (args[1]),
- func_data);
-}
-
-static void
-gtk_editable_marshal_signal_3 (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
-{
- GtkEditableSignal3 rfunc;
-
- rfunc = (GtkEditableSignal3) func;
-
- (*rfunc) (object, GTK_VALUE_INT (args[0]),
- func_data);
-}
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);
@@ -105,19 +101,6 @@ gtk_handle_box_get_type (void)
}
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)
{
GtkObjectClass *object_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);
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,
diff --git a/gtk/gtkitem.c b/gtk/gtkitem.c
index 8d04731466..869bc574f8 100644
--- a/gtk/gtkitem.c
+++ b/gtk/gtkitem.c
@@ -81,21 +81,21 @@ gtk_item_class_init (GtkItemClass *class)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkItemClass, select),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
item_signals[DESELECT] =
gtk_signal_new ("deselect",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkItemClass, deselect),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
item_signals[TOGGLE] =
gtk_signal_new ("toggle",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkItemClass, toggle),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, item_signals, LAST_SIGNAL);
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);
-}
diff --git a/gtk/gtkmarshal.c b/gtk/gtkmarshal.c
index 6b4698fa58..9ab4727834 100644
--- a/gtk/gtkmarshal.c
+++ b/gtk/gtkmarshal.c
@@ -1,21 +1,97 @@
#include "gtkmarshal.h"
-typedef void (*GtkSignal_NONE__POINTER_POINTER) (GtkObject * object,
- gpointer arg1,
- gpointer arg2,
- gpointer user_data);
+typedef gboolean (*GtkSignal_BOOL__POINTER) (GtkObject * object,
+ gpointer arg1,
+ gpointer user_data);
void
-gtk_marshal_NONE__POINTER_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
+gtk_marshal_BOOL__POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
{
- GtkSignal_NONE__POINTER_POINTER rfunc;
- rfunc = (GtkSignal_NONE__POINTER_POINTER) func;
- (*rfunc) (object,
- GTK_VALUE_POINTER (args[0]),
- GTK_VALUE_POINTER (args[1]),
- func_data);
+ GtkSignal_BOOL__POINTER rfunc;
+ gboolean *return_val;
+ return_val = GTK_RETLOC_BOOL (args[1]);
+ rfunc = (GtkSignal_BOOL__POINTER) func;
+ *return_val = (*rfunc) (object,
+ GTK_VALUE_POINTER (args[0]),
+ func_data);
+}
+
+typedef gboolean (*GtkSignal_BOOL__NONE) (GtkObject * object,
+ gpointer user_data);
+void
+gtk_marshal_BOOL__NONE (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_BOOL__NONE rfunc;
+ gboolean *return_val;
+ return_val = GTK_RETLOC_BOOL (args[1]);
+ rfunc = (GtkSignal_BOOL__NONE) func;
+ *return_val = (*rfunc) (object,
+ func_data);
+}
+
+typedef gboolean (*GtkSignal_BOOL__POINTER_POINTER_INT_INT) (GtkObject * object,
+ gpointer arg1,
+ gpointer arg2,
+ gint arg3,
+ gint arg4,
+ gpointer user_data);
+void
+gtk_marshal_BOOL__POINTER_POINTER_INT_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_BOOL__POINTER_POINTER_INT_INT rfunc;
+ gboolean *return_val;
+ return_val = GTK_RETLOC_BOOL (args[4]);
+ rfunc = (GtkSignal_BOOL__POINTER_POINTER_INT_INT) func;
+ *return_val = (*rfunc) (object,
+ GTK_VALUE_POINTER (args[0]),
+ GTK_VALUE_POINTER (args[1]),
+ GTK_VALUE_INT (args[2]),
+ GTK_VALUE_INT (args[3]),
+ func_data);
+}
+
+typedef gint (*GtkSignal_INT__INT) (GtkObject * object,
+ gint arg1,
+ gpointer user_data);
+void
+gtk_marshal_INT__INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_INT__INT rfunc;
+ gint *return_val;
+ return_val = GTK_RETLOC_INT (args[1]);
+ rfunc = (GtkSignal_INT__INT) func;
+ *return_val = (*rfunc) (object,
+ GTK_VALUE_INT (args[0]),
+ func_data);
+}
+
+typedef gint (*GtkSignal_INT__POINTER) (GtkObject * object,
+ gpointer arg1,
+ gpointer user_data);
+void
+gtk_marshal_INT__POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_INT__POINTER rfunc;
+ gint *return_val;
+ return_val = GTK_RETLOC_INT (args[1]);
+ rfunc = (GtkSignal_INT__POINTER) func;
+ *return_val = (*rfunc) (object,
+ GTK_VALUE_POINTER (args[0]),
+ func_data);
}
typedef gint (*GtkSignal_INT__POINTER_CHAR_CHAR) (GtkObject * object,
@@ -56,36 +132,312 @@ gtk_marshal_NONE__POINTER (GtkObject * object,
func_data);
}
-typedef gint (*GtkSignal_INT__POINTER) (GtkObject * object,
- gpointer arg1,
- gpointer user_data);
+typedef void (*GtkSignal_NONE__POINTER_POINTER) (GtkObject * object,
+ gpointer arg1,
+ gpointer arg2,
+ gpointer user_data);
void
-gtk_marshal_INT__POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args)
+gtk_marshal_NONE__POINTER_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
{
- GtkSignal_INT__POINTER rfunc;
- gint *return_val;
- return_val = GTK_RETLOC_INT (args[1]);
- rfunc = (GtkSignal_INT__POINTER) func;
- *return_val = (*rfunc) (object,
- GTK_VALUE_POINTER (args[0]),
- func_data);
+ GtkSignal_NONE__POINTER_POINTER rfunc;
+ rfunc = (GtkSignal_NONE__POINTER_POINTER) func;
+ (*rfunc) (object,
+ GTK_VALUE_POINTER (args[0]),
+ GTK_VALUE_POINTER (args[1]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__INT) (GtkObject * object,
+ gint arg1,
+ gpointer user_data);
+void
+gtk_marshal_NONE__INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__INT rfunc;
+ rfunc = (GtkSignal_NONE__INT) func;
+ (*rfunc) (object,
+ GTK_VALUE_INT (args[0]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__INT_FLOAT) (GtkObject * object,
+ gint arg1,
+ gfloat arg2,
+ gpointer user_data);
+void
+gtk_marshal_NONE__INT_FLOAT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__INT_FLOAT rfunc;
+ rfunc = (GtkSignal_NONE__INT_FLOAT) func;
+ (*rfunc) (object,
+ GTK_VALUE_INT (args[0]),
+ GTK_VALUE_FLOAT (args[1]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__INT_FLOAT_BOOL) (GtkObject * object,
+ gint arg1,
+ gfloat arg2,
+ gboolean arg3,
+ gpointer user_data);
+void
+gtk_marshal_NONE__INT_FLOAT_BOOL (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__INT_FLOAT_BOOL rfunc;
+ rfunc = (GtkSignal_NONE__INT_FLOAT_BOOL) func;
+ (*rfunc) (object,
+ GTK_VALUE_INT (args[0]),
+ GTK_VALUE_FLOAT (args[1]),
+ GTK_VALUE_BOOL (args[2]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__INT_INT) (GtkObject * object,
+ gint arg1,
+ gint arg2,
+ gpointer user_data);
+void
+gtk_marshal_NONE__INT_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__INT_INT rfunc;
+ rfunc = (GtkSignal_NONE__INT_INT) func;
+ (*rfunc) (object,
+ GTK_VALUE_INT (args[0]),
+ GTK_VALUE_INT (args[1]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__INT_INT_POINTER) (GtkObject * object,
+ gint arg1,
+ gint arg2,
+ gpointer arg3,
+ gpointer user_data);
+void
+gtk_marshal_NONE__INT_INT_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__INT_INT_POINTER rfunc;
+ rfunc = (GtkSignal_NONE__INT_INT_POINTER) func;
+ (*rfunc) (object,
+ GTK_VALUE_INT (args[0]),
+ GTK_VALUE_INT (args[1]),
+ GTK_VALUE_POINTER (args[2]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__NONE) (GtkObject * object,
+ gpointer user_data);
+void
+gtk_marshal_NONE__NONE (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__NONE rfunc;
+ rfunc = (GtkSignal_NONE__NONE) func;
+ (*rfunc) (object,
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__POINTER_INT) (GtkObject * object,
+ gpointer arg1,
+ gint arg2,
+ gpointer user_data);
+void
+gtk_marshal_NONE__POINTER_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__POINTER_INT rfunc;
+ rfunc = (GtkSignal_NONE__POINTER_INT) func;
+ (*rfunc) (object,
+ GTK_VALUE_POINTER (args[0]),
+ GTK_VALUE_INT (args[1]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__POINTER_POINTER_POINTER) (GtkObject * object,
+ gpointer arg1,
+ gpointer arg2,
+ gpointer arg3,
+ gpointer user_data);
+void
+gtk_marshal_NONE__POINTER_POINTER_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__POINTER_POINTER_POINTER rfunc;
+ rfunc = (GtkSignal_NONE__POINTER_POINTER_POINTER) func;
+ (*rfunc) (object,
+ GTK_VALUE_POINTER (args[0]),
+ GTK_VALUE_POINTER (args[1]),
+ GTK_VALUE_POINTER (args[2]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__POINTER_INT_INT) (GtkObject * object,
+ gpointer arg1,
+ gint arg2,
+ gint arg3,
+ gpointer user_data);
+void
+gtk_marshal_NONE__POINTER_INT_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__POINTER_INT_INT rfunc;
+ rfunc = (GtkSignal_NONE__POINTER_INT_INT) func;
+ (*rfunc) (object,
+ GTK_VALUE_POINTER (args[0]),
+ GTK_VALUE_INT (args[1]),
+ GTK_VALUE_INT (args[2]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__POINTER_INT_POINTER) (GtkObject * object,
+ gpointer arg1,
+ gint arg2,
+ gpointer arg3,
+ gpointer user_data);
+void
+gtk_marshal_NONE__POINTER_INT_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__POINTER_INT_POINTER rfunc;
+ rfunc = (GtkSignal_NONE__POINTER_INT_POINTER) func;
+ (*rfunc) (object,
+ GTK_VALUE_POINTER (args[0]),
+ GTK_VALUE_INT (args[1]),
+ GTK_VALUE_POINTER (args[2]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__INT_POINTER_INT_INT_INT_POINTER) (GtkObject * object,
+ gint arg1,
+ gpointer arg2,
+ gint arg3,
+ gint arg4,
+ gint arg5,
+ gpointer arg6,
+ gpointer user_data);
+void
+gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__INT_POINTER_INT_INT_INT_POINTER rfunc;
+ rfunc = (GtkSignal_NONE__INT_POINTER_INT_INT_INT_POINTER) func;
+ (*rfunc) (object,
+ GTK_VALUE_INT (args[0]),
+ GTK_VALUE_POINTER (args[1]),
+ GTK_VALUE_INT (args[2]),
+ GTK_VALUE_INT (args[3]),
+ GTK_VALUE_INT (args[4]),
+ GTK_VALUE_POINTER (args[5]),
+ func_data);
}
-typedef void (*GtkSignal_NONE__UINT) (GtkObject * object,
- guint arg1,
+typedef void (*GtkSignal_NONE__INT_POINTER_INT_INT_INT) (GtkObject * object,
+ gint arg1,
+ gpointer arg2,
+ gint arg3,
+ gint arg4,
+ gint arg5,
+ gpointer user_data);
+void
+gtk_marshal_NONE__INT_POINTER_INT_INT_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__INT_POINTER_INT_INT_INT rfunc;
+ rfunc = (GtkSignal_NONE__INT_POINTER_INT_INT_INT) func;
+ (*rfunc) (object,
+ GTK_VALUE_INT (args[0]),
+ GTK_VALUE_POINTER (args[1]),
+ GTK_VALUE_INT (args[2]),
+ GTK_VALUE_INT (args[3]),
+ GTK_VALUE_INT (args[4]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__BOOL) (GtkObject * object,
+ gboolean arg1,
gpointer user_data);
void
-gtk_marshal_NONE__UINT (GtkObject * object,
+gtk_marshal_NONE__BOOL (GtkObject * object,
GtkSignalFunc func,
gpointer func_data,
GtkArg * args)
{
- GtkSignal_NONE__UINT rfunc;
- rfunc = (GtkSignal_NONE__UINT) func;
+ GtkSignal_NONE__BOOL rfunc;
+ rfunc = (GtkSignal_NONE__BOOL) func;
(*rfunc) (object,
- GTK_VALUE_UINT (args[0]),
+ GTK_VALUE_BOOL (args[0]),
+ func_data);
+}
+
+typedef gboolean (*GtkSignal_BOOL__POINTER_POINTER_POINTER_POINTER) (GtkObject * object,
+ gpointer arg1,
+ gpointer arg2,
+ gpointer arg3,
+ gpointer arg4,
+ gpointer user_data);
+void
+gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_BOOL__POINTER_POINTER_POINTER_POINTER rfunc;
+ gboolean *return_val;
+ return_val = GTK_RETLOC_BOOL (args[4]);
+ rfunc = (GtkSignal_BOOL__POINTER_POINTER_POINTER_POINTER) func;
+ *return_val = (*rfunc) (object,
+ GTK_VALUE_POINTER (args[0]),
+ GTK_VALUE_POINTER (args[1]),
+ GTK_VALUE_POINTER (args[2]),
+ GTK_VALUE_POINTER (args[3]),
+ func_data);
+}
+
+typedef void (*GtkSignal_NONE__INT_POINTER) (GtkObject * object,
+ gint arg1,
+ gpointer arg2,
+ gpointer user_data);
+void
+gtk_marshal_NONE__INT_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args)
+{
+ GtkSignal_NONE__INT_POINTER rfunc;
+ rfunc = (GtkSignal_NONE__INT_POINTER) func;
+ (*rfunc) (object,
+ GTK_VALUE_INT (args[0]),
+ GTK_VALUE_POINTER (args[1]),
func_data);
}
diff --git a/gtk/gtkmarshal.h b/gtk/gtkmarshal.h
index 62c6ec7589..d36be9f96a 100644
--- a/gtk/gtkmarshal.h
+++ b/gtk/gtkmarshal.h
@@ -1,37 +1,177 @@
#ifndef __GTKMARSHAL_H__
#define __GTKMARSHAL_H__ 1
-#include "gtktypeutils.h"
-#include "gtkobject.h"
+#include <gtk/gtktypeutils.h>
+#include <gtk/gtkobject.h>
-#define gtk_marshal_NONE__POINTER_POINTER gtk_marshal_NONE__POINTER_POINTER
-void gtk_marshal_NONE__POINTER_POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
+#ifdef __cplusplus
+extern "C"
+{
+#pragma }
+#endif /* __cplusplus */
-#define gtk_marshal_INT__POINTER_CHAR_CHAR gtk_marshal_INT__POINTER_CHAR_CHAR
-void gtk_marshal_INT__POINTER_CHAR_CHAR (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
+#define gtk_signal_default_marshaller gtk_marshal_NONE__NONE
+
+#define gtk_marshal_BOOL__GDK_EVENT gtk_marshal_BOOL__POINTER
-#define gtk_marshal_NONE__POINTER gtk_marshal_NONE__POINTER
-void gtk_marshal_NONE__POINTER (GtkObject * object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg * args);
+ void gtk_marshal_BOOL__POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
-#define gtk_marshal_INT__POINTER gtk_marshal_INT__POINTER
-void gtk_marshal_INT__POINTER (GtkObject * object,
+ void gtk_marshal_BOOL__NONE (GtkObject * object,
GtkSignalFunc func,
gpointer func_data,
GtkArg * args);
-void gtk_marshal_NONE__UINT (GtkObject * object,
+ void gtk_marshal_BOOL__POINTER_POINTER_INT_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_ENUM__ENUM gtk_marshal_INT__INT
+
+ void gtk_marshal_INT__INT (GtkObject * object,
GtkSignalFunc func,
gpointer func_data,
GtkArg * args);
+ void gtk_marshal_INT__POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+ void gtk_marshal_INT__POINTER_CHAR_CHAR (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
#define gtk_marshal_NONE__BOXED gtk_marshal_NONE__POINTER
-#endif
+
+ void gtk_marshal_NONE__POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__C_CALLBACK_C_CALLBACK gtk_marshal_NONE__POINTER_POINTER
+
+ void gtk_marshal_NONE__POINTER_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__ENUM gtk_marshal_NONE__INT
+
+ void gtk_marshal_NONE__INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__ENUM_FLOAT gtk_marshal_NONE__INT_FLOAT
+
+ void gtk_marshal_NONE__INT_FLOAT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__ENUM_FLOAT_BOOL gtk_marshal_NONE__INT_FLOAT_BOOL
+
+ void gtk_marshal_NONE__INT_FLOAT_BOOL (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+ void gtk_marshal_NONE__INT_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+ void gtk_marshal_NONE__INT_INT_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+ void gtk_marshal_NONE__NONE (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__OBJECT gtk_marshal_NONE__POINTER
+
+ void gtk_marshal_NONE__POINTER_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+ void gtk_marshal_NONE__POINTER_POINTER_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__POINTER_UINT_ENUM gtk_marshal_NONE__POINTER_INT_INT
+
+ void gtk_marshal_NONE__POINTER_INT_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__STRING gtk_marshal_NONE__POINTER
+
+#define gtk_marshal_NONE__STRING_INT_POINTER gtk_marshal_NONE__POINTER_INT_POINTER
+
+ void gtk_marshal_NONE__POINTER_INT_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__STYLE gtk_marshal_NONE__POINTER
+
+#define gtk_marshal_NONE__UINT gtk_marshal_NONE__INT
+
+#define gtk_marshal_NONE__UINT_POINTER_UINT_ENUM_ENUM_POINTER gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER
+
+ void gtk_marshal_NONE__INT_POINTER_INT_INT_INT_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__POINTER_UINT_UINT gtk_marshal_NONE__POINTER_INT_INT
+
+#define gtk_marshal_NONE__UINT_POINTER_UINT_UINT_ENUM gtk_marshal_NONE__INT_POINTER_INT_INT_INT
+
+ void gtk_marshal_NONE__INT_POINTER_INT_INT_INT (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__C_CALLBACK gtk_marshal_NONE__POINTER
+
+ void gtk_marshal_NONE__BOOL (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__POINTER_UINT gtk_marshal_NONE__POINTER_INT
+
+#define gtk_marshal_NONE__POINTER_STRING_STRING gtk_marshal_NONE__POINTER_POINTER_POINTER
+
+#define gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER
+
+ void gtk_marshal_BOOL__POINTER_POINTER_POINTER_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+#define gtk_marshal_NONE__UINT_STRING gtk_marshal_NONE__INT_POINTER
+
+ void gtk_marshal_NONE__INT_POINTER (GtkObject * object,
+ GtkSignalFunc func,
+ gpointer func_data,
+ GtkArg * args);
+
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* __GTKMARSHAL_H__ */
diff --git a/gtk/gtkmarshal.list b/gtk/gtkmarshal.list
index bfe854a7b1..b495eab1f1 100644
--- a/gtk/gtkmarshal.list
+++ b/gtk/gtkmarshal.list
@@ -1,7 +1,35 @@
-NONE:POINTER,POINTER
+BOOL:GDK_EVENT
+BOOL:NONE
+BOOL:POINTER
+BOOL:POINTER,POINTER,INT,INT
+BOOL:POINTER,STRING,STRING,POINTER
+ENUM:ENUM
+INT:POINTER
INT:POINTER,CHAR,CHAR
+NONE:BOOL
+NONE:BOXED
+NONE:C_CALLBACK
+NONE:C_CALLBACK,C_CALLBACK
+NONE:ENUM
+NONE:ENUM,FLOAT
+NONE:ENUM,FLOAT,BOOL
+NONE:INT
+NONE:INT,INT
+NONE:INT,INT,POINTER
+NONE:NONE
+NONE:OBJECT
NONE:POINTER
-INT:POINTER
+NONE:POINTER,INT
+NONE:POINTER,POINTER
+NONE:POINTER,POINTER,POINTER
+NONE:POINTER,STRING,STRING
+NONE:POINTER,UINT
+NONE:POINTER,UINT,ENUM
+NONE:POINTER,UINT,UINT
+NONE:STRING
+NONE:STRING,INT,POINTER
+NONE:STYLE
NONE:UINT
-NONE:BOXED
-BOOL:POINTER \ No newline at end of file
+NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER
+NONE:UINT,POINTER,UINT,UINT,ENUM
+NONE:UINT,STRING
diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index bfe854a7b1..b495eab1f1 100644
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -1,7 +1,35 @@
-NONE:POINTER,POINTER
+BOOL:GDK_EVENT
+BOOL:NONE
+BOOL:POINTER
+BOOL:POINTER,POINTER,INT,INT
+BOOL:POINTER,STRING,STRING,POINTER
+ENUM:ENUM
+INT:POINTER
INT:POINTER,CHAR,CHAR
+NONE:BOOL
+NONE:BOXED
+NONE:C_CALLBACK
+NONE:C_CALLBACK,C_CALLBACK
+NONE:ENUM
+NONE:ENUM,FLOAT
+NONE:ENUM,FLOAT,BOOL
+NONE:INT
+NONE:INT,INT
+NONE:INT,INT,POINTER
+NONE:NONE
+NONE:OBJECT
NONE:POINTER
-INT:POINTER
+NONE:POINTER,INT
+NONE:POINTER,POINTER
+NONE:POINTER,POINTER,POINTER
+NONE:POINTER,STRING,STRING
+NONE:POINTER,UINT
+NONE:POINTER,UINT,ENUM
+NONE:POINTER,UINT,UINT
+NONE:STRING
+NONE:STRING,INT,POINTER
+NONE:STYLE
NONE:UINT
-NONE:BOXED
-BOOL:POINTER \ No newline at end of file
+NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER
+NONE:UINT,POINTER,UINT,UINT,ENUM
+NONE:UINT,STRING
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 50fc1d24be..e4bf0f0f96 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -107,7 +107,7 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkMenuItemClass, activate),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, menu_item_signals, LAST_SIGNAL);
diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
index bb6094cd82..d37155d5da 100644
--- a/gtk/gtkmenushell.c
+++ b/gtk/gtkmenushell.c
@@ -107,14 +107,14 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkMenuShellClass, deactivate),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
menu_shell_signals[SELECTION_DONE] =
gtk_signal_new ("selection-done",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkMenuShellClass, selection_done),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, menu_shell_signals, LAST_SIGNAL);
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index d5ae15904a..744ab3d21e 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)
diff --git a/gtk/gtkobject.c b/gtk/gtkobject.c
index 23842dee8b..4e9d6099c3 100644
--- a/gtk/gtkobject.c
+++ b/gtk/gtkobject.c
@@ -189,7 +189,7 @@ gtk_object_class_init (GtkObjectClass *class)
GTK_RUN_LAST,
class->type,
GTK_SIGNAL_OFFSET (GtkObjectClass, destroy),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (class, object_signals, LAST_SIGNAL);
diff --git a/gtk/gtksignal.c b/gtk/gtksignal.c
index 8fb7170645..35b50558d5 100644
--- a/gtk/gtksignal.c
+++ b/gtk/gtksignal.c
@@ -1159,6 +1159,16 @@ gtk_signal_handlers_destroy (GtkObject *object)
}
}
+/* Work around the
+ '#define gtk_signal_default_marshaller gtk_marshal_NONE__NONE'
+ in gtkmarshal.h
+
+ This is here to provide some sort of basic backwards binary
+ compatibility. It is not listed in gtksignal.h in order to make
+ sure people recompiling things see warnings and make changes as needed.
+ -ECL
+*/
+#undef gtk_signal_default_marshaller
void
gtk_signal_default_marshaller (GtkObject *object,
GtkSignalFunc func,
@@ -1171,6 +1181,7 @@ gtk_signal_default_marshaller (GtkObject *object,
(* rfunc) (object, func_data);
}
+#define gtk_signal_default_marshaller gtk_marshal_NONE__NONE
void
gtk_signal_set_funcs (GtkSignalMarshal marshal_func,
diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
index a953acb15a..cfc3e4c45f 100644
--- a/gtk/gtkstatusbar.c
+++ b/gtk/gtkstatusbar.c
@@ -31,11 +31,6 @@ enum
SIGNAL_LAST
};
-typedef void (*SignalTextP) (GtkObject *object,
- guint context_id,
- const gchar *text,
- gpointer func_data);
-
static void gtk_statusbar_class_init (GtkStatusbarClass *class);
static void gtk_statusbar_init (GtkStatusbar *statusbar);
static void gtk_statusbar_destroy (GtkObject *object);
@@ -73,20 +68,6 @@ gtk_statusbar_get_type (void)
}
static void
-gtk_statusbar_marshal_text_p (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- SignalTextP sfunc = (SignalTextP) func;
-
- (* sfunc) (object,
- GTK_VALUE_UINT (args[0]),
- GTK_VALUE_STRING (args[1]),
- func_data);
-}
-
-static void
gtk_statusbar_class_init (GtkStatusbarClass *class)
{
GtkObjectClass *object_class;
@@ -104,7 +85,7 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkStatusbarClass, text_pushed),
- gtk_statusbar_marshal_text_p,
+ gtk_marshal_NONE__UINT_STRING,
GTK_TYPE_NONE, 2,
GTK_TYPE_UINT,
GTK_TYPE_STRING);
@@ -113,7 +94,7 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkStatusbarClass, text_popped),
- gtk_statusbar_marshal_text_p,
+ gtk_marshal_NONE__UINT_STRING,
GTK_TYPE_NONE, 2,
GTK_TYPE_UINT,
GTK_TYPE_STRING);
diff --git a/gtk/gtktipsquery.c b/gtk/gtktipsquery.c
index 803c65f73d..e54cf5a250 100644
--- a/gtk/gtktipsquery.c
+++ b/gtk/gtktipsquery.c
@@ -45,18 +45,6 @@ enum
SIGNAL_WIDGET_SELECTED,
SIGNAL_LAST
};
-typedef void (*SignalWidgetEntered) (GtkObject *object,
- GtkWidget *widget,
- const gchar *tip_text,
- const gchar *tip_private,
- gpointer func_data);
-typedef gint (*SignalWidgetSelected) (GtkObject *object,
- GtkWidget *widget,
- const gchar *tip_text,
- const gchar *tip_private,
- GdkEventButton *event,
- gpointer func_data);
-
/* --- prototypes --- */
static void gtk_tips_query_class_init (GtkTipsQueryClass *class);
@@ -110,40 +98,6 @@ gtk_tips_query_get_type (void)
}
static void
-gtk_tips_query_marshal_widget_entered (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- SignalWidgetEntered sfunc = (SignalWidgetEntered) func;
-
- (* sfunc) (object,
- (GtkWidget*) GTK_VALUE_OBJECT (args[0]),
- GTK_VALUE_STRING (args[1]),
- GTK_VALUE_STRING (args[2]),
- func_data);
-}
-
-static void
-gtk_tips_query_marshal_widget_selected (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- gint *return_val;
-
- SignalWidgetSelected sfunc = (SignalWidgetSelected) func;
- return_val = GTK_RETLOC_BOOL (args[4]);
-
- *return_val = (* sfunc) (object,
- (GtkWidget*) GTK_VALUE_OBJECT (args[0]),
- GTK_VALUE_STRING (args[1]),
- GTK_VALUE_STRING (args[2]),
- GTK_VALUE_BOXED (args[3]),
- func_data);
-}
-
-static void
gtk_tips_query_class_init (GtkTipsQueryClass *class)
{
GtkObjectClass *object_class;
@@ -164,21 +118,21 @@ gtk_tips_query_class_init (GtkTipsQueryClass *class)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTipsQueryClass, start_query),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
tips_query_signals[SIGNAL_STOP_QUERY] =
gtk_signal_new ("stop_query",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTipsQueryClass, stop_query),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
tips_query_signals[SIGNAL_WIDGET_ENTERED] =
gtk_signal_new ("widget_entered",
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTipsQueryClass, widget_entered),
- gtk_tips_query_marshal_widget_entered,
+ gtk_marshal_NONE__POINTER_STRING_STRING,
GTK_TYPE_NONE, 3,
GTK_TYPE_WIDGET,
GTK_TYPE_STRING,
@@ -188,7 +142,7 @@ gtk_tips_query_class_init (GtkTipsQueryClass *class)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTipsQueryClass, widget_selected),
- gtk_tips_query_marshal_widget_selected,
+ gtk_marshal_BOOL__POINTER_STRING_STRING_POINTER,
GTK_TYPE_BOOL, 4,
GTK_TYPE_WIDGET,
GTK_TYPE_STRING,
diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index ef8bb82991..2c5b67eafc 100644
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -103,7 +103,7 @@ gtk_toggle_button_class_init (GtkToggleButtonClass *class)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkToggleButtonClass, toggled),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, toggle_button_signals, LAST_SIGNAL);
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 6bb07e1fe3..c38ca05fea 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -35,16 +35,6 @@ enum {
LAST_SIGNAL
};
-typedef void (*GtkToolbarSignal1) (GtkObject *object,
- gint arg1,
- gpointer data);
-
-static void gtk_toolbar_marshal_signal_1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-
-
static void gtk_toolbar_class_init (GtkToolbarClass *class);
static void gtk_toolbar_init (GtkToolbar *toolbar);
static void gtk_toolbar_destroy (GtkObject *object);
@@ -119,7 +109,7 @@ gtk_toolbar_class_init (GtkToolbarClass *class)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkToolbarClass, orientation_changed),
- gtk_toolbar_marshal_signal_1,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
toolbar_signals[STYLE_CHANGED] =
@@ -127,7 +117,7 @@ gtk_toolbar_class_init (GtkToolbarClass *class)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkToolbarClass, style_changed),
- gtk_toolbar_marshal_signal_1,
+ gtk_marshal_NONE__INT,
GTK_TYPE_NONE, 1,
GTK_TYPE_INT);
@@ -921,19 +911,6 @@ gtk_toolbar_get_button_relief (GtkToolbar *toolbar)
}
static void
-gtk_toolbar_marshal_signal_1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkToolbarSignal1 rfunc;
-
- rfunc = (GtkToolbarSignal1) func;
-
- (*rfunc) (object, GTK_VALUE_ENUM (args[0]), func_data);
-}
-
-static void
gtk_real_toolbar_orientation_changed (GtkToolbar *toolbar,
GtkOrientation orientation)
{
diff --git a/gtk/gtktree.c b/gtk/gtktree.c
index de464300ae..ecaf7f2d35 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)
diff --git a/gtk/gtktreeitem.c b/gtk/gtktreeitem.c
index 2f18a295df..137ff4474b 100644
--- a/gtk/gtktreeitem.c
+++ b/gtk/gtktreeitem.c
@@ -49,10 +49,6 @@ struct _GtkTreePixmaps {
static GList *pixmaps = NULL;
-typedef void (*GtkTreeItemSignal) (GtkObject *object,
- gpointer arg1,
- gpointer data);
-
static void gtk_tree_item_class_init (GtkTreeItemClass *klass);
static void gtk_tree_item_init (GtkTreeItem *tree_item);
static void gtk_tree_item_realize (GtkWidget *widget);
@@ -136,14 +132,14 @@ gtk_tree_item_class_init (GtkTreeItemClass *class)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTreeItemClass, expand),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
tree_item_signals[COLLAPSE_TREE] =
gtk_signal_new ("collapse",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkTreeItemClass, collapse),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
gtk_object_class_add_signals (object_class, tree_item_signals, LAST_SIGNAL);
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index d19896353c..63c897c9e5 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -108,31 +108,6 @@ enum {
ARG_EXTENSION_EVENTS
};
-
-typedef void (*GtkWidgetSignal1) (GtkObject *object,
- gpointer arg1,
- gpointer data);
-typedef gint (*GtkWidgetSignal2) (GtkObject *object,
- gpointer arg1,
- gchar arg2,
- gchar arg3,
- gpointer data);
-typedef void (*GtkWidgetSignal3) (GtkObject *object,
- gpointer arg1,
- gpointer data);
-typedef gint (*GtkWidgetSignal4) (GtkObject *object,
- gpointer arg1,
- gpointer data);
-typedef void (*GtkWidgetSignal5) (GtkObject *object,
- guint arg1,
- gpointer data);
-typedef void (*GtkWidgetSignal6) (GtkObject *object,
- GtkObject *arg1,
- gpointer data);
-typedef void (*GtkWidgetSignal7) (GtkObject *object,
- gpointer arg1,
- gpointer data);
-
typedef struct _GtkStateData GtkStateData;
struct _GtkStateData
@@ -142,28 +117,6 @@ struct _GtkStateData
guint parent_sensitive : 1;
};
-
-static void gtk_widget_marshal_signal_1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-static void gtk_widget_marshal_signal_4 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-static void gtk_widget_marshal_signal_5 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-static void gtk_widget_marshal_signal_6 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-static void gtk_widget_marshal_signal_7 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
-
static void gtk_widget_class_init (GtkWidgetClass *klass);
static void gtk_widget_init (GtkWidget *widget);
static void gtk_widget_set_arg (GtkObject *object,
@@ -322,49 +275,49 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, show),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
widget_signals[HIDE] =
gtk_signal_new ("hide",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, hide),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
widget_signals[MAP] =
gtk_signal_new ("map",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, map),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
widget_signals[UNMAP] =
gtk_signal_new ("unmap",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, unmap),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
widget_signals[REALIZE] =
gtk_signal_new ("realize",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, realize),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
widget_signals[UNREALIZE] =
gtk_signal_new ("unrealize",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, unrealize),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
widget_signals[DRAW] =
gtk_signal_new ("draw",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, draw),
- gtk_widget_marshal_signal_1,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_POINTER);
widget_signals[DRAW_FOCUS] =
@@ -372,21 +325,21 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, draw_focus),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
widget_signals[DRAW_DEFAULT] =
gtk_signal_new ("draw_default",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, draw_default),
- gtk_signal_default_marshaller,
+ gtk_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
widget_signals[SIZE_REQUEST] =
gtk_signal_new ("size_request",
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, size_request),
- gtk_widget_marshal_signal_1,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_POINTER);
widget_signals[SIZE_ALLOCATE] =
@@ -394,7 +347,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, size_allocate),
- gtk_widget_marshal_signal_1,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_POINTER);
widget_signals[STATE_CHANGED] =
@@ -402,7 +355,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, state_changed),
- gtk_widget_marshal_signal_5,
+ gtk_marshal_NONE__UINT,
GTK_TYPE_NONE, 1,
GTK_TYPE_STATE_TYPE);
widget_signals[PARENT_SET] =
@@ -410,7 +363,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, parent_set),
- gtk_widget_marshal_signal_6,
+ gtk_marshal_NONE__OBJECT,
GTK_TYPE_NONE, 1,
GTK_TYPE_OBJECT);
widget_signals[STYLE_SET] =
@@ -418,7 +371,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_FIRST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, style_set),
- gtk_widget_marshal_signal_7,
+ gtk_marshal_NONE__STYLE,
GTK_TYPE_NONE, 1,
GTK_TYPE_STYLE);
widget_signals[ADD_ACCELERATOR] =
@@ -432,7 +385,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[BUTTON_PRESS_EVENT] =
@@ -440,7 +393,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, button_press_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[BUTTON_RELEASE_EVENT] =
@@ -448,7 +401,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, button_release_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[MOTION_NOTIFY_EVENT] =
@@ -456,7 +409,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, motion_notify_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[DELETE_EVENT] =
@@ -464,7 +417,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, delete_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[DESTROY_EVENT] =
@@ -472,7 +425,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, destroy_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[EXPOSE_EVENT] =
@@ -480,7 +433,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, expose_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[KEY_PRESS_EVENT] =
@@ -488,7 +441,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, key_press_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[KEY_RELEASE_EVENT] =
@@ -496,7 +449,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, key_release_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[ENTER_NOTIFY_EVENT] =
@@ -504,7 +457,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, enter_notify_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[LEAVE_NOTIFY_EVENT] =
@@ -512,7 +465,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, leave_notify_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[CONFIGURE_EVENT] =
@@ -520,7 +473,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, configure_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[FOCUS_IN_EVENT] =
@@ -528,7 +481,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, focus_in_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[FOCUS_OUT_EVENT] =
@@ -536,7 +489,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, focus_out_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[MAP_EVENT] =
@@ -544,7 +497,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, map_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[UNMAP_EVENT] =
@@ -552,7 +505,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, unmap_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[PROPERTY_NOTIFY_EVENT] =
@@ -560,7 +513,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, property_notify_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[SELECTION_CLEAR_EVENT] =
@@ -568,7 +521,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_clear_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[SELECTION_REQUEST_EVENT] =
@@ -576,7 +529,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_request_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[SELECTION_NOTIFY_EVENT] =
@@ -584,7 +537,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_notify_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[SELECTION_RECEIVED] =
@@ -592,7 +545,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, selection_received),
- gtk_widget_marshal_signal_1,
+ gtk_marshal_NONE__ENUM,
GTK_TYPE_NONE, 1,
GTK_TYPE_SELECTION_DATA);
widget_signals[PROXIMITY_IN_EVENT] =
@@ -600,7 +553,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, proximity_in_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[PROXIMITY_OUT_EVENT] =
@@ -608,7 +561,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, proximity_out_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[DRAG_BEGIN_EVENT] =
@@ -616,7 +569,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_begin_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[DRAG_REQUEST_EVENT] =
@@ -624,7 +577,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_request_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[DRAG_END_EVENT] =
@@ -632,7 +585,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, drag_end_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[DROP_ENTER_EVENT] =
@@ -640,7 +593,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, drop_enter_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[DROP_LEAVE_EVENT] =
@@ -648,7 +601,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, drop_leave_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[DROP_DATA_AVAILABLE_EVENT] =
@@ -657,7 +610,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass,
drop_data_available_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[VISIBILITY_NOTIFY_EVENT] =
@@ -665,7 +618,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, visibility_notify_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[CLIENT_EVENT] =
@@ -673,7 +626,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, client_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[NO_EXPOSE_EVENT] =
@@ -681,7 +634,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, no_expose_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[OTHER_EVENT] =
@@ -689,7 +642,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, other_event),
- gtk_widget_marshal_signal_4,
+ gtk_marshal_BOOL__GDK_EVENT,
GTK_TYPE_BOOL, 1,
GTK_TYPE_GDK_EVENT);
widget_signals[DEBUG_MSG] =
@@ -697,7 +650,7 @@ gtk_widget_class_init (GtkWidgetClass *klass)
GTK_RUN_LAST | GTK_RUN_ACTION,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWidgetClass, debug_msg),
- gtk_widget_marshal_signal_1,
+ gtk_marshal_NONE__STRING,
GTK_TYPE_NONE, 1,
GTK_TYPE_STRING);
@@ -3444,123 +3397,6 @@ gtk_widget_get_default_visual (void)
return default_visual;
}
-/*****************************************
- * gtk_widget_marshal_signal_1:
- *
- * arguments:
- *
- * results:
- *****************************************/
-
-static void
-gtk_widget_marshal_signal_1 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkWidgetSignal1 rfunc;
-
- rfunc = (GtkWidgetSignal1) func;
-
- (* rfunc) (object,
- GTK_VALUE_POINTER (args[0]),
- func_data);
-}
-
-/*****************************************
- * gtk_widget_marshal_signal_4:
- *
- * arguments:
- *
- * results:
- *****************************************/
-
-static void
-gtk_widget_marshal_signal_4 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkWidgetSignal4 rfunc;
- gint *return_val;
-
- rfunc = (GtkWidgetSignal4) func;
- return_val = GTK_RETLOC_BOOL (args[1]);
-
- *return_val = (* rfunc) (object,
- GTK_VALUE_BOXED (args[0]),
- func_data);
-}
-
-/*****************************************
- * gtk_widget_marshal_signal_5:
- *
- * arguments:
- *
- * results:
- *****************************************/
-
-static void
-gtk_widget_marshal_signal_5 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkWidgetSignal5 rfunc;
-
- rfunc = (GtkWidgetSignal5) func;
-
- (* rfunc) (object,
- GTK_VALUE_UINT (args[0]),
- func_data);
-}
-
-/*****************************************
- * gtk_widget_marshal_signal_6:
- *
- * arguments:
- *
- * results:
- *****************************************/
-
-static void
-gtk_widget_marshal_signal_6 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkWidgetSignal6 rfunc;
-
- rfunc = (GtkWidgetSignal6) func;
-
- (* rfunc) (object,
- GTK_VALUE_OBJECT (args[0]),
- func_data);
-}
-
-/*****************************************
- * gtk_widget_marshal_signal_7:
- *
- * arguments:
- *
- * results:
- *****************************************/
-
-static void
-gtk_widget_marshal_signal_7 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkWidgetSignal7 rfunc;
-
- rfunc = (GtkWidgetSignal7) func;
-
- (* rfunc) (object,
- GTK_VALUE_BOXED (args[0]),
- func_data);
-}
-
static void
gtk_widget_shutdown (GtkObject *object)
{
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index b5bb745c0f..fd5ba6c53a 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -41,20 +41,6 @@ enum {
ARG_WIN_POS
};
-typedef gint (*GtkWindowSignal1) (GtkObject *object,
- gpointer arg1,
- gpointer arg2,
- gint arg3,
- gint arg4,
- gpointer data);
-typedef void (*GtkWindowSignal2) (GtkObject *object,
- gpointer arg1,
- gpointer data);
-
-static void gtk_window_marshal_signal_2 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args);
static void gtk_window_class_init (GtkWindowClass *klass);
static void gtk_window_init (GtkWindow *window);
static void gtk_window_set_arg (GtkObject *object,
@@ -158,7 +144,7 @@ gtk_window_class_init (GtkWindowClass *klass)
GTK_RUN_LAST,
object_class->type,
GTK_SIGNAL_OFFSET (GtkWindowClass, set_focus),
- gtk_window_marshal_signal_2,
+ gtk_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_POINTER);
@@ -448,19 +434,6 @@ gtk_window_activate_default (GtkWindow *window)
}
static void
-gtk_window_marshal_signal_2 (GtkObject *object,
- GtkSignalFunc func,
- gpointer func_data,
- GtkArg *args)
-{
- GtkWindowSignal2 rfunc;
-
- rfunc = (GtkWindowSignal2) func;
-
- (* rfunc) (object, GTK_VALUE_POINTER (args[0]), func_data);
-}
-
-static void
gtk_window_shutdown (GtkObject *object)
{
GtkWindow *window;
View Lorry Controller Status