From 63ffb56f1eb04c797508b65681b8044ae97df8af Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 15 Oct 2004 05:25:56 +0000 Subject: [PATCH] Unset GTK_REQUEST_NEEDED before emitting ::size-request, following this 2004-10-15 Matthias Clasen * gtk/gtksizegroup.c (do_size_request): Unset GTK_REQUEST_NEEDED before emitting ::size-request, following this weeks discussion on gtk-devel-list@gnome.org. --- ChangeLog | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/gtkcellview.c | 1 + gtk/gtksizegroup.c | 5 ++--- 6 files changed, 19 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e02db09c06..35c5fd5ec3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2004-10-15 Matthias Clasen + * gtk/gtksizegroup.c (do_size_request): Unset GTK_REQUEST_NEEDED + before emitting ::size-request, following this weeks discussion + on gtk-devel-list@gnome.org. + * gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore the size info for the current row after measuring another row. (#154945, William Jon McCann) diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index e02db09c06..35c5fd5ec3 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,9 @@ 2004-10-15 Matthias Clasen + * gtk/gtksizegroup.c (do_size_request): Unset GTK_REQUEST_NEEDED + before emitting ::size-request, following this weeks discussion + on gtk-devel-list@gnome.org. + * gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore the size info for the current row after measuring another row. (#154945, William Jon McCann) diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index e02db09c06..35c5fd5ec3 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,9 @@ 2004-10-15 Matthias Clasen + * gtk/gtksizegroup.c (do_size_request): Unset GTK_REQUEST_NEEDED + before emitting ::size-request, following this weeks discussion + on gtk-devel-list@gnome.org. + * gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore the size info for the current row after measuring another row. (#154945, William Jon McCann) diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index e02db09c06..35c5fd5ec3 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,9 @@ 2004-10-15 Matthias Clasen + * gtk/gtksizegroup.c (do_size_request): Unset GTK_REQUEST_NEEDED + before emitting ::size-request, following this weeks discussion + on gtk-devel-list@gnome.org. + * gtk/gtkcellview.c (gtk_cell_view_get_size_of_row): Restore the size info for the current row after measuring another row. (#154945, William Jon McCann) diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c index 08cf897ae1..5b462ec820 100644 --- a/gtk/gtkcellview.c +++ b/gtk/gtkcellview.c @@ -1041,6 +1041,7 @@ gtk_cell_view_get_size_of_row (GtkCellView *cell_view, GtkRequisition *requisition) { GtkTreeRowReference *tmp; + GtkRequisition req; g_return_val_if_fail (GTK_IS_CELL_VIEW (cell_view), FALSE); g_return_val_if_fail (path != NULL, FALSE); diff --git a/gtk/gtksizegroup.c b/gtk/gtksizegroup.c index 3a86420136..e96e21b405 100644 --- a/gtk/gtksizegroup.c +++ b/gtk/gtksizegroup.c @@ -491,12 +491,11 @@ do_size_request (GtkWidget *widget) { if (GTK_WIDGET_REQUEST_NEEDED (widget)) { - gtk_widget_ensure_style (widget); + gtk_widget_ensure_style (widget); + GTK_PRIVATE_UNSET_FLAG (widget, GTK_REQUEST_NEEDED); g_signal_emit_by_name (widget, "size_request", &widget->requisition); - - GTK_PRIVATE_UNSET_FLAG (widget, GTK_REQUEST_NEEDED); } }