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

Fixed classes to call gtk_extended_layout_get_desired_size_again()

Browse Source 
The previous patch removes the ambiguous gtk_widget_get_desired_size().
This commit is contained in:
Tristan Van Berkom
2010-04-06 02:55:07 -04:00
parent ef32192329
commit 68c38e0ffd
6 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
gtk/gtkscrolledwindow.c
View File

@ -1740,9 +1740,9 @@ gtk_scrolled_window_extended_layout_get_desired_size (GtkExtendedLayout *layout,
if (bin->child && gtk_widget_get_visible (bin->child))
{
gtk_widget_get_desired_size (bin->child,
&min_child_requisition,
&nat_child_requisition);
gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (bin->child),
&min_child_requisition,
&nat_child_requisition);
if (scrolled_window->hscrollbar_policy == GTK_POLICY_NEVER)
{
@ -1835,9 +1835,9 @@ gtk_scrolled_window_extended_layout_get_height_for_width (GtkExtendedLayout *lay
#if 0
TODO: integrate height-for-width with size-groups
#else
gtk_widget_get_desired_size (GTK_WIDGET(layout),
minimum_height ? &minimum_size : NULL,
natural_height ? &natural_size : NULL);
gtk_extended_layout_get_desired_size (layout,
minimum_height ? &minimum_size : NULL,
natural_height ? &natural_size : NULL);
if (minimum_height)
*minimum_height = minimum_size.height;
@ -1860,9 +1860,9 @@ gtk_scrolled_window_extended_layout_get_width_for_height (GtkExtendedLayout *lay
#if 0
TODO: integrate width-for-height with size-groups
#else
gtk_widget_get_desired_size (GTK_WIDGET(layout),
minimum_width ? &minimum_size : NULL,
natural_width ? &natural_size : NULL);
gtk_extended_layout_get_desired_size (layout,
minimum_width ? &minimum_size : NULL,
natural_width ? &natural_size : NULL);
if (minimum_width)
*minimum_width = minimum_size.width;