Use G_TYPE_INSTANCE_GET_INTERFACE. ditto. ditto. ditto. Don't reference

2002-01-08  Mike Kestner  <mkestner@speakeasy.net>

	* gtk/gtkcelleditable.h : Use G_TYPE_INSTANCE_GET_INTERFACE.
	* gtk/gtktreednd.h : ditto.
	* gtk/gtktreemodel.h : ditto.
	* gtk/gtktreesortable.h : ditto.
	* gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.

12 files changed, 62 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index c6e2a7828e..5ab5f10136 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2002-01-08  Mike Kestner  <mkestner@speakeasy.net>
+
+	* gtk/gtkcelleditable.h : Use G_TYPE_INSTANCE_GET_INTERFACE.
+	* gtk/gtktreednd.h : ditto.
+	* gtk/gtktreemodel.h : ditto.
+	* gtk/gtktreesortable.h : ditto.
+	* gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
+
 2002-01-08  Matthias Clasen  <matthiasc@poet.de>
 
 	* gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather 
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index c6e2a7828e..5ab5f10136 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,11 @@
+2002-01-08  Mike Kestner  <mkestner@speakeasy.net>
+
+	* gtk/gtkcelleditable.h : Use G_TYPE_INSTANCE_GET_INTERFACE.
+	* gtk/gtktreednd.h : ditto.
+	* gtk/gtktreemodel.h : ditto.
+	* gtk/gtktreesortable.h : ditto.
+	* gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
+
 2002-01-08  Matthias Clasen  <matthiasc@poet.de>
 
 	* gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather 
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index c6e2a7828e..5ab5f10136 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,11 @@
+2002-01-08  Mike Kestner  <mkestner@speakeasy.net>
+
+	* gtk/gtkcelleditable.h : Use G_TYPE_INSTANCE_GET_INTERFACE.
+	* gtk/gtktreednd.h : ditto.
+	* gtk/gtktreemodel.h : ditto.
+	* gtk/gtktreesortable.h : ditto.
+	* gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
+
 2002-01-08  Matthias Clasen  <matthiasc@poet.de>
 
 	* gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather 
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index c6e2a7828e..5ab5f10136 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,11 @@
+2002-01-08  Mike Kestner  <mkestner@speakeasy.net>
+
+	* gtk/gtkcelleditable.h : Use G_TYPE_INSTANCE_GET_INTERFACE.
+	* gtk/gtktreednd.h : ditto.
+	* gtk/gtktreemodel.h : ditto.
+	* gtk/gtktreesortable.h : ditto.
+	* gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
+
 2002-01-08  Matthias Clasen  <matthiasc@poet.de>
 
 	* gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather 
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index c6e2a7828e..5ab5f10136 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,11 @@
+2002-01-08  Mike Kestner  <mkestner@speakeasy.net>
+
+	* gtk/gtkcelleditable.h : Use G_TYPE_INSTANCE_GET_INTERFACE.
+	* gtk/gtktreednd.h : ditto.
+	* gtk/gtktreemodel.h : ditto.
+	* gtk/gtktreesortable.h : ditto.
+	* gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
+
 2002-01-08  Matthias Clasen  <matthiasc@poet.de>
 
 	* gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather 
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index c6e2a7828e..5ab5f10136 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,11 @@
+2002-01-08  Mike Kestner  <mkestner@speakeasy.net>
+
+	* gtk/gtkcelleditable.h : Use G_TYPE_INSTANCE_GET_INTERFACE.
+	* gtk/gtktreednd.h : ditto.
+	* gtk/gtktreemodel.h : ditto.
+	* gtk/gtktreesortable.h : ditto.
+	* gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
+
 2002-01-08  Matthias Clasen  <matthiasc@poet.de>
 
 	* gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather 
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index c6e2a7828e..5ab5f10136 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,11 @@
+2002-01-08  Mike Kestner  <mkestner@speakeasy.net>
+
+	* gtk/gtkcelleditable.h : Use G_TYPE_INSTANCE_GET_INTERFACE.
+	* gtk/gtktreednd.h : ditto.
+	* gtk/gtktreemodel.h : ditto.
+	* gtk/gtktreesortable.h : ditto.
+	* gtk/gtkwidget.h : Don't reference incomplete _GdkRectangle type.
+
 2002-01-08  Matthias Clasen  <matthiasc@poet.de>
 
 	* gtk/gtkplug.c, gtk/gtksocket.c: Speak of window IDs rather 
diff --git a/gtk/gtkcelleditable.h b/gtk/gtkcelleditable.h
index d56624b0f9..10cde8e89d 100644
--- a/gtk/gtkcelleditable.h
+++ b/gtk/gtkcelleditable.h
@@ -28,7 +28,7 @@ G_BEGIN_DECLS
 #define GTK_CELL_EDITABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_EDITABLE, GtkCellEditable))
 #define GTK_CELL_EDITABLE_CLASS(obj)      (G_TYPE_CHECK_CLASS_CAST ((obj), GTK_TYPE_CELL_EDITABLE, GtkCellEditableIface))
 #define GTK_IS_CELL_EDITABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_EDITABLE))
