? autom4te-2.53.cache
? demos/gtk-demo/geninclude.pl
Index: gtk/gtkiconfactory.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkiconfactory.c,v
retrieving revision 1.38
diff -u -r1.38 gtkiconfactory.c
--- gtk/gtkiconfactory.c	29 Mar 2002 23:00:41 -0000	1.38
+++ gtk/gtkiconfactory.c	13 Jun 2002 21:21:54 -0000
@@ -1211,7 +1211,7 @@
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeIconSet",
+    our_type = g_boxed_type_register_static ("GtkIconSet",
 					     (GBoxedCopyFunc) gtk_icon_set_ref,
 					     (GBoxedFreeFunc) gtk_icon_set_unref);
 
@@ -1694,7 +1694,7 @@
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeIconSource",
+    our_type = g_boxed_type_register_static ("GtkIconSource",
 					     (GBoxedCopyFunc) gtk_icon_source_copy,
 					     (GBoxedFreeFunc) gtk_icon_source_free);
 
Index: gtk/gtkselection.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkselection.c,v
retrieving revision 1.50
diff -u -r1.50 gtkselection.c
--- gtk/gtkselection.c	2 Mar 2002 19:11:38 -0000	1.50
+++ gtk/gtkselection.c	13 Jun 2002 21:21:54 -0000
@@ -1825,7 +1825,7 @@
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeSelectionData",
+    our_type = g_boxed_type_register_static ("GtkSelectionData",
 					     (GBoxedCopyFunc) gtk_selection_data_copy,
 					     (GBoxedFreeFunc) gtk_selection_data_free);
 
Index: gtk/gtkstyle.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkstyle.c,v
retrieving revision 1.115
diff -u -r1.115 gtkstyle.c
--- gtk/gtkstyle.c	3 Mar 2002 19:59:27 -0000	1.115
+++ gtk/gtkstyle.c	13 Jun 2002 21:21:54 -0000
@@ -5554,7 +5554,7 @@
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeBorder",
+    our_type = g_boxed_type_register_static ("GtkBorder",
 					     (GBoxedCopyFunc) gtk_border_copy,
 					     (GBoxedFreeFunc) gtk_border_free);
 
Index: gtk/gtktextiter.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktextiter.c,v
retrieving revision 1.69.2.1
diff -u -r1.69.2.1 gtktextiter.c
--- gtk/gtktextiter.c	24 Apr 2002 22:09:17 -0000	1.69.2.1
+++ gtk/gtktextiter.c	13 Jun 2002 21:21:54 -0000
@@ -469,7 +469,7 @@
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeTextIter",
+    our_type = g_boxed_type_register_static ("GtkTextIter",
 					     (GBoxedCopyFunc) gtk_text_iter_copy,
 					     (GBoxedFreeFunc) gtk_text_iter_free);
 
Index: gtk/gtktexttag.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktexttag.c,v
retrieving revision 1.56
diff -u -r1.56 gtktexttag.c
--- gtk/gtktexttag.c	2 Mar 2002 19:11:41 -0000	1.56
+++ gtk/gtktexttag.c	13 Jun 2002 21:21:54 -0000
@@ -1871,7 +1871,7 @@
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeTextAttributes",
+    our_type = g_boxed_type_register_static ("GtkTextAttributes",
 					     (GBoxedCopyFunc) gtk_text_attributes_ref,
 					     (GBoxedFreeFunc) gtk_text_attributes_unref);
 
Index: gtk/gtktreemodel.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktreemodel.c,v
retrieving revision 1.84.2.2
diff -u -r1.84.2.2 gtktreemodel.c
--- gtk/gtktreemodel.c	10 May 2002 21:48:20 -0000	1.84.2.2
+++ gtk/gtktreemodel.c	13 Jun 2002 21:21:54 -0000
@@ -373,7 +373,7 @@
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeTreePath",
+    our_type = g_boxed_type_register_static ("GtkTreePath",
 					     (GBoxedCopyFunc) gtk_tree_path_copy,
 					     (GBoxedFreeFunc) gtk_tree_path_free);
 
@@ -597,7 +597,7 @@
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeTreeIter",
+    our_type = g_boxed_type_register_static ("GtkTreeIter",
 					     (GBoxedCopyFunc) gtk_tree_iter_copy,
 					     (GBoxedFreeFunc) gtk_tree_iter_free);
 
Index: gtk/gtktreeview.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtktreeview.c,v
retrieving revision 1.267.2.9
diff -u -r1.267.2.9 gtktreeview.c
--- gtk/gtktreeview.c	8 Jun 2002 06:14:59 -0000	1.267.2.9
+++ gtk/gtktreeview.c	13 Jun 2002 21:21:54 -0000
@@ -3900,6 +3900,19 @@
       modify_dy = TRUE;
     }
 
