diff options
| author | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-04-06 02:55:07 -0400 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.van.berkom@gmail.com> | 2010-04-06 02:55:07 -0400 |
| commit | 68c38e0ffd3a4075ea5caf008f933ef91ed9d3cc (patch) | |
| tree | ceefb172aa76c0f62c5afcc9b9c8c231e287440b /gtk/gtkscrolledwindow.c | |
| parent | ef321923299d3d113a38effe2afbded58939deaf (diff) | |
| download | gtk+-68c38e0ffd3a4075ea5caf008f933ef91ed9d3cc.tar.gz | |
Fixed classes to call gtk_extended_layout_get_desired_size_again()
The previous patch removes the ambiguous gtk_widget_get_desired_size().
Diffstat (limited to 'gtk/gtkscrolledwindow.c')
| -rw-r--r-- | gtk/gtkscrolledwindow.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 4a82eb0525..5634862128 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -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; |