AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/gtkalignment.c
View File

@ -461,7 +461,7 @@ gtk_alignment_size_allocate (GtkWidget *widget,
{ {
GtkExtendedLayout *layout = GTK_EXTENDED_LAYOUT (bin->child); GtkExtendedLayout *layout = GTK_EXTENDED_LAYOUT (bin->child);
gtk_widget_get_desired_size (GTK_WIDGET (layout), NULL, &child_requisition); gtk_extended_layout_get_desired_size (layout, NULL, &child_requisition);
border_width = GTK_CONTAINER (alignment)->border_width; border_width = GTK_CONTAINER (alignment)->border_width;

6
gtk/gtkbox.c
View File

@ -307,9 +307,9 @@ gtk_box_get_desired_size (GtkExtendedLayout *layout,
GtkRequisition child_minimum_size; GtkRequisition child_minimum_size;
GtkRequisition child_natural_size; GtkRequisition child_natural_size;
gtk_widget_get_desired_size (child->widget, gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (child->widget),
&child_minimum_size, &child_minimum_size,
&child_natural_size); &child_natural_size);
if (private->orientation == GTK_ORIENTATION_HORIZONTAL) if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
{ {

12
gtk/gtklabel.c
View File

@ -3333,9 +3333,9 @@ gtk_label_get_width_for_height (GtkExtendedLayout *layout,
{ {
GtkRequisition minimum_size, natural_size; GtkRequisition minimum_size, natural_size;
gtk_widget_get_desired_size (layout, gtk_extended_layout_get_desired_size (layout,
minimum_width ? &minimum_size : NULL, minimum_width ? &minimum_size : NULL,
natural_width ? &natural_size : NULL); natural_width ? &natural_size : NULL);
if (minimum_width) if (minimum_width)
*minimum_width = minimum_size.width; *minimum_width = minimum_size.width;
@ -3359,9 +3359,9 @@ gtk_label_get_height_for_width (GtkExtendedLayout *layout,
{ {
GtkRequisition minimum_size, natural_size; GtkRequisition minimum_size, natural_size;
gtk_widget_get_desired_size (layout, gtk_extended_layout_get_desired_size (layout,
minimum_height ? &minimum_size : NULL, minimum_height ? &minimum_size : NULL,
natural_height ? &natural_size : NULL); natural_height ? &natural_size : NULL);
if (minimum_height) if (minimum_height)
*minimum_height = minimum_size.height; *minimum_height = minimum_size.height;

4
gtk/gtkplug.c
View File

@ -781,8 +781,8 @@ gtk_plug_size_allocate (GtkWidget *widget,
} }
gtk_widget_get_desired_size (bin->child, gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (bin->child),
NULL, &natural_size); NULL, &natural_size);
_gtk_plug_windowing_publish_natural_size (GTK_PLUG (widget), &natural_size); _gtk_plug_windowing_publish_natural_size (GTK_PLUG (widget), &natural_size);
} }

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

6
gtk/gtksocket.c
View File

@ -1022,9 +1022,9 @@ gtk_socket_extended_layout_get_desired_size (GtkExtendedLayout *layout,
if (socket->plug_widget) if (socket->plug_widget)
{ {
gtk_widget_get_desired_size (socket->plug_widget, gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (socket->plug_widget),
minimal_size, minimal_size,
desired_size); desired_size);
} }
else else
{ {