Update to libtool-1.2b, change library versioning scheme to drop

Tue Sep 15 14:57:30 1998  Owen Taylor  <otaylor@redhat.com>

	* Makefile.am gtk-config.in l*: Update to libtool-1.2b,
	change library versioning scheme to drop LT_RELEASE
	from the -l line, while keeping it in the soname.

Tue Sep 15 14:10:33 1998  Owen Taylor  <otaylor@redhat.com>

	* configure.in Makefile.in: define a MAINT-like variable REBUILD
	which is set if Perl and awk are found, and autogenerated sources
	can be rebuilt. Remove the auto-generated sources from
	CVS.

	Add dependencies so that the autogenerated sources are
	rebuilt if the files they depend on change.
	(This unfortunately currently results in the entire
	gtk/ directory being rebuilt when any header changes.
	Moving all enums to gtkenums.h would fix this.)

7 files changed, 58 insertions, 1164 deletions

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 99cd4ccf87..89e6fd50af 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -3,9 +3,9 @@
 gtkincludedir = $(includedir)/gtk
 DEFS += -DG_LOG_DOMAIN=\"Gtk\"
 
-lib_LTLIBRARIES = libgtk-1.1.la
+lib_LTLIBRARIES = libgtk.la
 
-libgtk_1_1_la_SOURCES = \
+libgtk_la_SOURCES = \
 	gtkaccelgroup.c		\
 	gtkaccellabel.c		\
 	gtkadjustment.c		\
@@ -107,7 +107,8 @@ libgtk_1_1_la_SOURCES = \
 	fnmatch.c		\
 	fnmatch.h
 
-gtkinclude_HEADERS = \
+# Source headers are are non-autogenerated headers
+source_headers = \
 	gtk.h			\
 	gtkaccelgroup.h		\
 	gtkaccellabel.h		\
@@ -160,7 +161,6 @@ gtkinclude_HEADERS = \
 	gtklist.h		\
 	gtklistitem.h		\
 	gtkmain.h		\
-	gtkmarshal.h		\
 	gtkmenu.h		\
 	gtkmenubar.h		\
 	gtkmenufactory.h	\
@@ -210,61 +210,71 @@ gtkinclude_HEADERS = \
 	gtkvscrollbar.h		\
 	gtkvseparator.h		\
 	gtkwidget.h		\
-	gtkwindow.h             \
+	gtkwindow.h
+
+gtkinclude_HEADERS = 		\
+	$(source_headers) 	\
+	gtkmarshal.h		\
 	gtktypebuiltins.h
 
-.PHONY: auto-files auto-files-1
-auto-files:
-	rm -f $(srcdir)/gtk.defs
-	$(MAKE) auto-files-1
+BUILT_SOURCES = \
+	gtktypebuiltins.h 		\
+	gtktypebuiltins_evals.c 	\
+	gtktypebuiltins_ids.c 		\
+        gtktypebuiltins_vars.c 		\
+	gtkmarshal.c 			\
+        gtkmarshal.h 
 
-auto-files-1: gtk.defs
-auto-files-1: gtktypebuiltins_evals.c gtktypebuiltins_ids.c
-auto-files-1: gtktypebuiltins_vars.c gtktypebuiltins.h
+# More headers to use when autogenerating.
+gdk_headers = \
+	$(top_srcdir)/gdk/gdktypes.h \
+	$(top_srcdir)/gdk/gdkrgb.h
 
 # generate gtk.defs file from gtk-boxed.defs and *.h
-gtk.defs: @MAINT@ makeenums.pl gtk-boxed.defs
+gtk.defs: @REBUILD@ makeenums.pl gtk-boxed.defs $(source_headers) $(gdk_headers)
+	src_headers=`echo $(source_headers) | sed s%gtk%$(srcdir)/gtk%` ; \
 	srcdir=$(srcdir) \
-	  perl $(srcdir)/makeenums.pl defs $(srcdir)/gtk*.h \
-               $(top_srcdir)/gdk/gdk*.h > gd.tmp
+	  perl $(srcdir)/makeenums.pl defs $$src_headers \
+               $(gdk_headers) > gd.tmp
 	cat $(srcdir)/gtk-boxed.defs >> gd.tmp
 	cp gd.tmp $(srcdir)/gtk.defs
 	rm -f gd.tmp
 
 # generate type identifier header (GTK_TYPE_WIDGET_FLAGS)
-gtktypebuiltins.h: @MAINT@ gtk.defs maketypes.awk
+gtktypebuiltins.h: @REBUILD@ gtk.defs maketypes.awk
 	awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs macros > gtb.tmp
 	cp gtb.tmp $(srcdir)/gtktypebuiltins.h
 	rm -f gtb.tmp
 
 # generate type identifier variables (GTK_TYPE_WIDGET_FLAGS)
-gtktypebuiltins_vars.c: @MAINT@ gtk.defs maketypes.awk
+gtktypebuiltins_vars.c: @REBUILD@ gtk.defs maketypes.awk
 	awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs variables > gtbv.tmp
 	cp gtbv.tmp $(srcdir)/gtktypebuiltins_vars.c
 	rm -f gtbv.tmp
 
 # generate type entries for type-id registration
-gtktypebuiltins_ids.c: @MAINT@ gtk.defs maketypes.awk
+gtktypebuiltins_ids.c: @REBUILD@ gtk.defs maketypes.awk
 	awk -f $(srcdir)/maketypes.awk $(srcdir)/gtk.defs entries > gtbi.tmp
 	cp gtbi.tmp $(srcdir)/gtktypebuiltins_ids.c
 	rm -f gtbi.tmp
 
 # generate enum value arrays
-gtktypebuiltins_evals.c: @MAINT@ makeenums.pl gtk.defs
+gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl gtk.defs
 	srcdir=$(srcdir) \
 	  perl $(srcdir)/makeenums.pl arrays $(srcdir)/gtk*.h \
                $(top_srcdir)/gdk/gdk*.h > gtbe.tmp
 	cp gtbe.tmp $(srcdir)/gtktypebuiltins_evals.c
 	rm -f gtbe.tmp
 
-gtkmarshal.c gtkmarshal.h: @MAINT@ gtkmarshal.list genmarshal.pl
+gtkmarshal.c gtkmarshal.h: @REBUILD@ gtkmarshal.list genmarshal.pl
 	srcdir=$(srcdir) perl $(srcdir)/genmarshal.pl
 
 # ???
 # special remake rules
-makeenums.h: @MAINT@ gtk.h gtkprivate.h
+# makeenums.h: @REBUILD@ gtk.h gtkprivate.h
 
-libgtk_1_1_la_LDFLAGS = -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+libgtk_la_LDFLAGS = \
+	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
 
 EXTRA_DIST = \
 	line-arrow.xbm 		\
@@ -300,15 +310,13 @@ INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@
 
 noinst_PROGRAMS = testgtk testinput testselection testthreads testrgb simple 
 
-# FIXME, we currently rely on linking against libglib-1.1
-
 DEPS =	\
