diff options
| author | Anders Carlsson <andersca@gnu.org> | 2001-10-29 16:48:56 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@src.gnome.org> | 2001-10-29 16:48:56 +0000 |
| commit | 62adef452ef810079f05a6bf3076f7eb5d40c493 (patch) | |
| tree | 2c9c5bdd48a8cf1a8143278401be94c1fc4cdf30 | |
| parent | 06b4ef65174e56e766e4bde06e08e34c08788272 (diff) | |
| download | gtk+-62adef452ef810079f05a6bf3076f7eb5d40c493.tar.gz | |
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.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 6 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 6 | ||||
| -rw-r--r-- | gtk/gtktreeview.c | 4 |
8 files changed, 44 insertions, 2 deletions
@@ -1,3 +1,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. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9a4d3894f5..a2f32f86dc 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,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. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9a4d3894f5..a2f32f86dc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,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. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9a4d3894f5..a2f32f86dc 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,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. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9a4d3894f5..a2f32f86dc 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,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. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9a4d3894f5..a2f32f86dc 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,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. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9a4d3894f5..a2f32f86dc 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,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. diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 57563244e1..2a1253817d 100644 --- a/gtk/gtktreeview.c +++ b/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 */ |