-#define GTK_CELL_EDITABLE_GET_IFACE(obj)  ((GtkCellEditableIface *)g_type_interface_peek (((GTypeInstance *) GTK_CELL_EDITABLE (obj))->g_class, GTK_TYPE_CELL_EDITABLE))
+#define GTK_CELL_EDITABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_CELL_EDITABLE, GtkCellEditableIface))
 
 typedef struct _GtkCellEditable      GtkCellEditable; /* Dummy typedef */
 typedef struct _GtkCellEditableIface GtkCellEditableIface;
diff --git a/gtk/gtktreednd.h b/gtk/gtktreednd.h
index 74a796755d..49c6dabd67 100644
--- a/gtk/gtktreednd.h
+++ b/gtk/gtktreednd.h
@@ -30,7 +30,7 @@ extern "C" {
 #define GTK_TYPE_TREE_DRAG_SOURCE            (gtk_tree_drag_source_get_type ())
 #define GTK_TREE_DRAG_SOURCE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_DRAG_SOURCE, GtkTreeDragSource))
 #define GTK_IS_TREE_DRAG_SOURCE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_DRAG_SOURCE))
-#define GTK_TREE_DRAG_SOURCE_GET_IFACE(obj)  ((GtkTreeDragSourceIface *)g_type_interface_peek (((GTypeInstance *)GTK_TREE_DRAG_SOURCE (obj))->g_class, GTK_TYPE_TREE_DRAG_SOURCE))
+#define GTK_TREE_DRAG_SOURCE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_TREE_DRAG_SOURCE, GtkTreeDragSourceIface))
 
 typedef struct _GtkTreeDragSource      GtkTreeDragSource; /* Dummy typedef */
 typedef struct _GtkTreeDragSourceIface GtkTreeDragSourceIface;
@@ -72,7 +72,7 @@ gboolean gtk_tree_drag_source_drag_data_get    (GtkTreeDragSource *drag_source,
 #define GTK_TYPE_TREE_DRAG_DEST            (gtk_tree_drag_dest_get_type ())
 #define GTK_TREE_DRAG_DEST(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_DRAG_DEST, GtkTreeDragDest))
 #define GTK_IS_TREE_DRAG_DEST(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_DRAG_DEST))
-#define GTK_TREE_DRAG_DEST_GET_IFACE(obj)  ((GtkTreeDragDestIface *)g_type_interface_peek (((GTypeInstance *)GTK_TREE_DRAG_DEST (obj))->g_class, GTK_TYPE_TREE_DRAG_DEST))
+#define GTK_TREE_DRAG_DEST_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_TREE_DRAG_DEST, GtkTreeDragDestIface))
 
 typedef struct _GtkTreeDragDest      GtkTreeDragDest; /* Dummy typedef */
 typedef struct _GtkTreeDragDestIface GtkTreeDragDestIface;
diff --git a/gtk/gtktreemodel.h b/gtk/gtktreemodel.h
index 3182b519ea..6461e72b11 100644
--- a/gtk/gtktreemodel.h
+++ b/gtk/gtktreemodel.h
@@ -29,7 +29,7 @@ extern "C" {
 #define GTK_TYPE_TREE_MODEL            (gtk_tree_model_get_type ())
 #define GTK_TREE_MODEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_MODEL, GtkTreeModel))
 #define GTK_IS_TREE_MODEL(obj)	       (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_MODEL))
-#define GTK_TREE_MODEL_GET_IFACE(obj)  ((GtkTreeModelIface *)g_type_interface_peek (((GTypeInstance *)GTK_TREE_MODEL (obj))->g_class, GTK_TYPE_TREE_MODEL))
+#define GTK_TREE_MODEL_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_TREE_MODEL, GtkTreeModelIface))
 
 typedef struct _GtkTreeIter         GtkTreeIter;
 typedef struct _GtkTreePath         GtkTreePath;
diff --git a/gtk/gtktreesortable.h b/gtk/gtktreesortable.h
index 11cbc84f11..73df07b227 100644
--- a/gtk/gtktreesortable.h
+++ b/gtk/gtktreesortable.h
@@ -28,7 +28,7 @@ G_BEGIN_DECLS
 #define GTK_TREE_SORTABLE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_TREE_SORTABLE, GtkTreeSortable))
 #define GTK_TREE_SORTABLE_CLASS(obj)      (G_TYPE_CHECK_CLASS_CAST ((obj), GTK_TYPE_TREE_SORTABLE, GtkTreeSortableIface))
 #define GTK_IS_TREE_SORTABLE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_TREE_SORTABLE))
-#define GTK_TREE_SORTABLE_GET_IFACE(obj)  ((GtkTreeSortableIface *)g_type_interface_peek (((GTypeInstance *)GTK_TREE_SORTABLE (obj))->g_class, GTK_TYPE_TREE_SORTABLE))
+#define GTK_TREE_SORTABLE_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_TREE_SORTABLE, GtkTreeSortableIface))
 
 enum {
   GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID = -1
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 08940458b0..70a3890747 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -135,7 +135,7 @@ typedef enum
 /* forward declaration to avoid excessive includes (and concurrent includes)
  */
 typedef struct _GtkRequisition	   GtkRequisition;
-typedef struct _GdkRectangle	   GtkAllocation;
+typedef 	GdkRectangle	   GtkAllocation;
 typedef struct _GtkSelectionData   GtkSelectionData;
 typedef struct _GtkWidgetClass	   GtkWidgetClass;
 typedef struct _GtkWidgetAuxInfo   GtkWidgetAuxInfo;