[gtk+/native-layout] Fixed classes to call gtk_extended_layout_get_desired_size_again()
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/native-layout] Fixed classes to call gtk_extended_layout_get_desired_size_again()
- Date: Tue, 6 Apr 2010 07:08:41 +0000 (UTC)
commit 68c38e0ffd3a4075ea5caf008f933ef91ed9d3cc
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Tue Apr 6 02:55:07 2010 -0400
Fixed classes to call gtk_extended_layout_get_desired_size_again()
The previous patch removes the ambiguous gtk_widget_get_desired_size().
gtk/gtkalignment.c | 2 +-
gtk/gtkbox.c | 6 +++---
gtk/gtklabel.c | 12 ++++++------
gtk/gtkplug.c | 4 ++--
gtk/gtkscrolledwindow.c | 18 +++++++++---------
gtk/gtksocket.c | 6 +++---
6 files changed, 24 insertions(+), 24 deletions(-)
---
diff --git a/gtk/gtkalignment.c b/gtk/gtkalignment.c
index 8837fca..3accb4d 100644
--- a/gtk/gtkalignment.c
+++ b/gtk/gtkalignment.c
@@ -461,7 +461,7 @@ gtk_alignment_size_allocate (GtkWidget *widget,
{
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;
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index d3fc2ed..bb87399 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -307,9 +307,9 @@ gtk_box_get_desired_size (GtkExtendedLayout *layout,
GtkRequisition child_minimum_size;
GtkRequisition child_natural_size;
- gtk_widget_get_desired_size (child->widget,
- &child_minimum_size,
- &child_natural_size);
+ gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (child->widget),
+ &child_minimum_size,
+ &child_natural_size);
if (private->orientation == GTK_ORIENTATION_HORIZONTAL)
{
diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index f8370eb..c775a66 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -3333,9 +3333,9 @@ gtk_label_get_width_for_height (GtkExtendedLayout *layout,
{
GtkRequisition minimum_size, natural_size;
- gtk_widget_get_desired_size (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;
@@ -3359,9 +3359,9 @@ gtk_label_get_height_for_width (GtkExtendedLayout *layout,
{
GtkRequisition minimum_size, natural_size;
- gtk_widget_get_desired_size (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;
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 9351e96..362725d 100644
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -781,8 +781,8 @@ gtk_plug_size_allocate (GtkWidget *widget,
}
- gtk_widget_get_desired_size (bin->child,
- NULL, &natural_size);
+ gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (bin->child),
+ NULL, &natural_size);
_gtk_plug_windowing_publish_natural_size (GTK_PLUG (widget), &natural_size);
}
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 4a82eb0..5634862 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;
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index 3ca605f..52ad6ab 100644
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -1022,9 +1022,9 @@ gtk_socket_extended_layout_get_desired_size (GtkExtendedLayout *layout,
if (socket->plug_widget)
{
- gtk_widget_get_desired_size (socket->plug_widget,
- minimal_size,
- desired_size);
+ gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (socket->plug_widget),
+ minimal_size,
+ desired_size);
}
else
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]