+  if (size_changed)
+    {
+      GtkRequisition requisition;
+      /* We temporarily guess a size, under the assumption that it will be the
+       * same when we get our next size_allocate.  If we don't do this, we'll be
+       * in an inconsistent state if we call top_row_to_dy. */
+      tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->upper, (gfloat)requisition.width);
+      tree_view->priv->vadjustment->upper = MAX (tree_view->priv->vadjustment->upper, (gfloat)requisition.height);
+      gtk_adjustment_changed (tree_view->priv->hadjustment);
+      gtk_adjustment_changed (tree_view->priv->vadjustment);
+      gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+    }
+
   /* if we walk backwards at all, then we need to reset our dy. */
   if (modify_dy)
     {
@@ -3929,8 +3942,6 @@
     {
       tree_view->priv->scroll_to_column = NULL;
     }
-  if (size_changed)
-    gtk_widget_queue_resize (GTK_WIDGET (tree_view));
   if (need_redraw)
     gtk_widget_queue_draw (GTK_WIDGET (tree_view));
 }
@@ -4049,14 +4060,26 @@
    }
   
  done:
+  if (validated_area)
+    {
+      GtkRequisition requisition;
+      /* We temporarily guess a size, under the assumption that it will be the
+       * same when we get our next size_allocate.  If we don't do this, we'll be
+       * in an inconsistent state when we call top_row_to_dy. */
+      gtk_widget_size_request (GTK_WIDGET (tree_view), &requisition);
+      tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->upper, (gfloat)requisition.width);
+      tree_view->priv->vadjustment->upper = MAX (tree_view->priv->vadjustment->upper, (gfloat)requisition.height);
+      gtk_adjustment_changed (tree_view->priv->hadjustment);
+      gtk_adjustment_changed (tree_view->priv->vadjustment);
+      gtk_widget_queue_resize (GTK_WIDGET (tree_view));
+    }
+
   if (gtk_tree_row_reference_valid (tree_view->priv->top_row))
     gtk_tree_view_top_row_to_dy (tree_view);
   else
     gtk_tree_view_dy_to_top_row (tree_view);
 
   if (path) gtk_tree_path_free (path);
-  if (validated_area)
-    gtk_widget_queue_resize (GTK_WIDGET (tree_view));
   if (! retval)
     tree_view->priv->validate_rows_timer = 0;
 
@@ -4224,9 +4247,10 @@
   tree_view->priv->dy = _gtk_rbtree_node_find_offset (tree, node);
   tree_view->priv->dy += tree_view->priv->top_row_dy;
   gtk_adjustment_set_value (tree_view->priv->vadjustment,
-			    tree_view->priv->dy);
+			    (gdouble)tree_view->priv->dy);
 }
 
+
 void
 _gtk_tree_view_install_mark_rows_col_dirty (GtkTreeView *tree_view)
 {
@@ -5516,13 +5540,13 @@
 
   if (tree_view->priv->hadjustment && (tree_view->priv->hadjustment != hadj))
     {
-      gtk_signal_disconnect_by_data (GTK_OBJECT (tree_view->priv->hadjustment), tree_view);
+      gtk_signal_disconnect_by_func (GTK_OBJECT (tree_view->priv->hadjustment), (GtkSignalFunc) gtk_tree_view_adjustment_changed, tree_view);
       gtk_object_unref (GTK_OBJECT (tree_view->priv->hadjustment));
     }
 
   if (tree_view->priv->vadjustment && (tree_view->priv->vadjustment != vadj))
     {
-      gtk_signal_disconnect_by_data (GTK_OBJECT (tree_view->priv->vadjustment), tree_view);
+      gtk_signal_disconnect_by_func (GTK_OBJECT (tree_view->priv->vadjustment), (GtkSignalFunc) gtk_tree_view_adjustment_changed, tree_view);
       gtk_object_unref (GTK_OBJECT (tree_view->priv->vadjustment));
     }
 
@@ -7479,6 +7503,7 @@
       gtk_tree_view_dy_to_top_row (tree_view);
       gdk_window_process_updates (tree_view->priv->bin_window, TRUE);
       gdk_window_process_updates (tree_view->priv->header_window, TRUE);
+
     }
 }
 
Index: gtk/gtkwidget.c
===================================================================
RCS file: /cvs/gnome/gtk+/gtk/gtkwidget.c,v
retrieving revision 1.311.2.1
diff -u -r1.311.2.1 gtkwidget.c
--- gtk/gtkwidget.c	2 May 2002 19:09:34 -0000	1.311.2.1
+++ gtk/gtkwidget.c	13 Jun 2002 21:21:54 -0000
@@ -6401,7 +6401,7 @@
   static GType our_type = 0;
   
   if (our_type == 0)
-    our_type = g_boxed_type_register_static ("GtkTypeRequisition",
+    our_type = g_boxed_type_register_static ("GtkRequisition",
 					     (GBoxedCopyFunc) gtk_requisition_copy,
 					     (GBoxedFreeFunc) gtk_requisition_free);