callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed push/pop_recursion_check() to not fire warnings for expected code.

Browse Source 
I.e. Since we are now calling get_preferred_width() to ensure a good 'for_size'
for get_height_for_width() we need to avoid warning about this internal expected
recursion.
This commit is contained in:
Tristan Van Berkom
2010-10-23 20:03:41 +09:00
parent 0dd5eb4b61
commit ed63ae2bd3
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtksizerequest.c
View File

@ -220,14 +220,15 @@ compute_size_for_orientation (GtkWidget *request,
/* Unconditional size request runs but is often unhandled. */ /* Unconditional size request runs but is often unhandled. */
do_size_request (widget, &requisition); do_size_request (widget, &requisition);
push_recursion_check (request, orientation, for_size);
if (orientation == GTK_SIZE_GROUP_HORIZONTAL) if (orientation == GTK_SIZE_GROUP_HORIZONTAL)
{ {
requisition_size = requisition.width; requisition_size = requisition.width;
if (for_size < 0) if (for_size < 0)
{ {
push_recursion_check (request, orientation, for_size);
GTK_WIDGET_GET_CLASS (request)->get_preferred_width (request, &min_size, &nat_size); GTK_WIDGET_GET_CLASS (request)->get_preferred_width (request, &min_size, &nat_size);
pop_recursion_check (request, orientation);
} }
else else
{ {
@ -245,8 +246,10 @@ compute_size_for_orientation (GtkWidget *request,
&ignored_position, &ignored_position,
&for_size); &for_size);
push_recursion_check (request, orientation, for_size);
GTK_WIDGET_GET_CLASS (request)->get_preferred_width_for_height (request, for_size, GTK_WIDGET_GET_CLASS (request)->get_preferred_width_for_height (request, for_size,
&min_size, &nat_size); &min_size, &nat_size);
pop_recursion_check (request, orientation);
} }
} }
else else
@ -255,7 +258,9 @@ compute_size_for_orientation (GtkWidget *request,
if (for_size < 0) if (for_size < 0)
{ {
push_recursion_check (request, orientation, for_size);
GTK_WIDGET_GET_CLASS (request)->get_preferred_height (request, &min_size, &nat_size); GTK_WIDGET_GET_CLASS (request)->get_preferred_height (request, &min_size, &nat_size);
pop_recursion_check (request, orientation);
} }
else else
{ {
@ -273,11 +278,12 @@ compute_size_for_orientation (GtkWidget *request,
&ignored_position, &ignored_position,
&for_size); &for_size);
push_recursion_check (request, orientation, for_size);
GTK_WIDGET_GET_CLASS (request)->get_preferred_height_for_width (request, for_size, GTK_WIDGET_GET_CLASS (request)->get_preferred_height_for_width (request, for_size,
&min_size, &nat_size); &min_size, &nat_size);
}
}
pop_recursion_check (request, orientation); pop_recursion_check (request, orientation);
}
}
if (min_size > nat_size) if (min_size > nat_size)
{ {