Calculate the buttons size request before using it. Fixes #61696.

2001-10-29  Anders Carlsson  <andersca@gnu.org>

	* gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
	the buttons size request before using it. Fixes #61696.

ChangeLog

+2001-10-29  Anders Carlsson  <andersca@gnu.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
+	the buttons size request before using it. Fixes #61696.
+
 2001-10-29  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Updates.
@@ -85,6 +90,7 @@
 	file. Install import libraries.
 
 2001-10-29  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2482
 
 	* gtk/gtkiconfactory.c (get_default_icons): Fix build.
 

ChangeLog.pre-2-0

+2001-10-29  Anders Carlsson  <andersca@gnu.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
+	the buttons size request before using it. Fixes #61696.
+
 2001-10-29  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Updates.
@@ -85,6 +90,7 @@
 	file. Install import libraries.
 
 2001-10-29  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2482
 
 	* gtk/gtkiconfactory.c (get_default_icons): Fix build.
 

ChangeLog.pre-2-10

+2001-10-29  Anders Carlsson  <andersca@gnu.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
+	the buttons size request before using it. Fixes #61696.
+
 2001-10-29  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Updates.
@@ -85,6 +90,7 @@
 	file. Install import libraries.
 
 2001-10-29  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2482
 
 	* gtk/gtkiconfactory.c (get_default_icons): Fix build.
 

ChangeLog.pre-2-2

+2001-10-29  Anders Carlsson  <andersca@gnu.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
+	the buttons size request before using it. Fixes #61696.
+
 2001-10-29  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Updates.
@@ -85,6 +90,7 @@
 	file. Install import libraries.
 
 2001-10-29  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2482
 
 	* gtk/gtkiconfactory.c (get_default_icons): Fix build.
 

ChangeLog.pre-2-4

+2001-10-29  Anders Carlsson  <andersca@gnu.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
+	the buttons size request before using it. Fixes #61696.
+
 2001-10-29  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Updates.
@@ -85,6 +90,7 @@
 	file. Install import libraries.
 
 2001-10-29  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2482
 
 	* gtk/gtkiconfactory.c (get_default_icons): Fix build.
 

ChangeLog.pre-2-6

+2001-10-29  Anders Carlsson  <andersca@gnu.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
+	the buttons size request before using it. Fixes #61696.
+
 2001-10-29  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Updates.
@@ -85,6 +90,7 @@
 	file. Install import libraries.
 
 2001-10-29  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2482
 
 	* gtk/gtkiconfactory.c (get_default_icons): Fix build.
 

ChangeLog.pre-2-8

+2001-10-29  Anders Carlsson  <andersca@gnu.org>
+
+	* gtk/gtktreeview.c (gtk_tree_view_size_request): Calculate
+	the buttons size request before using it. Fixes #61696.
+
 2001-10-29  Tor Lillqvist  <tml@iki.fi>
 
 	* README.win32: Updates.
@@ -85,6 +90,7 @@
 	file. Install import libraries.
 
 2001-10-29  Anders Carlsson  <andersca@gnu.org>
+>>>>>>> 1.2482
 
 	* gtk/gtkiconfactory.c (get_default_icons): Fix build.
 

gtk/gtktreeview.c

@@ -1380,6 +1380,8 @@ gtk_tree_view_size_request (GtkWidget      *widget,
 
   tree_view = GTK_TREE_VIEW (widget);
 
+  gtk_tree_view_size_request_buttons (tree_view);
+
   requisition->width = tree_view->priv->width;
   requisition->height = tree_view->priv->height + tree_view->priv->header_height;
 
@@ -1395,8 +1397,6 @@ gtk_tree_view_size_request (GtkWidget      *widget,
       if (GTK_WIDGET_VISIBLE (child->widget))
         gtk_widget_size_request (child->widget, &child_requisition);
     }
-
-  gtk_tree_view_size_request_buttons (tree_view);
 }
 
 /* GtkWidget::size_allocate helper */