-	libgtk-@LT_RELEASE@.la				\
-	$(top_builddir)/gdk/libgdk-@LT_RELEASE@.la
+	libgtk.la					\
+	$(top_builddir)/gdk/libgdk.la
 
 LDADDS = \
-	libgtk-@LT_RELEASE@.la				\
-	$(top_builddir)/gdk/libgdk-@LT_RELEASE@.la	\
+	libgtk.la					\
+	$(top_builddir)/gdk/libgdk.la			\
 	@x_ldflags@					\
 	@x_libs@					\
 	@GLIB_LIBS@                                     \
diff --git a/gtk/gtk.defs b/gtk/gtk.defs
index e8d0092a33..194715c42c 100644
--- a/gtk/gtk.defs
+++ b/gtk/gtk.defs
@@ -1,7 +1,7 @@
 ;; generated by makeenums.pl  ; -*- scheme -*-
 
 
-; enumerations from "./gtkclist.h"
+; enumerations from "gtkclist.h"
 
 (define-enum GtkCellType
    (empty GTK_CELL_EMPTY)
@@ -10,7 +10,7 @@
    (pixtext GTK_CELL_PIXTEXT)
    (widget GTK_CELL_WIDGET))
 
-; enumerations from "./gtkctree.h"
+; enumerations from "gtkctree.h"
 
 (define-enum GtkCTreePos
    (before GTK_CTREE_POS_BEFORE)
@@ -31,14 +31,14 @@
    (toggle GTK_CTREE_EXPANSION_TOGGLE)
    (toggle-recursive GTK_CTREE_EXPANSION_TOGGLE_RECURSIVE))
 
-; enumerations from "./gtkdebug.h"
+; enumerations from "gtkdebug.h"
 
 (define-flags GtkDebugFlag
    (objects GTK_DEBUG_OBJECTS)
    (misc GTK_DEBUG_MISC)
    (signals GTK_DEBUG_SIGNALS))
 
-; enumerations from "./gtkenums.h"
+; enumerations from "gtkenums.h"
 
 (define-flags GtkAccelFlags
    (visible GTK_ACCEL_VISIBLE)
@@ -231,13 +231,13 @@
    (ascending GTK_SORT_ASCENDING)
    (descending GTK_SORT_DESCENDING))
 
-; enumerations from "./gtkfontsel.h"
+; enumerations from "gtkfontsel.h"
 
 (define-enum GtkFontMetricType
    (ixels-metric PIXELS_METRIC)
    (oints-metric POINTS_METRIC))
 
-; enumerations from "./gtkobject.h"
+; enumerations from "gtkobject.h"
 
 (define-flags GtkObjectFlags
    (destroyed GTK_DESTROYED)
@@ -254,7 +254,7 @@
    (mask GTK_ARG_MASK)
    (readwrite GTK_ARG_READWRITE))
 
-; enumerations from "./gtkpacker.h"
+; enumerations from "gtkpacker.h"
 
 (define-flags GtkPackerOptions
    (expand GTK_PACK_EXPAND)
@@ -286,7 +286,7 @@
    (w GTK_ANCHOR_W)
    (e GTK_ANCHOR_E))
 
-; enumerations from "./gtkprivate.h"
+; enumerations from "gtkprivate.h"
 
 (define-flags GtkPrivateFlags
    (user-style PRIVATE_GTK_USER_STYLE)
@@ -297,7 +297,7 @@
    (has-shape-mask PRIVATE_GTK_HAS_SHAPE_MASK)
    (in-reparent PRIVATE_GTK_IN_REPARENT))
 
-; enumerations from "./gtkprogressbar.h"
+; enumerations from "gtkprogressbar.h"
 
 (define-enum GtkProgressBarStyle
    (continuous GTK_PROGRESS_CONTINUOUS)
@@ -309,7 +309,7 @@
    (bottom-to-top GTK_PROGRESS_BOTTOM_TO_TOP)
    (top-to-bottom GTK_PROGRESS_TOP_TO_BOTTOM))
 
-; enumerations from "./gtkrc.h"
+; enumerations from "gtkrc.h"
 
 (define-enum GtkRcTokenType
    (invalid GTK_RC_TOKEN_INVALID)
@@ -340,7 +340,7 @@
    (highest GTK_RC_TOKEN_HIGHEST)
    (last GTK_RC_TOKEN_LAST))
 
-; enumerations from "./gtkspinbutton.h"
+; enumerations from "gtkspinbutton.h"
 
 (define-enum GtkSpinButtonUpdatePolicy
    (always GTK_UPDATE_ALWAYS)
@@ -355,7 +355,7 @@
    (end GTK_SPIN_END)
    (user-defined GTK_SPIN_USER_DEFINED))
 
-; enumerations from "./gtktoolbar.h"
+; enumerations from "gtktoolbar.h"
 
 (define-enum GtkToolbarChildType
    (space GTK_TOOLBAR_CHILD_SPACE)
@@ -364,13 +364,13 @@
    (radiobutton GTK_TOOLBAR_CHILD_RADIOBUTTON)
    (widget GTK_TOOLBAR_CHILD_WIDGET))
 
-; enumerations from "./gtktree.h"
+; enumerations from "gtktree.h"
 
 (define-enum GtkTreeViewMode
    (line GTK_TREE_VIEW_LINE)
    (item GTK_TREE_VIEW_ITEM))
 
-; enumerations from "./gtktypeutils.h"
+; enumerations from "gtktypeutils.h"
 
 (define-enum GtkFundamentalType
    (invalid GTK_TYPE_INVALID)
@@ -396,7 +396,7 @@
    (foreign GTK_TYPE_FOREIGN)
    (object GTK_TYPE_OBJECT))
 
-; enumerations from "./gtkwidget.h"
+; enumerations from "gtkwidget.h"
 
 (define-flags GtkWidgetFlags
    (toplevel GTK_TOPLEVEL)
@@ -415,25 +415,6 @@
    (composite-child GTK_COMPOSITE_CHILD)
    (basic GTK_BASIC))
 
-; enumerations from "../gdk/gdkprivate.h"
-
-(define-flags GdkColorInfoFlags
-   (writeable GDK_COLOR_WRITEABLE))
-
-(define-flags GdkDebugFlag
-   (misc GDK_DEBUG_MISC)
-   (events GDK_DEBUG_EVENTS)
-   (dnd GDK_DEBUG_DND)
-   (color-context GDK_DEBUG_COLOR_CONTEXT)
-   (xim GDK_DEBUG_XIM))
-
-; enumerations from "../gdk/gdkrgb.h"
-
-(define-enum GdkRgbDither
-   (none GDK_RGB_DITHER_NONE)
-   (normal GDK_RGB_DITHER_NORMAL)
-   (max GDK_RGB_DITHER_MAX))
-
 ; enumerations from "../gdk/gdktypes.h"
 
 (define-enum GdkWindowType
@@ -854,6 +835,13 @@
    (in GDK_OVERLAP_RECTANGLE_IN)
    (out GDK_OVERLAP_RECTANGLE_OUT)
    (part GDK_OVERLAP_RECTANGLE_PART))
