Delete.

2001-03-14  Havoc Pennington  <hp@redhat.com>

        * gtk/gtkdata.h, gtk/gtkdata.c: Delete.

	* gtk/gtk.h: remove gtkdata.h

	* gtk/Makefile.am: remove gtkdata

	* gtk/gtktext.c (gtk_text_set_adjustments): connect to "destroy"
	not "disconnect" on the adjustments.

	* gtk/gtktooltips.h, gtk/gtktooltips.c: derive from GtkObject not
	GtkData

	* gtk/gtkadjustment.h, gtk/gtkadjustment.c: derive from GtkObject
	not GtkData

	* configure.in: handle case where X render exists, but Pango lacks
	Xft support.

2001-03-14  Havoc Pennington  <hp@redhat.com>

	* Makefile.am (gdk-pixbuf-marshal.c): Use different temporary file
	from gdk-pixbuf-marshal.h, fixes parallel makes.

2001-03-14  Havoc Pennington  <hp@redhat.com>

	* gtk/gtk-docs.sgml: remove gtkdata, gtktreemodelsimple

	* gtk/gtk.types: remove gtk_data_get_type

9 files changed, 19 insertions, 177 deletions

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index e9feac73e4..623759da91 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -79,7 +79,6 @@ gtk_public_h_sources = @STRIP_BEGIN@ \
 	gtkcellrenderertextpixbuf.h	\
 	gtkcellrenderertoggle.h	\
 	gtkcellrendererpixbuf.h	\
-	gtkdata.h		\
 	gtkdebug.h              \
 	gtkdialog.h		\
 	gtkdnd.h		\
@@ -238,7 +237,6 @@ gtk_c_sources = @STRIP_BEGIN@   \
 	gtkcontainer.c		\
 	gtkctree.c		\
 	gtkcurve.c		\
-	gtkdata.c		\
 	gtkdialog.c		\
 	gtkdnd.c		\
 	gtkdrawingarea.c	\
diff --git a/gtk/gtk.h b/gtk/gtk.h
index f1676ca084..c1df20b2ad 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -58,7 +58,6 @@
 #include <gtk/gtkcontainer.h>
 #include <gtk/gtkctree.h>
 #include <gtk/gtkcurve.h>
-#include <gtk/gtkdata.h>
 #include <gtk/gtkdialog.h>
 #include <gtk/gtkdnd.h>
 #include <gtk/gtkdrawingarea.h>
diff --git a/gtk/gtkadjustment.c b/gtk/gtkadjustment.c
index a23aa3e804..c5cc64f966 100644
--- a/gtk/gtkadjustment.c
+++ b/gtk/gtkadjustment.c
@@ -61,7 +61,7 @@ gtk_adjustment_get_type (void)
         (GtkClassInitFunc) NULL,
       };
 
-      adjustment_type = gtk_type_unique (GTK_TYPE_DATA, &adjustment_info);
+      adjustment_type = gtk_type_unique (GTK_TYPE_OBJECT, &adjustment_info);
     }
 
   return adjustment_type;
diff --git a/gtk/gtkadjustment.h b/gtk/gtkadjustment.h
index 01df904176..3a9a48d46e 100644
--- a/gtk/gtkadjustment.h
+++ b/gtk/gtkadjustment.h
@@ -29,7 +29,7 @@
 
 
 #include <gdk/gdk.h>
-#include <gtk/gtkdata.h>
+#include <gtk/gtkobject.h>
 
 
 #ifdef __cplusplus
