[Gtk2hs-commit] gtk2hs/tools/callbackGen gtkmarshal.list,1.2,1.3

[Duncan C. <dun...@us...>]

Update of /cvsroot/gtk2hs/gtk2hs/tools/callbackGen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3552/tools/callbackGen

Modified Files:
	gtkmarshal.list 
Log Message:
Updated the marshal list with the one from gtk-2.4.
Updated hierarchy.list with new classes for gtk-2.4, a few old ones that were
missing and some more Gdk classes.


Index: gtkmarshal.list
===================================================================
RCS file: /cvsroot/gtk2hs/gtk2hs/tools/callbackGen/gtkmarshal.list,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- gtkmarshal.list	26 Jul 2004 12:14:47 -0000	1.2
+++ gtkmarshal.list	3 Aug 2004 03:51:42 -0000	1.3
@@ -23,34 +23,47 @@
 
 BOOLEAN:BOXED
 BOOLEAN:BOXED,BOXED
+BOOLEAN:ENUM
+BOOLEAN:ENUM,INT
+BOOLEAN:OBJECT,UINT,FLAGS
 BOOLEAN:OBJECT,INT,INT,UINT
 BOOLEAN:OBJECT,STRING,STRING,BOXED
+BOOLEAN:OBJECT,BOXED
 BOOLEAN:OBJECT,BOXED,BOXED
+BOOLEAN:OBJECT,STRING,STRING
+BOOLEAN:INT,INT
+BOOLEAN:INT,INT,INT
+BOOLEAN:UINT
 BOOLEAN:VOID
 BOOLEAN:BOOLEAN
+BOOLEAN:NONE
+BOOLEAN:BOOLEAN,BOOLEAN,BOOLEAN
 ENUM:ENUM
-NONE:ENUM,ENUM
 INT:POINTER
-NONE:BOOL
+NONE:BOOLEAN
+NONE:ENUM
 NONE:INT
+NONE:INT,BOOL
 NONE:INT,INT
 NONE:NONE
-NONE:POINTER
 NONE:STRING,INT,POINTER
+STRING:DOUBLE
+VOID:DOUBLE
 VOID:BOOLEAN
+VOID:BOOLEAN,BOOLEAN,BOOLEAN
 VOID:BOXED
 VOID:BOXED,BOXED
-VOID:BOXED,BOXED,BOXED,BOXED
 VOID:BOXED,BOXED,POINTER
-VOID: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,BOOL
+VOID:ENUM,FLOAT,BOOLEAN
 VOID:ENUM,INT
 VOID:ENUM,INT,BOOLEAN
 VOID:INT
@@ -66,14 +79,21 @@
 VOID:OBJECT,OBJECT
 VOID:OBJECT,STRING,STRING
 VOID:OBJECT,UINT
+VOID:OBJECT,UINT,FLAGS
 VOID:POINTER
 VOID:POINTER,INT
+VOID:POINTER,BOOLEAN
 VOID:POINTER,POINTER,POINTER
 VOID:POINTER,UINT
 VOID:STRING
+VOID:STRING,STRING
 VOID:STRING,INT,POINTER
-VOID:UINT,BOXED,UINT,FLAGS,FLAGS
+VOID:STRING,UINT,FLAGS
+VOID:UINT,FLAGS,BOXED
+VOID:UINT,UINT
 VOID:UINT,STRING
+VOID:UINT,BOXED,UINT,FLAGS,FLAGS
+VOID:UINT,OBJECT,UINT,FLAGS,FLAGS
 VOID:VOID
 # This marshaller is necessary to marshal a string with explicit length in a
 # callback "text-insert" in TextBuffer.