X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=gtk%2Fgtkmarshalers.list;h=14d05190235d8c5447b6cc5449c05a4ef88f431d;hb=5bbbc47a4c306653e8347f7afb85a940a503f755;hp=a016dffc6d8a38d11877384bd68c276b4a53c8ef;hpb=9595c55184932c11e60e840f10f63d73748e3237;p=~andy%2Fgtk

diff --git a/gtk/gtkmarshalers.list b/gtk/gtkmarshalers.list
index a016dffc6..14d051902 100644
--- a/gtk/gtkmarshalers.list
+++ b/gtk/gtkmarshalers.list
@@ -1,36 +1,122 @@
-BOOL:NONE
-BOOL:POINTER
-BOOL:POINTER,POINTER,INT,INT
-BOOL:POINTER,INT,INT
-BOOL:POINTER,INT,INT,UINT
-BOOL:POINTER,STRING,STRING,POINTER
+# 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:BOXED
+BOOLEAN:BOXED,BOXED
+BOOLEAN:ENUM
+BOOLEAN:ENUM,BOOLEAN
+BOOLEAN:ENUM,DOUBLE
+BOOLEAN:ENUM,INT
+BOOLEAN:OBJECT
+BOOLEAN:OBJECT,UINT,FLAGS
+BOOLEAN:OBJECT,INT,INT,UINT
+BOOLEAN:OBJECT,STRING,STRING,BOXED
+BOOLEAN:OBJECT,BOXED
+BOOLEAN:OBJECT,BOXED,BOXED
+BOOLEAN:OBJECT,OBJECT,OBJECT
+BOOLEAN:OBJECT,STRING,STRING
+BOOLEAN:OBJECT,ENUM
+BOOLEAN:INT
+BOOLEAN:INT,INT
+BOOLEAN:INT,INT,INT
+BOOLEAN:INT,INT,BOOLEAN,OBJECT
+BOOLEAN:UINT
+BOOLEAN:VOID
+BOOLEAN:BOOLEAN
+BOOLEAN:BOOLEAN,BOOLEAN,BOOLEAN
+BOOLEAN:STRING
 ENUM:ENUM
+ENUM:VOID
 INT:POINTER
-INT:POINTER,CHAR,CHAR
-NONE:BOOL
-NONE:BOXED
-NONE:ENUM
-NONE:ENUM,FLOAT
-NONE:ENUM,FLOAT,BOOL
-NONE:INT
-NONE:INT,INT
-NONE:INT,INT,POINTER
-NONE:NONE
-NONE:OBJECT
-NONE:POINTER
-NONE:POINTER,INT
-NONE:POINTER,POINTER
-NONE:POINTER,POINTER,POINTER
-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
-NONE:UINT
-NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER
-NONE:UINT,POINTER,UINT,UINT,ENUM
-NONE:UINT,STRING
+OBJECT:VOID
+STRING:DOUBLE
+STRING:STRING
+VOID:DOUBLE
+VOID:BOOLEAN
+VOID:BOOLEAN,BOOLEAN,BOOLEAN
+VOID:BOXED
+VOID:BOXED,BOXED
+VOID:BOXED,BOXED,POINTER
+VOID:BOXED,OBJECT
+VOID:BOXED,STRING,INT
+VOID:BOXED,UINT
+VOID:BOXED,UINT,FLAGS
+VOID:BOXED,UINT,UINT
+VOID:ENUM
+VOID:ENUM,BOOLEAN
+VOID:ENUM,ENUM
+VOID:ENUM,FLOAT
+VOID:ENUM,FLOAT,BOOLEAN
+VOID:ENUM,INT
+VOID:ENUM,INT,BOOLEAN
+VOID:ENUM,INT,INT
+VOID:ENUM,BOXED
+VOID:ENUM,STRING
+VOID:FLAGS
+VOID:INT
+VOID:INT,BOOLEAN
+VOID:INT,INT
+VOID:INT,INT,BOXED
+VOID:INT,INT,INT
+VOID:OBJECT
+VOID:OBJECT,BOOLEAN
+VOID:OBJECT,BOXED,BOXED
+VOID:OBJECT,BOXED,UINT,UINT
+VOID:OBJECT,BOXED,BOOLEAN,BOOLEAN
+VOID:OBJECT,INT
+VOID:OBJECT,INT,OBJECT
+VOID:OBJECT,INT,INT
+VOID:OBJECT,INT,INT,BOXED,UINT,UINT
+VOID:OBJECT,OBJECT
+VOID:OBJECT,POINTER
+VOID:OBJECT,STRING
+VOID:OBJECT,STRING,STRING
+VOID:OBJECT,UINT
+VOID:OBJECT,UINT,FLAGS
+VOID:OBJECT,STRING
+VOID:OBJECT,OBJECT,STRING
+VOID:OBJECT,OBJECT,OBJECT
+VOID:OBJECT,OBJECT,BOXED,STRING
+VOID:POINTER
+VOID:POINTER,INT
+VOID:POINTER,BOOLEAN
+VOID:POINTER,POINTER,BOOLEAN
+VOID:POINTER,POINTER,POINTER
+VOID:POINTER,UINT
+VOID:STRING
+VOID:STRING,BOXED
+VOID:STRING,STRING
+VOID:STRING,STRING,STRING
+VOID:STRING,INT,POINTER
+VOID:STRING,UINT,FLAGS
+VOID:STRING,UINT,FLAGS,UINT
+VOID:UINT,FLAGS,BOXED
+VOID:UINT,UINT
+VOID:UINT,STRING
+VOID:UINT,BOXED,UINT,FLAGS,FLAGS
+VOID:UINT,OBJECT,UINT,FLAGS,FLAGS
+VOID:UINT,STRING,UINT
+VOID:UINT,UINT
+VOID:VOID
+OBJECT:OBJECT,INT,INT
+VOID:POINTER,POINTER,POINTER,POINTER,STRING