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/gtkmenubar.c b/gtk/gtkmenubar.c
index d01fe2c2c5..81610850ee 100644
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -208,6 +208,7 @@ gtk_menu_bar_size_request (GtkWidget      *widget,
   GtkWidget *child;
   GList *children;
   gint nchildren;
+  GtkRequisition child_requisition;
 
   g_return_if_fail (widget != NULL);
   g_return_if_fail (GTK_IS_MENU_BAR (widget));
@@ -232,13 +233,13 @@ gtk_menu_bar_size_request (GtkWidget      *widget,
 	  if (GTK_WIDGET_VISIBLE (child))
 	    {
 	      GTK_MENU_ITEM (child)->show_submenu_indicator = FALSE;
-	      gtk_widget_size_request (child, &child->requisition);
+	      gtk_widget_size_request (child, &child_requisition);
 
-	      requisition->width += child->requisition.width;
-	      requisition->height = MAX (requisition->height, child->requisition.height);
+	      requisition->width += child_requisition.width;
+	      requisition->height = MAX (requisition->height, child_requisition.height);
 	      /* Support for the right justified help menu */
-	      if ( (children == NULL) && (GTK_IS_MENU_ITEM(child))
-		   && (GTK_MENU_ITEM(child)->right_justify))
+	      if ((children == NULL) && GTK_IS_MENU_ITEM(child) &&
+		  GTK_MENU_ITEM(child)->right_justify)
 		{
 		  requisition->width += CHILD_SPACING;
 		}
@@ -268,6 +269,7 @@ gtk_menu_bar_size_allocate (GtkWidget     *widget,
   GtkWidget *child;
   GList *children;
   GtkAllocation child_allocation;
+  GtkRequisition child_requisition;
   guint offset;
   
   g_return_if_fail (widget != NULL);
@@ -301,16 +303,18 @@ gtk_menu_bar_size_allocate (GtkWidget     *widget,
 	  child = children->data;
 	  children = children->next;
 
+	  gtk_widget_get_child_requisition (child, &child_requisition);
+	  
 	  /* Support for the right justified help menu */
 	  if ( (children == NULL) && (GTK_IS_MENU_ITEM(child))
 	      && (GTK_MENU_ITEM(child)->right_justify)) 
 	    {
 	      child_allocation.x = allocation->width -
-		  child->requisition.width - CHILD_SPACING - offset;
+		  child_requisition.width - CHILD_SPACING - offset;
 	    }
 	  if (GTK_WIDGET_VISIBLE (child))
 	    {
-	      child_allocation.width = child->requisition.width;
+	      child_allocation.width = child_requisition.width;
 
 	      gtk_widget_size_allocate (child, &child_allocation);