@@ -50,7 +50,7 @@ typedef struct _GtkAdjustmentClass  GtkAdjustmentClass;
 
 struct _GtkAdjustment
 {
-  GtkData data;
+  GtkObject parent_instance;
   
   gfloat lower;
   gfloat upper;
@@ -62,7 +62,7 @@ struct _GtkAdjustment
 
 struct _GtkAdjustmentClass
 {
-  GtkDataClass parent_class;
+  GtkObjectClass parent_class;
   
   void (* changed)	 (GtkAdjustment *adjustment);
   void (* value_changed) (GtkAdjustment *adjustment);
diff --git a/gtk/gtkdata.c b/gtk/gtkdata.c
deleted file mode 100644
index 1b7d677993..0000000000
--- a/gtk/gtkdata.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#include "gtkdata.h"
-#include "gtksignal.h"
-
-
-enum {
-  DISCONNECT,
-  LAST_SIGNAL
-};
-
-
-static void gtk_data_class_init (GtkDataClass *klass);
-
-
-static guint data_signals[LAST_SIGNAL] = { 0 };
-
-
-GtkType
-gtk_data_get_type (void)
-{
-  static GtkType data_type = 0;
-
-  if (!data_type)
-    {
-      static const GtkTypeInfo data_info =
-      {
-	"GtkData",
-	sizeof (GtkData),
-	sizeof (GtkDataClass),
-	(GtkClassInitFunc) gtk_data_class_init,
-	(GtkObjectInitFunc) NULL,
-	/* reserved_1 */ NULL,
-        /* reserved_2 */ NULL,
-        (GtkClassInitFunc) NULL,
-      };
-
-      data_type = gtk_type_unique (gtk_object_get_type (), &data_info);
-    }
-
-  return data_type;
-}
-
-static void
-gtk_data_class_init (GtkDataClass *class)
-{
-  GtkObjectClass *object_class;
-
-  object_class = (GtkObjectClass*) class;
-
-  data_signals[DISCONNECT] =
-    gtk_signal_new ("disconnect",
-                    GTK_RUN_FIRST,
-                    GTK_CLASS_TYPE (object_class),
-                    GTK_SIGNAL_OFFSET (GtkDataClass, disconnect),
-                    gtk_marshal_VOID__VOID,
-		    GTK_TYPE_NONE, 0);
-}
-
diff --git a/gtk/gtkdata.h b/gtk/gtkdata.h
deleted file mode 100644
index 04a63f6c78..0000000000
--- a/gtk/gtkdata.h
+++ /dev/null
@@ -1,72 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/*
- * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
- * file for a list of people on the GTK+ Team.  See the ChangeLog
- * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
- */
-
-#ifndef __GTK_DATA_H__
-#define __GTK_DATA_H__
-
-
-#include <gdk/gdk.h>
-#include <gtk/gtkobject.h>
-
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-
-#define GTK_TYPE_DATA            (gtk_data_get_type ())
-#define GTK_DATA(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_DATA, GtkData))
-#define GTK_DATA_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_DATA, GtkDataClass))
-#define GTK_IS_DATA(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_DATA))
-#define GTK_IS_DATA_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_DATA))
-#define GTK_DATA_GET_CLASS(obj)  (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_DATA, GtkDataClass))
-
-
-typedef struct _GtkData       GtkData;
-typedef struct _GtkDataClass  GtkDataClass;
-
-struct _GtkData
-{
-  GtkObject object;
-};
-
-struct _GtkDataClass
-{
-  GtkObjectClass parent_class;
-
-  void (* disconnect) (GtkData *data);
-};
-
-
-GtkType gtk_data_get_type (void) G_GNUC_CONST;
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
-
-
-#endif /* __GTK_DATA_H__ */
diff --git a/gtk/gtktext.c b/gtk/gtktext.c
index 9a9829b45e..5a8d86f1a1 100644
--- a/gtk/gtktext.c
+++ b/gtk/gtktext.c
@@ -217,9 +217,6 @@ static void  gtk_text_size_allocate  (GtkWidget      *widget,
 				      GtkAllocation  *allocation);
 static void  gtk_text_adjustment     (GtkAdjustment  *adjustment,
 				      GtkText        *text);
-static void  gtk_text_disconnect     (GtkAdjustment  *adjustment,
-				      GtkText        *text);
-
 static void   gtk_text_insert_text       (GtkOldEditable *old_editable,
 					  const gchar    *new_text,
 					  gint            new_text_length,
@@ -239,6 +236,9 @@ static void   gtk_text_set_selection     (GtkOldEditable *old_editable,
 static void   gtk_text_real_set_editable (GtkOldEditable *old_editable,
 					  gboolean        is_editable);
 
+static void  gtk_text_adjustment_destroyed (GtkAdjustment  *adjustment,
+                                            GtkText        *text);
+
 /* Event handlers */
 static gint  gtk_text_expose            (GtkWidget         *widget,
 					 GdkEventExpose    *event);
@@ -844,8 +844,8 @@ gtk_text_set_adjustments (GtkText       *text,
       gtk_signal_connect (GTK_OBJECT (text->hadj), "value_changed",
 			  (GtkSignalFunc) gtk_text_adjustment,
 			  text);
-      gtk_signal_connect (GTK_OBJECT (text->hadj), "disconnect",
-			  (GtkSignalFunc) gtk_text_disconnect,
+      gtk_signal_connect (GTK_OBJECT (text->hadj), "destroy",
+			  (GtkSignalFunc) gtk_text_adjustment_destroyed,
 			  text);
       gtk_text_adjustment (hadj, text);
     }
@@ -862,8 +862,8 @@ gtk_text_set_adjustments (GtkText       *text,
       gtk_signal_connect (GTK_OBJECT (text->vadj), "value_changed",
 			  (GtkSignalFunc) gtk_text_adjustment,
 			  text);
-      gtk_signal_connect (GTK_OBJECT (text->vadj), "disconnect",
-			  (GtkSignalFunc) gtk_text_disconnect,
+      gtk_signal_connect (GTK_OBJECT (text->vadj), "destroy",
+			  (GtkSignalFunc) gtk_text_adjustment_destroyed,
 			  text);
       gtk_text_adjustment (vadj, text);
     }
@@ -2194,8 +2194,8 @@ gtk_text_adjustment (GtkAdjustment *adjustment,
 }
 
 static void
-gtk_text_disconnect (GtkAdjustment *adjustment,
-		     GtkText       *text)
+gtk_text_adjustment_destroyed (GtkAdjustment *adjustment,
+                               GtkText       *text)
 {
   g_return_if_fail (adjustment != NULL);
   g_return_if_fail (GTK_IS_ADJUSTMENT (adjustment));
diff --git a/gtk/gtktooltips.c b/gtk/gtktooltips.c
index faf7254340..acc5c6a8d4 100644
--- a/gtk/gtktooltips.c
+++ b/gtk/gtktooltips.c
@@ -62,7 +62,7 @@ static gint gtk_tooltips_timeout           (gpointer     data);
 static gint gtk_tooltips_paint_window      (GtkTooltips *tooltips);
 static void gtk_tooltips_draw_tips         (GtkTooltips *tooltips);
 
-static GtkDataClass *parent_class;
+static GtkObjectClass *parent_class;
 static const gchar  *tooltips_data_key = "_GtkTooltipsData";
 
 GtkType
@@ -84,7 +84,7 @@ gtk_tooltips_get_type (void)
         (GtkClassInitFunc) NULL,
       };
 
-      tooltips_type = gtk_type_unique (GTK_TYPE_DATA, &tooltips_info);
+      tooltips_type = gtk_type_unique (GTK_TYPE_OBJECT, &tooltips_info);
     }
 
   return tooltips_type;
@@ -96,7 +96,7 @@ gtk_tooltips_class_init (GtkTooltipsClass *class)
   GtkObjectClass *object_class;
 
   object_class = (GtkObjectClass*) class;
-  parent_class = gtk_type_class (GTK_TYPE_DATA);
+  parent_class = gtk_type_class (GTK_TYPE_OBJECT);
 
   object_class->destroy = gtk_tooltips_destroy;
 }
diff --git a/gtk/gtktooltips.h b/gtk/gtktooltips.h
index 12adf631d5..1f2b13b009 100644
--- a/gtk/gtktooltips.h
+++ b/gtk/gtktooltips.h
@@ -28,7 +28,7 @@
 #define __GTK_TOOLTIPS_H__
 
 #include <gdk/gdk.h>
-#include <gtk/gtkdata.h>
+#include <gtk/gtkobject.h>
 
 
 #ifdef __cplusplus
@@ -58,7 +58,7 @@ struct _GtkTooltipsData
 
 struct _GtkTooltips
 {
-  GtkData data;
+  GtkObject parent_instance;
 
   GtkWidget *tip_window;
   GtkWidget *tip_label;
@@ -74,7 +74,7 @@ struct _GtkTooltips
 
 struct _GtkTooltipsClass
 {
-  GtkDataClass parent_class;
+  GtkObjectClass parent_class;
 };
 
 GtkType		 gtk_tooltips_get_type	   (void) G_GNUC_CONST;