Fixed some bugs with set_default_size.

Sun Feb  7 19:49:21 1999  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtkwindow.c (gtk_window_move_resize): Fixed some
	  bugs with set_default_size.

Sat Feb  6 13:23:51 1999  Owen Taylor  <otaylor@redhat.com>

	* docs/Changes-1.2.txt: Added information about
	 the change to gtk_widget_size_request().

	* gtk/gtkentry.c: Call gtk_widget_get_child_requisition
	 explicitely since we differentiate between the usize
	 set by the user and what we got. (Ugh)

	* gtk/gtkwidget.[ch] (gtk_widget_get_child_requisition):
	 New function to return the effective size of a widget
	 as it looks to its parent.

	* gtk/gtkwidget.c (gtk_widget_size_request): Leave
	 widget->requisition set to exactly what the widget
	 asked for, and then make a copy of that into
	 the requisition argument. Allow a NULL requisition
	 argument, and, if G_ENABLE_DEBUG, warn if
	 requisition == &widget->requisition.

	* gtkalignment.c gtkaspectframe.c gtkbutton.c gtkclist.c
	  gtkcontainer.c gtkentry.c gtkeventbox.c gtkfixed.c
	  gtkframe.c gtkhandlebox.c gtkhbox.c gtkhpaned.c
	  gtklayout.c gtklist.c gtklistitem.c gtkmenu.c
	  gtkmenubar.c gtkmenuitem.c gtknotebook.c
	  gtkoptionmenu.c gtkpacker.c gtkscrolledwindow.c
	  gtktable.c gtktoolbar.c gtktree.c gtktreeitem.c
	  gtkvbox.c gtkviewport.c gtkvpaned.c gtkwindow.c

	 Avoid calling gtk_widget_size_request with
	 requisition == widget->requisition; use
	 gtk_widget_get_child_requisition to get the
	 size of children.

1 files changed, 11 insertions, 7 deletions

diff --git a/gtk/gtktree.c b/gtk/gtktree.c
index 6b1eb162e9..6c56702025 100644
--- a/gtk/gtktree.c
+++ b/gtk/gtktree.c
@@ -939,7 +939,10 @@ gtk_tree_size_allocate (GtkWidget     *widget,
 	  
 	  if (GTK_WIDGET_VISIBLE (child))
 	    {
-	      child_allocation.height = child->requisition.height;
+	      GtkRequisition child_requisition;
+	      gtk_widget_get_child_requisition (child, &child_requisition);
+	      
+	      child_allocation.height = child_requisition.height;
 	      
 	      gtk_widget_size_allocate (child, &child_allocation);
 	      
@@ -965,6 +968,7 @@ gtk_tree_size_request (GtkWidget      *widget,
   GtkTree *tree;
   GtkWidget *child, *subtree;
   GList *children;
+  GtkRequisition child_requisition;
   
   
   g_return_if_fail (widget != NULL);
@@ -983,20 +987,20 @@ gtk_tree_size_request (GtkWidget      *widget,
       
       if (GTK_WIDGET_VISIBLE (child))
 	{
-	  gtk_widget_size_request (child, &child->requisition);
+	  gtk_widget_size_request (child, &child_requisition);
 	  
-	  requisition->width = MAX (requisition->width, child->requisition.width);
-	  requisition->height += child->requisition.height;
+	  requisition->width = MAX (requisition->width, child_requisition.width);
+	  requisition->height += child_requisition.height;
 	  
 	  if((subtree = GTK_TREE_ITEM(child)->subtree) &&
 	     GTK_WIDGET_VISIBLE (subtree))
 	    {
-	      gtk_widget_size_request (subtree, &subtree->requisition);
+	      gtk_widget_size_request (subtree, &child_requisition);
 	      
 	      requisition->width = MAX (requisition->width, 
-					subtree->requisition.width);
+					child_requisition.width);
 	      
-	      requisition->height += subtree->requisition.height;
+	      requisition->height += child_requisition.height;
 	    }
 	}
     }