+
+; enumerations from "../gdk/gdkrgb.h"
+
+(define-enum GdkRgbDither
+   (none GDK_RGB_DITHER_NONE)
+   (normal GDK_RGB_DITHER_NORMAL)
+   (max GDK_RGB_DITHER_MAX))
 ;; -*- scheme -*-
 
 
diff --git a/gtk/gtkmarshal.c b/gtk/gtkmarshal.c
deleted file mode 100644
index 751176298a..0000000000
--- a/gtk/gtkmarshal.c
+++ /dev/null
@@ -1,483 +0,0 @@
-#include "gtkmarshal.h"
-
-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[0]);
-  rfunc = (GtkSignal_BOOL__NONE) func;
-  *return_val = (*rfunc) (object,
-			  func_data);
-}
-
-typedef gboolean (*GtkSignal_BOOL__POINTER) (GtkObject * object,
-					     gpointer arg1,
-					     gpointer user_data);
-void 
-gtk_marshal_BOOL__POINTER (GtkObject * object,
-			   GtkSignalFunc func,
-			   gpointer func_data,
-			   GtkArg * args)
-{
-  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__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 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 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,
-						  gpointer arg1,
-						  char arg2,
-						  char arg3,
-						  gpointer user_data);
-void 
-gtk_marshal_INT__POINTER_CHAR_CHAR (GtkObject * object,
-				    GtkSignalFunc func,
-				    gpointer func_data,
-				    GtkArg * args)
-{
-  GtkSignal_INT__POINTER_CHAR_CHAR rfunc;
-  gint *return_val;
-  return_val = GTK_RETLOC_INT (args[3]);
-  rfunc = (GtkSignal_INT__POINTER_CHAR_CHAR) func;
-  *return_val = (*rfunc) (object,
-			  GTK_VALUE_POINTER (args[0]),
-			  GTK_VALUE_CHAR (args[1]),
-			  GTK_VALUE_CHAR (args[2]),
-			  func_data);
-}
-
-typedef void (*GtkSignal_NONE__BOOL) (GtkObject * object,
-				      gboolean arg1,
-				      gpointer user_data);
-void 
-gtk_marshal_NONE__BOOL (GtkObject * object,
-			GtkSignalFunc func,
-			gpointer func_data,
-			GtkArg * args)
-{
-  GtkSignal_NONE__BOOL rfunc;
-  rfunc = (GtkSignal_NONE__BOOL) func;
-  (*rfunc) (object,
-	    GTK_VALUE_BOOL (args[0]),
-	    func_data);
-}
-
-typedef void (*GtkSignal_NONE__POINTER) (GtkObject * object,
-					 gpointer arg1,
-					 gpointer user_data);
-void 
-gtk_marshal_NONE__POINTER (GtkObject * object,
-			   GtkSignalFunc func,
-			   gpointer func_data,
-			   GtkArg * args)
-{
-  GtkSignal_NONE__POINTER rfunc;
-  rfunc = (GtkSignal_NONE__POINTER) func;
-  (*rfunc) (object,
-	    GTK_VALUE_POINTER (args[0]),
-	    func_data);
-}
-
-typedef void (*GtkSignal_NONE__C_CALLBACK) (GtkObject * object,
-					    gpointer arg1a,
-					    gpointer arg1b,
-					    gpointer user_data);
-void 
-gtk_marshal_NONE__C_CALLBACK (GtkObject * object,
-			      GtkSignalFunc func,
-			      gpointer func_data,
-			      GtkArg * args)
-{
-  GtkSignal_NONE__C_CALLBACK rfunc;
-  rfunc = (GtkSignal_NONE__C_CALLBACK) func;
-  (*rfunc) (object,
-	    GTK_VALUE_C_CALLBACK (args[0]).func,
-	    GTK_VALUE_C_CALLBACK (args[0]).func_data,
-	    func_data);
-}
-
-typedef void (*GtkSignal_NONE__C_CALLBACK_C_CALLBACK) (GtkObject * object,
-						       gpointer arg1a,
-						       gpointer arg1b,
-						       gpointer arg2a,
-						       gpointer arg2b,
-						       gpointer user_data);
-void 
-gtk_marshal_NONE__C_CALLBACK_C_CALLBACK (GtkObject * object,
-					 GtkSignalFunc func,
-					 gpointer func_data,
-					 GtkArg * args)
-{
-  GtkSignal_NONE__C_CALLBACK_C_CALLBACK rfunc;
-  rfunc = (GtkSignal_NONE__C_CALLBACK_C_CALLBACK) func;
-  (*rfunc) (object,
-	    GTK_VALUE_C_CALLBACK (args[0]).func,
-	    GTK_VALUE_C_CALLBACK (args[0]).func_data,
-	    GTK_VALUE_C_CALLBACK (args[1]).func,
-	    GTK_VALUE_C_CALLBACK (args[1]).func_data,
-	    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) (GtkObject * object,
-						 gpointer arg1,
-						 gpointer arg2,
-						 gpointer user_data);
-void 
-gtk_marshal_NONE__POINTER_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);
-}
-
-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__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__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
deleted file mode 100644
index ee8912c3f4..0000000000
--- a/gtk/gtkmarshal.h
+++ /dev/null
@@ -1,179 +0,0 @@
-#ifndef __GTKMARSHAL_H__
-#define __GTKMARSHAL_H__ 1
-
-#include <gtk/gtktypeutils.h>
-#include <gtk/gtkobject.h>
-
-#ifdef __cplusplus
-extern "C"
-{
-#pragma }
-#endif				/* __cplusplus */
-
-#define gtk_signal_default_marshaller gtk_marshal_NONE__NONE
-
-  void gtk_marshal_BOOL__NONE (GtkObject * object,
-			       GtkSignalFunc func,
-			       gpointer func_data,
-			       GtkArg * args);
-
-  void gtk_marshal_BOOL__POINTER (GtkObject * object,
-				  GtkSignalFunc func,
-				  gpointer func_data,
-				  GtkArg * args);
-
-  void gtk_marshal_BOOL__POINTER_POINTER_INT_INT (GtkObject * object,
-						  GtkSignalFunc func,
-						  gpointer func_data,
-						  GtkArg * args);
-
-#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_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);
-
-  void gtk_marshal_NONE__BOOL (GtkObject * object,
-			       GtkSignalFunc func,
-			       gpointer func_data,
-			       GtkArg * args);
-
-#define gtk_marshal_NONE__BOXED gtk_marshal_NONE__POINTER
-
-  void gtk_marshal_NONE__POINTER (GtkObject * object,
-				  GtkSignalFunc func,
-				  gpointer func_data,
-				  GtkArg * args);
-
-  void gtk_marshal_NONE__C_CALLBACK (GtkObject * object,
-				     GtkSignalFunc func,
-				     gpointer func_data,
-				     GtkArg * args);
-
-  void gtk_marshal_NONE__C_CALLBACK_C_CALLBACK (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 (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_STRING_STRING gtk_marshal_NONE__POINTER_POINTER_POINTER
-
-#define gtk_marshal_NONE__POINTER_UINT gtk_marshal_NONE__POINTER_INT
-
-#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__POINTER_UINT_UINT gtk_marshal_NONE__POINTER_INT_INT
-
-#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__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__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__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/gtktypebuiltins.h b/gtk/gtktypebuiltins.h
deleted file mode 100644
index 369591c68c..0000000000
--- a/gtk/gtktypebuiltins.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/* type macros, generated by maketypes.awk */
-
-extern GtkType GTK_TYPE_CELL_TYPE;
-extern GtkType GTK_TYPE_C_TREE_POS;
-extern GtkType GTK_TYPE_C_TREE_LINE_STYLE;
-extern GtkType GTK_TYPE_C_TREE_EXPANSION_TYPE;
-extern GtkType GTK_TYPE_DEBUG_FLAG;
-extern GtkType GTK_TYPE_ACCEL_FLAGS;
-extern GtkType GTK_TYPE_ARROW_TYPE;
-extern GtkType GTK_TYPE_ATTACH_OPTIONS;
-extern GtkType GTK_TYPE_BUTTON_BOX_STYLE;
-extern GtkType GTK_TYPE_CURVE_TYPE;
-extern GtkType GTK_TYPE_DIRECTION_TYPE;
-extern GtkType GTK_TYPE_JUSTIFICATION;
-extern GtkType GTK_TYPE_MATCH_TYPE;
-extern GtkType GTK_TYPE_MENU_DIRECTION_TYPE;
-extern GtkType GTK_TYPE_MENU_FACTORY_TYPE;
-extern GtkType GTK_TYPE_METRIC_TYPE;
-extern GtkType GTK_TYPE_ORIENTATION;
-extern GtkType GTK_TYPE_PACK_TYPE;
-extern GtkType GTK_TYPE_PATH_PRIORITY_TYPE;
-extern GtkType GTK_TYPE_PATH_TYPE;
-extern GtkType GTK_TYPE_POLICY_TYPE;
-extern GtkType GTK_TYPE_POSITION_TYPE;
-extern GtkType GTK_TYPE_PREVIEW_TYPE;
-extern GtkType GTK_TYPE_RELIEF_STYLE;
-extern GtkType GTK_TYPE_RESIZE_MODE;
-extern GtkType GTK_TYPE_SIGNAL_RUN_TYPE;
-extern GtkType GTK_TYPE_SCROLL_TYPE;
-extern GtkType GTK_TYPE_SELECTION_MODE;
-extern GtkType GTK_TYPE_SHADOW_TYPE;
-extern GtkType GTK_TYPE_STATE_TYPE;
-extern GtkType GTK_TYPE_SUBMENU_DIRECTION;
-extern GtkType GTK_TYPE_SUBMENU_PLACEMENT;
-extern GtkType GTK_TYPE_TOOLBAR_STYLE;
-extern GtkType GTK_TYPE_TROUGH_TYPE;
-extern GtkType GTK_TYPE_UPDATE_TYPE;
-extern GtkType GTK_TYPE_VISIBILITY;
-extern GtkType GTK_TYPE_WINDOW_POSITION;
-extern GtkType GTK_TYPE_WINDOW_TYPE;
-extern GtkType GTK_TYPE_SORT_TYPE;
-extern GtkType GTK_TYPE_FONT_METRIC_TYPE;
-extern GtkType GTK_TYPE_OBJECT_FLAGS;
-extern GtkType GTK_TYPE_ARG_FLAGS;
-extern GtkType GTK_TYPE_PACKER_OPTIONS;
-extern GtkType GTK_TYPE_SIDE_TYPE;
-extern GtkType GTK_TYPE_ANCHOR_TYPE;
-extern GtkType GTK_TYPE_PRIVATE_FLAGS;
-extern GtkType GTK_TYPE_PROGRESS_BAR_STYLE;
-extern GtkType GTK_TYPE_PROGRESS_BAR_ORIENTATION;
-extern GtkType GTK_TYPE_RC_TOKEN_TYPE;
-extern GtkType GTK_TYPE_SPIN_BUTTON_UPDATE_POLICY;
-extern GtkType GTK_TYPE_SPIN_TYPE;
-extern GtkType GTK_TYPE_TOOLBAR_CHILD_TYPE;
-extern GtkType GTK_TYPE_TREE_VIEW_MODE;
-extern GtkType GTK_TYPE_FUNDAMENTAL_TYPE;
-extern GtkType GTK_TYPE_WIDGET_FLAGS;
-extern GtkType GTK_TYPE_GDK_COLOR_INFO_FLAGS;
-extern GtkType GTK_TYPE_GDK_DEBUG_FLAG;
-extern GtkType GTK_TYPE_GDK_RGB_DITHER;
-extern GtkType GTK_TYPE_GDK_WINDOW_TYPE;
-extern GtkType GTK_TYPE_GDK_WINDOW_CLASS;
-extern GtkType GTK_TYPE_GDK_IMAGE_TYPE;
-extern GtkType GTK_TYPE_GDK_VISUAL_TYPE;
-extern GtkType GTK_TYPE_GDK_FONT_TYPE;
-extern GtkType GTK_TYPE_GDK_WINDOW_ATTRIBUTES_TYPE;
-extern GtkType GTK_TYPE_GDK_WINDOW_HINTS;
-extern GtkType GTK_TYPE_GDK_FUNCTION;
-extern GtkType GTK_TYPE_GDK_FILL;
-extern GtkType GTK_TYPE_GDK_FILL_RULE;
-extern GtkType GTK_TYPE_GDK_LINE_STYLE;
-extern GtkType GTK_TYPE_GDK_CAP_STYLE;
-extern GtkType GTK_TYPE_GDK_JOIN_STYLE;
-extern GtkType GTK_TYPE_GDK_CURSOR_TYPE;
-extern GtkType GTK_TYPE_GDK_FILTER_RETURN;
-extern GtkType GTK_TYPE_GDK_VISIBILITY_STATE;
-extern GtkType GTK_TYPE_GDK_EVENT_TYPE;
-extern GtkType GTK_TYPE_GDK_EVENT_MASK;
-extern GtkType GTK_TYPE_GDK_NOTIFY_TYPE;
-extern GtkType GTK_TYPE_GDK_CROSSING_MODE;
-extern GtkType GTK_TYPE_GDK_MODIFIER_TYPE;
-extern GtkType GTK_TYPE_GDK_SUBWINDOW_MODE;
-extern GtkType GTK_TYPE_GDK_INPUT_CONDITION;
-extern GtkType GTK_TYPE_GDK_STATUS;
-extern GtkType GTK_TYPE_GDK_BYTE_ORDER;
-extern GtkType GTK_TYPE_GDK_GC_VALUES_MASK;
-extern GtkType GTK_TYPE_GDK_SELECTION;
-extern GtkType GTK_TYPE_GDK_PROPERTY_STATE;
-extern GtkType GTK_TYPE_GDK_PROP_MODE;
-extern GtkType GTK_TYPE_GDK_DND_TYPE;
-extern GtkType GTK_TYPE_GDK_INPUT_SOURCE;
-extern GtkType GTK_TYPE_GDK_INPUT_MODE;
-extern GtkType GTK_TYPE_GDK_AXIS_USE;
-extern GtkType GTK_TYPE_GDK_TARGET;
-extern GtkType GTK_TYPE_GDK_SELECTION_TYPE;
-extern GtkType GTK_TYPE_GDK_EXTENSION_MODE;
-extern GtkType GTK_TYPE_GDK_IM_STYLE;
-extern GtkType GTK_TYPE_GDK_WM_DECORATION;
-extern GtkType GTK_TYPE_GDK_WM_FUNCTION;
-extern GtkType GTK_TYPE_GDK_COLOR_CONTEXT_MODE;
-extern GtkType GTK_TYPE_GDK_OVERLAP_TYPE;
-extern GtkType GTK_TYPE_ACCEL_GROUP;
-extern GtkType GTK_TYPE_SELECTION_DATA;
-extern GtkType GTK_TYPE_STYLE;
-extern GtkType GTK_TYPE_GDK_COLORMAP;
-extern GtkType GTK_TYPE_GDK_VISUAL;
-extern GtkType GTK_TYPE_GDK_FONT;
-extern GtkType GTK_TYPE_GDK_WINDOW;
-extern GtkType GTK_TYPE_GDK_EVENT;
-extern GtkType GTK_TYPE_GDK_COLOR;
-
-#define	GTK_TYPE_NUM_BUILTINS	(108)
diff --git a/gtk/gtktypebuiltins_ids.c b/gtk/gtktypebuiltins_ids.c
deleted file mode 100644
index b13f05b46e..0000000000
--- a/gtk/gtktypebuiltins_ids.c
+++ /dev/null
@@ -1,218 +0,0 @@
-/* type entries, generated by maketypes.awk */
-
-  { "GtkCellType", &GTK_TYPE_CELL_TYPE,
-    GTK_TYPE_ENUM, _gtk_cell_type_values },
-  { "GtkCTreePos", &GTK_TYPE_C_TREE_POS,
-    GTK_TYPE_ENUM, _gtk_c_tree_pos_values },
-  { "GtkCTreeLineStyle", &GTK_TYPE_C_TREE_LINE_STYLE,
-    GTK_TYPE_ENUM, _gtk_c_tree_line_style_values },
-  { "GtkCTreeExpansionType", &GTK_TYPE_C_TREE_EXPANSION_TYPE,
-    GTK_TYPE_ENUM, _gtk_c_tree_expansion_type_values },
-  { "GtkDebugFlag", &GTK_TYPE_DEBUG_FLAG,
-    GTK_TYPE_FLAGS, _gtk_debug_flag_values },
-  { "GtkAccelFlags", &GTK_TYPE_ACCEL_FLAGS,
-    GTK_TYPE_FLAGS, _gtk_accel_flags_values },
-  { "GtkArrowType", &GTK_TYPE_ARROW_TYPE,
-    GTK_TYPE_ENUM, _gtk_arrow_type_values },
-  { "GtkAttachOptions", &GTK_TYPE_ATTACH_OPTIONS,
-    GTK_TYPE_FLAGS, _gtk_attach_options_values },
-  { "GtkButtonBoxStyle", &GTK_TYPE_BUTTON_BOX_STYLE,
-    GTK_TYPE_ENUM, _gtk_button_box_style_values },
-  { "GtkCurveType", &GTK_TYPE_CURVE_TYPE,
-    GTK_TYPE_ENUM, _gtk_curve_type_values },
-  { "GtkDirectionType", &GTK_TYPE_DIRECTION_TYPE,
-    GTK_TYPE_ENUM, _gtk_direction_type_values },
-  { "GtkJustification", &GTK_TYPE_JUSTIFICATION,
-    GTK_TYPE_ENUM, _gtk_justification_values },
-  { "GtkMatchType", &GTK_TYPE_MATCH_TYPE,
-    GTK_TYPE_ENUM, _gtk_match_type_values },
-  { "GtkMenuDirectionType", &GTK_TYPE_MENU_DIRECTION_TYPE,
-    GTK_TYPE_ENUM, _gtk_menu_direction_type_values },
-  { "GtkMenuFactoryType", &GTK_TYPE_MENU_FACTORY_TYPE,
-    GTK_TYPE_ENUM, _gtk_menu_factory_type_values },
-  { "GtkMetricType", &GTK_TYPE_METRIC_TYPE,
-    GTK_TYPE_ENUM, _gtk_metric_type_values },
-  { "GtkOrientation", &GTK_TYPE_ORIENTATION,
-    GTK_TYPE_ENUM, _gtk_orientation_values },
-  { "GtkPackType", &GTK_TYPE_PACK_TYPE,
-    GTK_TYPE_ENUM, _gtk_pack_type_values },
-  { "GtkPathPriorityType", &GTK_TYPE_PATH_PRIORITY_TYPE,
-    GTK_TYPE_ENUM, _gtk_path_priority_type_values },
-  { "GtkPathType", &GTK_TYPE_PATH_TYPE,
-    GTK_TYPE_ENUM, _gtk_path_type_values },
-  { "GtkPolicyType", &GTK_TYPE_POLICY_TYPE,
-    GTK_TYPE_ENUM, _gtk_policy_type_values },
-  { "GtkPositionType", &GTK_TYPE_POSITION_TYPE,
-    GTK_TYPE_ENUM, _gtk_position_type_values },
-  { "GtkPreviewType", &GTK_TYPE_PREVIEW_TYPE,
-    GTK_TYPE_ENUM, _gtk_preview_type_values },
-  { "GtkReliefStyle", &GTK_TYPE_RELIEF_STYLE,
-    GTK_TYPE_ENUM, _gtk_relief_style_values },
-  { "GtkResizeMode", &GTK_TYPE_RESIZE_MODE,
-    GTK_TYPE_ENUM, _gtk_resize_mode_values },
-  { "GtkSignalRunType", &GTK_TYPE_SIGNAL_RUN_TYPE,
-    GTK_TYPE_FLAGS, _gtk_signal_run_type_values },
-  { "GtkScrollType", &GTK_TYPE_SCROLL_TYPE,
-    GTK_TYPE_ENUM, _gtk_scroll_type_values },
-  { "GtkSelectionMode", &GTK_TYPE_SELECTION_MODE,
-    GTK_TYPE_ENUM, _gtk_selection_mode_values },
-  { "GtkShadowType", &GTK_TYPE_SHADOW_TYPE,
-    GTK_TYPE_ENUM, _gtk_shadow_type_values },
-  { "GtkStateType", &GTK_TYPE_STATE_TYPE,
-    GTK_TYPE_ENUM, _gtk_state_type_values },
-  { "GtkSubmenuDirection", &GTK_TYPE_SUBMENU_DIRECTION,
-    GTK_TYPE_ENUM, _gtk_submenu_direction_values },
-  { "GtkSubmenuPlacement", &GTK_TYPE_SUBMENU_PLACEMENT,
-    GTK_TYPE_ENUM, _gtk_submenu_placement_values },
-  { "GtkToolbarStyle", &GTK_TYPE_TOOLBAR_STYLE,
-    GTK_TYPE_ENUM, _gtk_toolbar_style_values },
-  { "GtkTroughType", &GTK_TYPE_TROUGH_TYPE,
-    GTK_TYPE_ENUM, _gtk_trough_type_values },
-  { "GtkUpdateType", &GTK_TYPE_UPDATE_TYPE,
-    GTK_TYPE_ENUM, _gtk_update_type_values },
-  { "GtkVisibility", &GTK_TYPE_VISIBILITY,
-    GTK_TYPE_ENUM, _gtk_visibility_values },
-  { "GtkWindowPosition", &GTK_TYPE_WINDOW_POSITION,
-    GTK_TYPE_ENUM, _gtk_window_position_values },
-  { "GtkWindowType", &GTK_TYPE_WINDOW_TYPE,
-    GTK_TYPE_ENUM, _gtk_window_type_values },
-  { "GtkSortType", &GTK_TYPE_SORT_TYPE,
-    GTK_TYPE_ENUM, _gtk_sort_type_values },
-  { "GtkFontMetricType", &GTK_TYPE_FONT_METRIC_TYPE,
-    GTK_TYPE_ENUM, _gtk_font_metric_type_values },
-  { "GtkObjectFlags", &GTK_TYPE_OBJECT_FLAGS,
-    GTK_TYPE_FLAGS, _gtk_object_flags_values },
-  { "GtkArgFlags", &GTK_TYPE_ARG_FLAGS,
-    GTK_TYPE_FLAGS, _gtk_arg_flags_values },
-  { "GtkPackerOptions", &GTK_TYPE_PACKER_OPTIONS,
-    GTK_TYPE_FLAGS, _gtk_packer_options_values },
-  { "GtkSideType", &GTK_TYPE_SIDE_TYPE,
-    GTK_TYPE_ENUM, _gtk_side_type_values },
-  { "GtkAnchorType", &GTK_TYPE_ANCHOR_TYPE,
-    GTK_TYPE_ENUM, _gtk_anchor_type_values },
-  { "GtkPrivateFlags", &GTK_TYPE_PRIVATE_FLAGS,
-    GTK_TYPE_FLAGS, _gtk_private_flags_values },
-  { "GtkProgressBarStyle", &GTK_TYPE_PROGRESS_BAR_STYLE,
-    GTK_TYPE_ENUM, _gtk_progress_bar_style_values },
-  { "GtkProgressBarOrientation", &GTK_TYPE_PROGRESS_BAR_ORIENTATION,
-    GTK_TYPE_ENUM, _gtk_progress_bar_orientation_values },
-  { "GtkRcTokenType", &GTK_TYPE_RC_TOKEN_TYPE,
-    GTK_TYPE_ENUM, _gtk_rc_token_type_values },
-  { "GtkSpinButtonUpdatePolicy", &GTK_TYPE_SPIN_BUTTON_UPDATE_POLICY,
-    GTK_TYPE_ENUM, _gtk_spin_button_update_policy_values },
-  { "GtkSpinType", &GTK_TYPE_SPIN_TYPE,
-    GTK_TYPE_ENUM, _gtk_spin_type_values },
-  { "GtkToolbarChildType", &GTK_TYPE_TOOLBAR_CHILD_TYPE,
-    GTK_TYPE_ENUM, _gtk_toolbar_child_type_values },
-  { "GtkTreeViewMode", &GTK_TYPE_TREE_VIEW_MODE,
-    GTK_TYPE_ENUM, _gtk_tree_view_mode_values },
-  { "GtkFundamentalType", &GTK_TYPE_FUNDAMENTAL_TYPE,
-    GTK_TYPE_ENUM, _gtk_fundamental_type_values },
-  { "GtkWidgetFlags", &GTK_TYPE_WIDGET_FLAGS,
-    GTK_TYPE_FLAGS, _gtk_widget_flags_values },
-  { "GdkColorInfoFlags", &GTK_TYPE_GDK_COLOR_INFO_FLAGS,
-    GTK_TYPE_FLAGS, _gdk_color_info_flags_values },
-  { "GdkDebugFlag", &GTK_TYPE_GDK_DEBUG_FLAG,
-    GTK_TYPE_FLAGS, _gdk_debug_flag_values },
-  { "GdkRgbDither", &GTK_TYPE_GDK_RGB_DITHER,
-    GTK_TYPE_ENUM, _gdk_rgb_dither_values },
-  { "GdkWindowType", &GTK_TYPE_GDK_WINDOW_TYPE,
-    GTK_TYPE_ENUM, _gdk_window_type_values },
-  { "GdkWindowClass", &GTK_TYPE_GDK_WINDOW_CLASS,
-    GTK_TYPE_ENUM, _gdk_window_class_values },
-  { "GdkImageType", &GTK_TYPE_GDK_IMAGE_TYPE,
-    GTK_TYPE_ENUM, _gdk_image_type_values },
-  { "GdkVisualType", &GTK_TYPE_GDK_VISUAL_TYPE,
-    GTK_TYPE_ENUM, _gdk_visual_type_values },
-  { "GdkFontType", &GTK_TYPE_GDK_FONT_TYPE,
-    GTK_TYPE_ENUM, _gdk_font_type_values },
-  { "GdkWindowAttributesType", &GTK_TYPE_GDK_WINDOW_ATTRIBUTES_TYPE,
-    GTK_TYPE_FLAGS, _gdk_window_attributes_type_values },
-  { "GdkWindowHints", &GTK_TYPE_GDK_WINDOW_HINTS,
-    GTK_TYPE_FLAGS, _gdk_window_hints_values },
-  { "GdkFunction", &GTK_TYPE_GDK_FUNCTION,
-    GTK_TYPE_ENUM, _gdk_function_values },
-  { "GdkFill", &GTK_TYPE_GDK_FILL,
-    GTK_TYPE_ENUM, _gdk_fill_values },
-  { "GdkFillRule", &GTK_TYPE_GDK_FILL_RULE,
-    GTK_TYPE_ENUM, _gdk_fill_rule_values },
-  { "GdkLineStyle", &GTK_TYPE_GDK_LINE_STYLE,
-    GTK_TYPE_ENUM, _gdk_line_style_values },
-  { "GdkCapStyle", &GTK_TYPE_GDK_CAP_STYLE,
-    GTK_TYPE_ENUM, _gdk_cap_style_values },
-  { "GdkJoinStyle", &GTK_TYPE_GDK_JOIN_STYLE,
-    GTK_TYPE_ENUM, _gdk_join_style_values },
-  { "GdkCursorType", &GTK_TYPE_GDK_CURSOR_TYPE,
-    GTK_TYPE_ENUM, _gdk_cursor_type_values },
-  { "GdkFilterReturn", &GTK_TYPE_GDK_FILTER_RETURN,
-    GTK_TYPE_ENUM, _gdk_filter_return_values },
-  { "GdkVisibilityState", &GTK_TYPE_GDK_VISIBILITY_STATE,
-    GTK_TYPE_ENUM, _gdk_visibility_state_values },
-  { "GdkEventType", &GTK_TYPE_GDK_EVENT_TYPE,
-    GTK_TYPE_ENUM, _gdk_event_type_values },
-  { "GdkEventMask", &GTK_TYPE_GDK_EVENT_MASK,
-    GTK_TYPE_FLAGS, _gdk_event_mask_values },
-  { "GdkNotifyType", &GTK_TYPE_GDK_NOTIFY_TYPE,
-    GTK_TYPE_ENUM, _gdk_notify_type_values },
-  { "GdkCrossingMode", &GTK_TYPE_GDK_CROSSING_MODE,
-    GTK_TYPE_ENUM, _gdk_crossing_mode_values },
-  { "GdkModifierType", &GTK_TYPE_GDK_MODIFIER_TYPE,
-    GTK_TYPE_FLAGS, _gdk_modifier_type_values },
-  { "GdkSubwindowMode", &GTK_TYPE_GDK_SUBWINDOW_MODE,
-    GTK_TYPE_ENUM, _gdk_subwindow_mode_values },
-  { "GdkInputCondition", &GTK_TYPE_GDK_INPUT_CONDITION,
-    GTK_TYPE_FLAGS, _gdk_input_condition_values },
-  { "GdkStatus", &GTK_TYPE_GDK_STATUS,
-    GTK_TYPE_ENUM, _gdk_status_values },
-  { "GdkByteOrder", &GTK_TYPE_GDK_BYTE_ORDER,
-    GTK_TYPE_ENUM, _gdk_byte_order_values },
-  { "GdkGCValuesMask", &GTK_TYPE_GDK_GC_VALUES_MASK,
-    GTK_TYPE_FLAGS, _gdk_gc_values_mask_values },
-  { "GdkSelection", &GTK_TYPE_GDK_SELECTION,
-    GTK_TYPE_ENUM, _gdk_selection_values },
-  { "GdkPropertyState", &GTK_TYPE_GDK_PROPERTY_STATE,
-    GTK_TYPE_ENUM, _gdk_property_state_values },
-  { "GdkPropMode", &GTK_TYPE_GDK_PROP_MODE,
-    GTK_TYPE_ENUM, _gdk_prop_mode_values },
-  { "GdkDndType", &GTK_TYPE_GDK_DND_TYPE,
-    GTK_TYPE_ENUM, _gdk_dnd_type_values },
-  { "GdkInputSource", &GTK_TYPE_GDK_INPUT_SOURCE,
-    GTK_TYPE_ENUM, _gdk_input_source_values },
-  { "GdkInputMode", &GTK_TYPE_GDK_INPUT_MODE,
-    GTK_TYPE_ENUM, _gdk_input_mode_values },
-  { "GdkAxisUse", &GTK_TYPE_GDK_AXIS_USE,
-    GTK_TYPE_ENUM, _gdk_axis_use_values },
-  { "GdkTarget", &GTK_TYPE_GDK_TARGET,
-    GTK_TYPE_ENUM, _gdk_target_values },
-  { "GdkSelectionType", &GTK_TYPE_GDK_SELECTION_TYPE,
-    GTK_TYPE_ENUM, _gdk_selection_type_values },
-  { "GdkExtensionMode", &GTK_TYPE_GDK_EXTENSION_MODE,
-    GTK_TYPE_ENUM, _gdk_extension_mode_values },
-  { "GdkIMStyle", &GTK_TYPE_GDK_IM_STYLE,
-    GTK_TYPE_FLAGS, _gdk_im_style_values },
-  { "GdkWMDecoration", &GTK_TYPE_GDK_WM_DECORATION,
-    GTK_TYPE_FLAGS, _gdk_wm_decoration_values },
-  { "GdkWMFunction", &GTK_TYPE_GDK_WM_FUNCTION,
-    GTK_TYPE_FLAGS, _gdk_wm_function_values },
-  { "GdkColorContextMode", &GTK_TYPE_GDK_COLOR_CONTEXT_MODE,
-    GTK_TYPE_ENUM, _gdk_color_context_mode_values },
-  { "GdkOverlapType", &GTK_TYPE_GDK_OVERLAP_TYPE,
-    GTK_TYPE_ENUM, _gdk_overlap_type_values },
-  { "GtkAccelGroup", &GTK_TYPE_ACCEL_GROUP,
-    GTK_TYPE_BOXED, NULL },
-  { "GtkSelectionData", &GTK_TYPE_SELECTION_DATA,
-    GTK_TYPE_BOXED, NULL },
-  { "GtkStyle", &GTK_TYPE_STYLE,
-    GTK_TYPE_BOXED, NULL },
-  { "GdkColormap", &GTK_TYPE_GDK_COLORMAP,
-    GTK_TYPE_BOXED, NULL },
-  { "GdkVisual", &GTK_TYPE_GDK_VISUAL,
-    GTK_TYPE_BOXED, NULL },
-  { "GdkFont", &GTK_TYPE_GDK_FONT,
-    GTK_TYPE_BOXED, NULL },
-  { "GdkWindow", &GTK_TYPE_GDK_WINDOW,
-    GTK_TYPE_BOXED, NULL },
-  { "GdkEvent", &GTK_TYPE_GDK_EVENT,
-    GTK_TYPE_BOXED, NULL },
-  { "GdkColor", &GTK_TYPE_GDK_COLOR,
-    GTK_TYPE_BOXED, NULL },
diff --git a/gtk/gtktypebuiltins_vars.c b/gtk/gtktypebuiltins_vars.c
deleted file mode 100644
index 91b31a50c0..0000000000
--- a/gtk/gtktypebuiltins_vars.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* type variables, generated by maketypes.awk */
-
-GtkType GTK_TYPE_CELL_TYPE = 0;
-GtkType GTK_TYPE_C_TREE_POS = 0;
-GtkType GTK_TYPE_C_TREE_LINE_STYLE = 0;
-GtkType GTK_TYPE_C_TREE_EXPANSION_TYPE = 0;
-GtkType GTK_TYPE_DEBUG_FLAG = 0;
-GtkType GTK_TYPE_ACCEL_FLAGS = 0;
-GtkType GTK_TYPE_ARROW_TYPE = 0;
-GtkType GTK_TYPE_ATTACH_OPTIONS = 0;
-GtkType GTK_TYPE_BUTTON_BOX_STYLE = 0;
-GtkType GTK_TYPE_CURVE_TYPE = 0;
-GtkType GTK_TYPE_DIRECTION_TYPE = 0;
-GtkType GTK_TYPE_JUSTIFICATION = 0;
-GtkType GTK_TYPE_MATCH_TYPE = 0;
-GtkType GTK_TYPE_MENU_DIRECTION_TYPE = 0;
-GtkType GTK_TYPE_MENU_FACTORY_TYPE = 0;
-GtkType GTK_TYPE_METRIC_TYPE = 0;
-GtkType GTK_TYPE_ORIENTATION = 0;
-GtkType GTK_TYPE_PACK_TYPE = 0;
-GtkType GTK_TYPE_PATH_PRIORITY_TYPE = 0;
-GtkType GTK_TYPE_PATH_TYPE = 0;
-GtkType GTK_TYPE_POLICY_TYPE = 0;
-GtkType GTK_TYPE_POSITION_TYPE = 0;
-GtkType GTK_TYPE_PREVIEW_TYPE = 0;
-GtkType GTK_TYPE_RELIEF_STYLE = 0;
-GtkType GTK_TYPE_RESIZE_MODE = 0;
-GtkType GTK_TYPE_SIGNAL_RUN_TYPE = 0;
-GtkType GTK_TYPE_SCROLL_TYPE = 0;
-GtkType GTK_TYPE_SELECTION_MODE = 0;
-GtkType GTK_TYPE_SHADOW_TYPE = 0;
-GtkType GTK_TYPE_STATE_TYPE = 0;
-GtkType GTK_TYPE_SUBMENU_DIRECTION = 0;
-GtkType GTK_TYPE_SUBMENU_PLACEMENT = 0;
-GtkType GTK_TYPE_TOOLBAR_STYLE = 0;
-GtkType GTK_TYPE_TROUGH_TYPE = 0;
-GtkType GTK_TYPE_UPDATE_TYPE = 0;
-GtkType GTK_TYPE_VISIBILITY = 0;
-GtkType GTK_TYPE_WINDOW_POSITION = 0;
-GtkType GTK_TYPE_WINDOW_TYPE = 0;
-GtkType GTK_TYPE_SORT_TYPE = 0;
-GtkType GTK_TYPE_FONT_METRIC_TYPE = 0;
-GtkType GTK_TYPE_OBJECT_FLAGS = 0;
-GtkType GTK_TYPE_ARG_FLAGS = 0;
-GtkType GTK_TYPE_PACKER_OPTIONS = 0;
-GtkType GTK_TYPE_SIDE_TYPE = 0;
-GtkType GTK_TYPE_ANCHOR_TYPE = 0;
-GtkType GTK_TYPE_PRIVATE_FLAGS = 0;
-GtkType GTK_TYPE_PROGRESS_BAR_STYLE = 0;
-GtkType GTK_TYPE_PROGRESS_BAR_ORIENTATION = 0;
-GtkType GTK_TYPE_RC_TOKEN_TYPE = 0;
-GtkType GTK_TYPE_SPIN_BUTTON_UPDATE_POLICY = 0;
-GtkType GTK_TYPE_SPIN_TYPE = 0;
-GtkType GTK_TYPE_TOOLBAR_CHILD_TYPE = 0;
-GtkType GTK_TYPE_TREE_VIEW_MODE = 0;
-GtkType GTK_TYPE_FUNDAMENTAL_TYPE = 0;
-GtkType GTK_TYPE_WIDGET_FLAGS = 0;
-GtkType GTK_TYPE_GDK_COLOR_INFO_FLAGS = 0;
-GtkType GTK_TYPE_GDK_DEBUG_FLAG = 0;
-GtkType GTK_TYPE_GDK_RGB_DITHER = 0;
-GtkType GTK_TYPE_GDK_WINDOW_TYPE = 0;
-GtkType GTK_TYPE_GDK_WINDOW_CLASS = 0;
-GtkType GTK_TYPE_GDK_IMAGE_TYPE = 0;
-GtkType GTK_TYPE_GDK_VISUAL_TYPE = 0;
-GtkType GTK_TYPE_GDK_FONT_TYPE = 0;
-GtkType GTK_TYPE_GDK_WINDOW_ATTRIBUTES_TYPE = 0;
-GtkType GTK_TYPE_GDK_WINDOW_HINTS = 0;
-GtkType GTK_TYPE_GDK_FUNCTION = 0;
-GtkType GTK_TYPE_GDK_FILL = 0;
-GtkType GTK_TYPE_GDK_FILL_RULE = 0;
-GtkType GTK_TYPE_GDK_LINE_STYLE = 0;
-GtkType GTK_TYPE_GDK_CAP_STYLE = 0;
-GtkType GTK_TYPE_GDK_JOIN_STYLE = 0;
-GtkType GTK_TYPE_GDK_CURSOR_TYPE = 0;
-GtkType GTK_TYPE_GDK_FILTER_RETURN = 0;
-GtkType GTK_TYPE_GDK_VISIBILITY_STATE = 0;
-GtkType GTK_TYPE_GDK_EVENT_TYPE = 0;
-GtkType GTK_TYPE_GDK_EVENT_MASK = 0;
-GtkType GTK_TYPE_GDK_NOTIFY_TYPE = 0;
-GtkType GTK_TYPE_GDK_CROSSING_MODE = 0;
-GtkType GTK_TYPE_GDK_MODIFIER_TYPE = 0;
-GtkType GTK_TYPE_GDK_SUBWINDOW_MODE = 0;
-GtkType GTK_TYPE_GDK_INPUT_CONDITION = 0;
-GtkType GTK_TYPE_GDK_STATUS = 0;
-GtkType GTK_TYPE_GDK_BYTE_ORDER = 0;
-GtkType GTK_TYPE_GDK_GC_VALUES_MASK = 0;
-GtkType GTK_TYPE_GDK_SELECTION = 0;
-GtkType GTK_TYPE_GDK_PROPERTY_STATE = 0;
-GtkType GTK_TYPE_GDK_PROP_MODE = 0;
-GtkType GTK_TYPE_GDK_DND_TYPE = 0;
-GtkType GTK_TYPE_GDK_INPUT_SOURCE = 0;
-GtkType GTK_TYPE_GDK_INPUT_MODE = 0;
-GtkType GTK_TYPE_GDK_AXIS_USE = 0;
-GtkType GTK_TYPE_GDK_TARGET = 0;
-GtkType GTK_TYPE_GDK_SELECTION_TYPE = 0;
-GtkType GTK_TYPE_GDK_EXTENSION_MODE = 0;
-GtkType GTK_TYPE_GDK_IM_STYLE = 0;
-GtkType GTK_TYPE_GDK_WM_DECORATION = 0;
-GtkType GTK_TYPE_GDK_WM_FUNCTION = 0;
-GtkType GTK_TYPE_GDK_COLOR_CONTEXT_MODE = 0;
-GtkType GTK_TYPE_GDK_OVERLAP_TYPE = 0;
-GtkType GTK_TYPE_ACCEL_GROUP = 0;
-GtkType GTK_TYPE_SELECTION_DATA = 0;
-GtkType GTK_TYPE_STYLE = 0;
-GtkType GTK_TYPE_GDK_COLORMAP = 0;
-GtkType GTK_TYPE_GDK_VISUAL = 0;
-GtkType GTK_TYPE_GDK_FONT = 0;
-GtkType GTK_TYPE_GDK_WINDOW = 0;
-GtkType GTK_TYPE_GDK_EVENT = 0;
-GtkType GTK_TYPE_GDK_COLOR = 0;