summaryrefslogtreecommitdiff
path: root/gtk/gtkmarshal.list
diff options
context:
space:
mode:
authorTim Janik <timj@gtk.org>2000-10-25 22:34:14 +0000
committerTim Janik <timj@src.gnome.org>2000-10-25 22:34:14 +0000
commitd69496c06092c0b8943b7240761ae27401c65e9f (patch)
tree600e6c46af603a9c4f8ca22954cc815466aa04c2 /gtk/gtkmarshal.list
parent7ae3922d2cdc89cba86694f7e46393a629b12b61 (diff)
downloadgtk+-d69496c06092c0b8943b7240761ae27401c65e9f.tar.gz
urg, removed implementation of gtk_marshal_VOID__INT_INT_INT_INT. if
Wed Oct 25 20:47:41 2000 Tim Janik <timj@gtk.org> * gtk/gdk-pixbuf-loader.c (gdk_pixbuf_loader_class_init): urg, removed implementation of gtk_marshal_VOID__INT_INT_INT_INT. if people do that, couldn't they at least give it a non-standard name? * gtk/gtktextlayout.c: arg! yet another implementation of gtk_marshal_VOID__INT_INT_INT_INT(), is this a conspiracy? * gtk/gtktextbuffer.c: gotcha! captured a vagabonding gtk_marshal_VOID__INT_POINTER_INT() implementation, braught it back home. now i know this _is_ a conspiracy. * gtk/gtkwidget.c (gtk_widget_class_init): marshaller fixups for ::state-changed. * gtk/gtkaccelgroup.c (gtk_accel_group_create_remove): (gtk_accel_group_create_add): marshaller signature fixups. * gtk/gtklistitem.c (gtk_list_item_class_init): signal creation fixups, pass in GTK_TYPE_SCROLL_TYPE instead of GTK_TYPE_ENUM. * gtk/gtkobject.[hc]: removed GTK_CONNECTED flag, it's not valid anymore. Tue Oct 24 23:59:21 2000 Tim Janik <timj@gtk.org> * docs/reference/Makefile.am: disabled SUBDIRS for the moment, since due to the signal system changes, it wouldn't build currently. to be fixed soon. * docs/Changes-2.0.txt: GtkSignal/GSignal updates. * gtk/gtkwidget.c: ::direction_changed takes an enum as argument, so it needs gtk_marshal_VOID__ENUM() instead of gtk_marshal_NONE__UINT(). * gdk/gdk*.c: adapted type registration functions. * gtk/gtkbindings.c: * gtk/gtkaccelgroup.c: operate on GSignalQuery, GtkSignalQuery is gone. * gtk/gtkenums.h: define GtkSignalRunType in terms of GSignalType. * gtk/gtkobject.c: (gtk_object_destroy): (gtk_object_shutdown): fixed recursion guards. basically we have to catch the case where any of GObject.shutdown() or gtk_object_destroy() is called during ::destroy, and avoid recursion there. * gtk/gtktypeutils.c: * gtk/maketypes.awk: awk-script hackup to provide gtk_type_init() with boxed_copy/boxed_free. this needs a more general solution based on a publically installed code-generator utility. * gtk/gtktypeutils.[hc]: compat aliased GTK_TYPE_BOXED to G_TYPE_BOXED, glib's gobject has support for that now. define GtkSignalMarshaller in terms of GSignalCMarshaller. Mon Oct 23 09:36:42 2000 Tim Janik <timj@gtk.org> * gtk/gtksignal.[hc]: * gtk/gtkmarshal.[hc]: * gtk/Makefile.am: generate marshallers with glib-genmarshal and don't compile gtkmarshal.c on its own anymore, just include it in gtksignal.c. removed #include <gtkmarshal.h>s all over the place, gtksignal.h takes care of that. * *.c: marshaller name fixups. * gtk/gtkmarshal.list: added a comment briefing the format. Sun Oct 22 23:14:39 2000 Tim Janik <timj@gtk.org> * gtk/gtksignal.[hc]: nuked old implementation. we mostly have compatibility macros here now. more specifically, most of the API is preserved (yes, _most_, nonwithstanding the following exceptions listed, the API is stil lHUGE ;) things that got removed completely: GtkSignalQuery, gtk_signal_query(), gtk_signal_n_emissions(), gtk_signal_n_emissions_by_name(), gtk_signal_handlers_destroy(), gtk_signal_set_funcs(), gtk_signal_handler_pending_by_id(), gtk_signal_add_emission_hook(), gtk_signal_add_emission_hook_full(), gtk_signal_remove_emission_hook(). non-functional functions variants: gtk_signal_add_emission_hook(), gtk_signal_remove_emission_hook(). the GtkCallbackMarshal argument to gtk_signal_connect_full() is not supported anymore. (gtk_signal_compat_matched): new internal function to aid implementation of the compatibility macros, it provides functionality to block/unblock/disconnect handlers based on func/data. * gtk/gtkenums.h: define GtkSignalRunType in terms of GSignalType, * *.c: adaptions to new type registration API signatures. Fri Oct 20 15:26:33 2000 Tim Janik <timj@gtk.org> * gtk/gtktypeutils.[hc]: removed G_TYPE_GTK_POINTER cludge.
Diffstat (limited to 'gtk/gtkmarshal.list')
-rw-r--r--gtk/gtkmarshal.list93
1 files changed, 81 insertions, 12 deletions
diff --git a/gtk/gtkmarshal.list b/gtk/gtkmarshal.list
index b82fff618d..1395f1da18 100644
--- a/gtk/gtkmarshal.list
+++ b/gtk/gtkmarshal.list
@@ -1,17 +1,85 @@
+# see glib-genmarshal(1) for a detailed description of the file format,
+# possible parameter types are:
+# VOID indicates no return type, or no extra
+# parameters. if VOID is used as the parameter
+# list, no additional parameters may be present.
+# BOOLEAN for boolean types (gboolean)
+# CHAR for signed char types (gchar)
+# UCHAR for unsigned char types (guchar)
+# INT for signed integer types (gint)
+# UINT for unsigned integer types (guint)
+# LONG for signed long integer types (glong)
+# ULONG for unsigned long integer types (gulong)
+# ENUM for enumeration types (gint)
+# FLAGS for flag enumeration types (guint)
+# FLOAT for single-precision float types (gfloat)
+# DOUBLE for double-precision float types (gdouble)
+# STRING for string types (gchar*)
+# BOXED for boxed (anonymous but reference counted) types (GBoxed*)
+# POINTER for anonymous pointer types (gpointer)
+# OBJECT for GObject or derived types (GObject*)
+# NONE deprecated alias for VOID
+# BOOL deprecated alias for BOOLEAN
+
+
+BOOLEAN:POINTER
+BOOLEAN:POINTER,INT,INT
+BOOLEAN:POINTER,INT,INT,UINT
+BOOLEAN:POINTER,POINTER,INT,INT
+BOOLEAN:POINTER,STRING,STRING,POINTER
+BOOLEAN:VOID
+ENUM:ENUM
+INT:OBJECT,BOXED,POINTER
+INT:POINTER
+INT:POINTER,CHAR,CHAR
+INT:VOID
+POINTER:POINTER
+POINTER:POINTER,INT
+POINTER:VOID
+VOID:BOOLEAN
+VOID:BOXED
+VOID:BOXED,UINT,FLAGS
+VOID:ENUM
+VOID:ENUM,FLOAT
+VOID:ENUM,FLOAT,BOOLEAN
+VOID:INT
+VOID:INT,INT
+VOID:INT,INT,INT
+VOID:INT,INT,INT,INT
+VOID:INT,INT,POINTER
+VOID:OBJECT
+VOID:POINTER
+VOID:POINTER,INT
+VOID:POINTER,INT,INT,POINTER,UINT,UINT
+VOID:POINTER,INT,POINTER
+VOID:POINTER,POINTER
+VOID:POINTER,POINTER,INT
+VOID:POINTER,POINTER,INT,INT
+VOID:POINTER,POINTER,POINTER
+VOID:POINTER,POINTER,UINT,UINT
+VOID:POINTER,STRING,STRING
+VOID:POINTER,UINT
+VOID:POINTER,UINT,ENUM
+VOID:POINTER,UINT,UINT
+VOID:STRING
+VOID:STRING,INT,POINTER
+VOID:STRING,POINTER
+VOID:UINT
+VOID:UINT,BOXED,UINT,FLAGS,FLAGS
+VOID:UINT,POINTER,UINT,ENUM,ENUM,POINTER
+VOID:UINT,POINTER,UINT,UINT,ENUM
+VOID:UINT,STRING
+VOID:VOID
+
+# deprecated, compatibility aliases:
BOOL:NONE
BOOL:POINTER
-BOOL:POINTER,POINTER,INT,INT
BOOL:POINTER,INT,INT
BOOL:POINTER,INT,INT,UINT
+BOOL:POINTER,POINTER,INT,INT
BOOL:POINTER,STRING,STRING,POINTER
-ENUM:ENUM
INT:NONE
-INT:POINTER
-INT:POINTER,CHAR,CHAR
-INT:OBJECT,BOXED,POINTER
POINTER:NONE
-POINTER:POINTER
-POINTER:POINTER,INT
NONE:BOOL
NONE:BOXED
NONE:ENUM
@@ -25,14 +93,16 @@ NONE:NONE
NONE:OBJECT
NONE:POINTER
NONE:POINTER,INT
+NONE:POINTER,INT,INT,POINTER,UINT,UINT
+NONE:POINTER,INT,POINTER
NONE:POINTER,POINTER
+NONE:POINTER,POINTER,INT
+NONE:POINTER,POINTER,INT,INT
NONE:POINTER,POINTER,POINTER
+NONE:POINTER,POINTER,UINT,UINT
NONE:POINTER,STRING,STRING
NONE:POINTER,UINT
NONE:POINTER,UINT,ENUM
-NONE:POINTER,POINTER,UINT,UINT
-NONE:POINTER,INT,INT,POINTER,UINT,UINT
-NONE:POINTER,UINT,UINT
NONE:POINTER,UINT,UINT
NONE:STRING
NONE:STRING,INT,POINTER
@@ -41,5 +111,4 @@ NONE:UINT
NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER
NONE:UINT,POINTER,UINT,UINT,ENUM
NONE:UINT,STRING
-NONE:POINTER,POINTER,INT,INT
-NONE:POINTER,POINTER,INT
+VOID:ENUM,FLOAT,BOOL