Make gtkmarshal.list/gtkmarshal.h only for compatibility with GTK+-1.2;

Sat Nov 17 18:26:45 2001  Owen Taylor  <otaylor@redhat.com>

	* gtk/Makefile.am gtk/gtkmarshal.list gtk/gtkmarshalers.list
	gtk/*.c gtk/gtksignal.h: Make gtkmarshal.list/gtkmarshal.h
	only for compatibility with GTK+-1.2; and deprecate it;
	put all marshalers we actually use into gtkmarshalers.list
	and use the _gtk_marshal_ prefix for these marshalers.

1 files changed, 27 insertions, 78 deletions

diff --git a/gtk/gtkmarshal.list b/gtk/gtkmarshal.list
index 0cd270728c..a016dffc6d 100644
--- a/gtk/gtkmarshal.list
+++ b/gtk/gtkmarshal.list
@@ -1,87 +1,36 @@
-# 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:OBJECT,UINT,UINT
-BOOLEAN:OBJECT,INT,INT,UINT
-BOOLEAN:OBJECT,STRING,STRING,BOXED
-BOOLEAN:OBJECT,BOXED,BOXED
-BOOLEAN:INT,INT
-BOOLEAN:VOID
-BOOLEAN:BOOLEAN
+BOOL:NONE
+BOOL:POINTER
+BOOL:POINTER,POINTER,INT,INT
+BOOL:POINTER,INT,INT
+BOOL:POINTER,INT,INT,UINT
+BOOL:POINTER,STRING,STRING,POINTER
 ENUM:ENUM
 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
-STRING:DOUBLE
-VOID:BOOLEAN
-VOID:BOOLEAN,BOOLEAN,BOOLEAN
-VOID:BOXED
-VOID: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,ENUM
-VOID:ENUM,FLOAT
-VOID:ENUM,FLOAT,BOOL
-VOID:ENUM,INT
-VOID:ENUM,INT,BOOLEAN
-VOID:INT
-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,INT,INT
-VOID:OBJECT,INT,INT,BOXED,UINT,UINT
-VOID:OBJECT,OBJECT
-VOID:OBJECT,STRING,STRING
-VOID:OBJECT,UINT
-VOID:OBJECT,UINT,FLAGS
-VOID:POINTER
-VOID:POINTER,INT
-VOID:POINTER,POINTER,POINTER
-VOID:POINTER,UINT
-VOID:STRING
-VOID:STRING,STRING
-VOID:STRING,INT,POINTER
-VOID:UINT,UINT
-VOID:UINT,UINT,BOXED
-VOID:UINT,STRING
-VOID:UINT,BOXED,UINT,FLAGS,FLAGS
-VOID:UINT,OBJECT,UINT,FLAGS,FLAGS
-VOID:VOID
+NONE:UINT
+NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER
+NONE:UINT,POINTER,UINT,UINT,ENUM
+NONE:UINT,STRING