[gtk+/native-layout] Mass api change from GtkExtendedLayout --> GtkSizeRequest part 2.
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/native-layout] Mass api change from GtkExtendedLayout --> GtkSizeRequest part 2.
- Date: Fri, 18 Jun 2010 00:42:41 +0000 (UTC)
commit c20c3fd757bb4abebb2898bc07c76c0caddeb758
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Thu Jun 17 20:41:01 2010 -0400
Mass api change from GtkExtendedLayout --> GtkSizeRequest part 2.
This commit makes the api change on the remaining portions of the
native-layout branch.
gtk/gtkcellview.c | 60 ++--
gtk/gtkcombobox.c | 76 +++---
gtk/gtkplug.c | 6 +-
gtk/gtksocket.c | 60 ++--
gtk/gtktreeview.c | 58 ++--
tests/extendedlayoutexample.c | 620 -----------------------------------------
6 files changed, 129 insertions(+), 751 deletions(-)
---
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index aef6a80..c0e3436 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -24,7 +24,7 @@
#include "gtkintl.h"
#include "gtkcellrenderertext.h"
#include "gtkcellrendererpixbuf.h"
-#include "gtkextendedlayout.h"
+#include "gtksizerequest.h"
#include "gtkextendedcell.h"
#include "gtkprivate.h"
#include <gobject/gmarshal.h>
@@ -121,13 +121,13 @@ static void gtk_cell_view_buildable_custom_tag_end (GtkBuildable
const gchar *tagname,
gpointer *data);
-static void gtk_cell_view_extended_layout_init (GtkExtendedLayoutIface *iface);
-static void gtk_cell_view_get_desired_width (GtkExtendedLayout *layout,
- gint *minimum_size,
- gint *natural_size);
-static void gtk_cell_view_get_desired_height (GtkExtendedLayout *layout,
- gint *minimum_size,
- gint *natural_size);
+static void gtk_cell_view_size_request_init (GtkSizeRequestIface *iface);
+static void gtk_cell_view_get_width (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_cell_view_get_height (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size);
static GtkBuildableIface *parent_buildable_iface;
@@ -147,8 +147,8 @@ G_DEFINE_TYPE_WITH_CODE (GtkCellView, gtk_cell_view, GTK_TYPE_WIDGET,
gtk_cell_view_cell_layout_init)
G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
gtk_cell_view_buildable_init)
- G_IMPLEMENT_INTERFACE (GTK_TYPE_EXTENDED_LAYOUT,
- gtk_cell_view_extended_layout_init))
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_SIZE_REQUEST,
+ gtk_cell_view_size_request_init))
static void
@@ -1013,18 +1013,18 @@ gtk_cell_view_get_desired_size_of_row (GtkCellView *cell_view,
gtk_tree_row_reference_new (cell_view->priv->model, path);
if (orientation == GTK_ORIENTATION_HORIZONTAL)
- gtk_cell_view_get_desired_width (GTK_EXTENDED_LAYOUT (cell_view), minimum_size, natural_size);
+ gtk_cell_view_get_width (GTK_SIZE_REQUEST (cell_view), minimum_size, natural_size);
else
- gtk_cell_view_get_desired_height (GTK_EXTENDED_LAYOUT (cell_view), minimum_size, natural_size);
+ gtk_cell_view_get_height (GTK_SIZE_REQUEST (cell_view), minimum_size, natural_size);
gtk_tree_row_reference_free (cell_view->priv->displayed_row);
cell_view->priv->displayed_row = tmp;
/* Restore active size */
if (orientation == GTK_ORIENTATION_HORIZONTAL)
- gtk_cell_view_get_desired_width (GTK_EXTENDED_LAYOUT (cell_view), NULL, NULL);
+ gtk_cell_view_get_width (GTK_SIZE_REQUEST (cell_view), NULL, NULL);
else
- gtk_cell_view_get_desired_height (GTK_EXTENDED_LAYOUT (cell_view), NULL, NULL);
+ gtk_cell_view_get_height (GTK_SIZE_REQUEST (cell_view), NULL, NULL);
}
/**
@@ -1169,22 +1169,22 @@ gtk_cell_view_buildable_custom_tag_end (GtkBuildable *buildable,
static void
-gtk_cell_view_extended_layout_init (GtkExtendedLayoutIface *iface)
+gtk_cell_view_size_request_init (GtkSizeRequestIface *iface)
{
- iface->get_desired_width = gtk_cell_view_get_desired_width;
- iface->get_desired_height = gtk_cell_view_get_desired_height;
+ iface->get_width = gtk_cell_view_get_width;
+ iface->get_height = gtk_cell_view_get_height;
}
static void
-gtk_cell_view_get_desired_size (GtkExtendedLayout *layout,
- GtkOrientation orientation,
- gint *minimum_size,
- gint *natural_size)
+gtk_cell_view_get_size (GtkSizeRequest *widget,
+ GtkOrientation orientation,
+ gint *minimum_size,
+ gint *natural_size)
{
GList *i;
gint cell_min, cell_nat;
gboolean first_cell = TRUE;
- GtkCellView *cellview = GTK_CELL_VIEW (layout);
+ GtkCellView *cellview = GTK_CELL_VIEW (widget);
gint minimum, natural;
minimum = natural = 0;
@@ -1235,19 +1235,19 @@ gtk_cell_view_get_desired_size (GtkExtendedLayout *layout,
}
static void
-gtk_cell_view_get_desired_width (GtkExtendedLayout *layout,
- gint *minimum_size,
- gint *natural_size)
+gtk_cell_view_get_width (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size)
{
- gtk_cell_view_get_desired_size (layout, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size);
+ gtk_cell_view_get_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size);
}
static void
-gtk_cell_view_get_desired_height (GtkExtendedLayout *layout,
- gint *minimum_size,
- gint *natural_size)
+gtk_cell_view_get_height (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size)
{
- gtk_cell_view_get_desired_size (layout, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
+ gtk_cell_view_get_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
}
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 4daad01..06f052f 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -38,7 +38,7 @@
#include "gtktreeselection.h"
#include "gtkvseparator.h"
#include "gtkwindow.h"
-#include "gtkextendedlayout.h"
+#include "gtksizerequest.h"
#include "gtkprivate.h"
#include <gdk/gdkkeysyms.h>
@@ -469,13 +469,13 @@ static void gtk_combo_box_buildable_custom_tag_end (GtkBuildable *bui
static void gtk_combo_box_start_editing (GtkCellEditable *cell_editable,
GdkEvent *event);
-static void gtk_combo_box_extended_layout_init (GtkExtendedLayoutIface *iface);
-static void gtk_combo_box_get_desired_width (GtkExtendedLayout *layout,
- gint *minimum_size,
- gint *natural_size);
-static void gtk_combo_box_get_desired_height (GtkExtendedLayout *layout,
- gint *minimum_size,
- gint *natural_size);
+static void gtk_combo_box_size_request_init (GtkSizeRequestIface *iface);
+static void gtk_combo_box_get_width (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_combo_box_get_height (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size);
G_DEFINE_TYPE_WITH_CODE (GtkComboBox, gtk_combo_box, GTK_TYPE_BIN,
@@ -485,8 +485,8 @@ G_DEFINE_TYPE_WITH_CODE (GtkComboBox, gtk_combo_box, GTK_TYPE_BIN,
gtk_combo_box_cell_editable_init)
G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
gtk_combo_box_buildable_init)
- G_IMPLEMENT_INTERFACE (GTK_TYPE_EXTENDED_LAYOUT,
- gtk_combo_box_extended_layout_init))
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_SIZE_REQUEST,
+ gtk_combo_box_size_request_init))
/* common */
@@ -5891,10 +5891,10 @@ gtk_combo_box_buildable_custom_tag_end (GtkBuildable *buildable,
static void
-gtk_combo_box_extended_layout_init (GtkExtendedLayoutIface *iface)
+gtk_combo_box_size_request_init (GtkSizeRequestIface *iface)
{
- iface->get_desired_width = gtk_combo_box_get_desired_width;
- iface->get_desired_height = gtk_combo_box_get_desired_height;
+ iface->get_width = gtk_combo_box_get_width;
+ iface->get_height = gtk_combo_box_get_height;
}
static void
@@ -5950,11 +5950,11 @@ gtk_combo_box_remeasure (GtkComboBox *combo_box)
*
*/
static void
-gtk_combo_box_get_desired_size (GtkExtendedLayout *layout,
- GtkRequisition *minimum_size,
- GtkRequisition *natural_size)
+gtk_combo_box_get_size (GtkSizeRequest *widget,
+ GtkRequisition *minimum_size,
+ GtkRequisition *natural_size)
{
- GtkComboBox *combo_box = GTK_COMBO_BOX (layout);
+ GtkComboBox *combo_box = GTK_COMBO_BOX (widget);
GtkComboBoxPrivate *priv = combo_box->priv;
gint focus_width, focus_pad;
gint font_size, arrow_size;
@@ -5964,10 +5964,10 @@ gtk_combo_box_get_desired_size (GtkExtendedLayout *layout,
PangoFontDescription *font_desc;
GtkWidget *child;
- child = gtk_bin_get_child (GTK_BIN (layout));
+ child = gtk_bin_get_child (GTK_BIN (widget));
/* common */
- gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (child), FALSE, &bin_req, &bin_nat_req);
+ gtk_size_request_get_size (GTK_SIZE_REQUEST (child), &bin_req, &bin_nat_req);
gtk_combo_box_remeasure (combo_box);
bin_req.width = MAX (bin_req.width, priv->minimum_size.width);
@@ -5975,14 +5975,14 @@ gtk_combo_box_get_desired_size (GtkExtendedLayout *layout,
bin_nat_req.width = MAX (bin_nat_req.width, priv->natural_size.width);
bin_nat_req.height = MAX (bin_nat_req.height, priv->natural_size.height);
- gtk_widget_style_get (GTK_WIDGET (layout),
+ gtk_widget_style_get (GTK_WIDGET (widget),
"focus-line-width", &focus_width,
"focus-padding", &focus_pad,
"arrow-size", &arrow_size,
NULL);
font_desc = child->style->font_desc;
- context = gtk_widget_get_pango_context (GTK_WIDGET (layout));
+ context = gtk_widget_get_pango_context (GTK_WIDGET (widget));
metrics = pango_context_get_metrics (context, font_desc,
pango_context_get_language (context));
font_size = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) +
@@ -6029,9 +6029,8 @@ gtk_combo_box_get_desired_size (GtkExtendedLayout *layout,
{
GtkRequisition but_req, but_nat_req;
- gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (priv->button),
- FALSE,
- &but_req, &but_nat_req);
+ gtk_size_request_get_size (GTK_SIZE_REQUEST (priv->button),
+ &but_req, &but_nat_req);
minimum_size->width = bin_req.width + but_req.width;
minimum_size->height = MAX (bin_req.height, but_req.height);
@@ -6071,9 +6070,8 @@ gtk_combo_box_get_desired_size (GtkExtendedLayout *layout,
}
/* the button */
- gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (priv->button),
- FALSE,
- &button_req, &button_nat_req);
+ gtk_size_request_get_size (GTK_SIZE_REQUEST (priv->button),
+ &button_req, &button_nat_req);
minimum_size->width += button_req.width;
minimum_size->height = MAX (minimum_size->height, button_req.height);
@@ -6084,22 +6082,22 @@ gtk_combo_box_get_desired_size (GtkExtendedLayout *layout,
if (GTK_SHADOW_NONE != priv->shadow_type)
{
- minimum_size->width += 2 * GTK_WIDGET (layout)->style->xthickness;
- minimum_size->height += 2 * GTK_WIDGET (layout)->style->ythickness;
+ minimum_size->width += 2 * GTK_WIDGET (widget)->style->xthickness;
+ minimum_size->height += 2 * GTK_WIDGET (widget)->style->ythickness;
- natural_size->width += 2 * GTK_WIDGET (layout)->style->xthickness;
- natural_size->height += 2 * GTK_WIDGET (layout)->style->ythickness;
+ natural_size->width += 2 * GTK_WIDGET (widget)->style->xthickness;
+ natural_size->height += 2 * GTK_WIDGET (widget)->style->ythickness;
}
}
static void
-gtk_combo_box_get_desired_width (GtkExtendedLayout *layout,
- gint *minimum_size,
- gint *natural_size)
+gtk_combo_box_get_width (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size)
{
GtkRequisition minimum, natural;
- gtk_combo_box_get_desired_size (layout, &minimum, &natural);
+ gtk_combo_box_get_size (widget, &minimum, &natural);
if (minimum_size)
*minimum_size = minimum.width;
@@ -6109,13 +6107,13 @@ gtk_combo_box_get_desired_width (GtkExtendedLayout *layout,
}
static void
-gtk_combo_box_get_desired_height (GtkExtendedLayout *layout,
- gint *minimum_size,
- gint *natural_size)
+gtk_combo_box_get_height (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size)
{
GtkRequisition minimum, natural;
- gtk_combo_box_get_desired_size (layout, &minimum, &natural);
+ gtk_combo_box_get_size (widget, &minimum, &natural);
if (minimum_size)
*minimum_size = minimum.height;
diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
index 340bcb2..fa14948 100644
--- a/gtk/gtkplug.c
+++ b/gtk/gtkplug.c
@@ -30,7 +30,7 @@
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkplug.h"
-#include "gtkextendedlayout.h"
+#include "gtksizerequest.h"
#include "gtkintl.h"
#include "gtkprivate.h"
#include "gtkplugprivate.h"
@@ -781,8 +781,8 @@ gtk_plug_size_allocate (GtkWidget *widget,
}
- gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (bin->child),
- TRUE, NULL, &natural_size);
+ gtk_size_request_get_size (GTK_SIZE_REQUEST (bin->child),
+ NULL, &natural_size);
_gtk_plug_windowing_publish_natural_size (GTK_PLUG (widget), &natural_size);
}
diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
index 03e39eb..ebbb63b 100644
--- a/gtk/gtksocket.c
+++ b/gtk/gtksocket.c
@@ -37,7 +37,7 @@
#include "gtksocket.h"
#include "gtksocketprivate.h"
#include "gtkdnd.h"
-#include "gtkextendedlayout.h"
+#include "gtksizerequest.h"
#include "gtkintl.h"
#include "gtkalias.h"
@@ -139,13 +139,13 @@ static void gtk_socket_forall (GtkContainer *container,
GtkCallback callback,
gpointer callback_data);
-static void gtk_socket_extended_layout_init (GtkExtendedLayoutIface *iface);
-static void gtk_socket_get_desired_width (GtkExtendedLayout *layout,
- gint *minimum_size,
- gint *natural_size);
-static void gtk_socket_get_desired_height (GtkExtendedLayout *layout,
- gint *minimum_size,
- gint *natural_size);
+static void gtk_socket_size_request_init (GtkSizeRequestIface *iface);
+static void gtk_socket_get_width (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_socket_get_height (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size);
/* Local data */
@@ -178,8 +178,8 @@ _gtk_socket_get_private (GtkSocket *socket)
}
G_DEFINE_TYPE_WITH_CODE (GtkSocket, gtk_socket, GTK_TYPE_CONTAINER,
- G_IMPLEMENT_INTERFACE (GTK_TYPE_EXTENDED_LAYOUT,
- gtk_socket_extended_layout_init))
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_SIZE_REQUEST,
+ gtk_socket_size_request_init))
static void
@@ -1064,29 +1064,29 @@ _gtk_socket_advance_toplevel_focus (GtkSocket *socket,
}
static void
-gtk_socket_extended_layout_init (GtkExtendedLayoutIface *iface)
+gtk_socket_size_request_init (GtkSizeRequestIface *iface)
{
- iface->get_desired_width = gtk_socket_get_desired_width;
- iface->get_desired_height = gtk_socket_get_desired_height;
+ iface->get_width = gtk_socket_get_width;
+ iface->get_height = gtk_socket_get_height;
}
static void
-gtk_socket_get_desired_size (GtkExtendedLayout *layout,
- GtkOrientation orientation,
- gint *minimum_size,
- gint *natural_size)
+gtk_socket_get_size (GtkSizeRequest *widget,
+ GtkOrientation orientation,
+ gint *minimum_size,
+ gint *natural_size)
{
- GtkSocket *socket = GTK_SOCKET (layout);
+ GtkSocket *socket = GTK_SOCKET (widget);
GtkSocketPrivate *priv;
if (socket->plug_widget)
{
if (orientation == GTK_ORIENTATION_HORIZONTAL)
- gtk_extended_layout_get_desired_width (GTK_EXTENDED_LAYOUT (socket->plug_widget),
- minimum_size, natural_size);
+ gtk_size_request_get_width (GTK_SIZE_REQUEST (socket->plug_widget),
+ minimum_size, natural_size);
else
- gtk_extended_layout_get_desired_height (GTK_EXTENDED_LAYOUT (socket->plug_widget),
- minimum_size, natural_size);
+ gtk_size_request_get_height (GTK_SIZE_REQUEST (socket->plug_widget),
+ minimum_size, natural_size);
}
else
{
@@ -1125,19 +1125,19 @@ gtk_socket_get_desired_size (GtkExtendedLayout *layout,
}
static void
-gtk_socket_get_desired_width (GtkExtendedLayout *layout,
- gint *minimum_size,
- gint *natural_size)
+gtk_socket_get_width (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size)
{
- gtk_socket_get_desired_size (layout, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size);
+ gtk_socket_get_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size);
}
static void
-gtk_socket_get_desired_height (GtkExtendedLayout *layout,
- gint *minimum_size,
- gint *natural_size)
+gtk_socket_get_height (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size)
{
- gtk_socket_get_desired_size (layout, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
+ gtk_socket_get_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
}
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index fcb4f58..f10c28f 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -27,7 +27,7 @@
#include "gtktreednd.h"
#include "gtktreeprivate.h"
#include "gtkcellrenderer.h"
-#include "gtkextendedlayout.h"
+#include "gtksizerequest.h"
#include "gtkmain.h"
#include "gtkmarshalers.h"
#include "gtkbuildable.h"
@@ -470,13 +470,13 @@ static void gtk_tree_view_buildable_add_child (GtkBuildable *tree_view,
GObject *child,
const gchar *type);
static void gtk_tree_view_buildable_init (GtkBuildableIface *iface);
-static void gtk_tree_view_extended_layout_init (GtkExtendedLayoutIface *iface);
-static void gtk_tree_view_get_desired_width (GtkExtendedLayout *layout,
- gint *minimum_size,
- gint *natural_size);
-static void gtk_tree_view_get_desired_height (GtkExtendedLayout *layout,
- gint *minimum_size,
- gint *natural_size);
+static void gtk_tree_view_size_request_init (GtkSizeRequestIface *iface);
+static void gtk_tree_view_get_width (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size);
+static void gtk_tree_view_get_height (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size);
static gboolean scroll_row_timeout (gpointer data);
@@ -493,8 +493,8 @@ static guint tree_view_signals [LAST_SIGNAL] = { 0 };
G_DEFINE_TYPE_WITH_CODE (GtkTreeView, gtk_tree_view, GTK_TYPE_CONTAINER,
G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
gtk_tree_view_buildable_init)
- G_IMPLEMENT_INTERFACE (GTK_TYPE_EXTENDED_LAYOUT,
- gtk_tree_view_extended_layout_init))
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_SIZE_REQUEST,
+ gtk_tree_view_size_request_init))
static void
@@ -2156,8 +2156,8 @@ gtk_tree_view_get_real_natural_width_from_column (GtkTreeView *tree_view,
if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE))
{
- gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (column->button),
- TRUE, NULL, &button_natural_size);
+ gtk_size_request_get_size (GTK_SIZE_REQUEST (column->button),
+ NULL, &button_natural_size);
column_natural_width = MAX (column_natural_width, button_natural_size.width);
}
@@ -15701,26 +15701,26 @@ gtk_tree_view_get_minimum_size (GtkWidget *widget,
}
static void
-gtk_tree_view_extended_layout_init (GtkExtendedLayoutIface *iface)
+gtk_tree_view_size_request_init (GtkSizeRequestIface *iface)
{
- iface->get_desired_width = gtk_tree_view_get_desired_width;
- iface->get_desired_height = gtk_tree_view_get_desired_height;
+ iface->get_width = gtk_tree_view_get_width;
+ iface->get_height = gtk_tree_view_get_height;
}
static void
-gtk_tree_view_get_desired_size (GtkExtendedLayout *layout,
- GtkOrientation orientation,
- gint *minimum_size,
- gint *natural_size)
+gtk_tree_view_get_size (GtkSizeRequest *widget,
+ GtkOrientation orientation,
+ gint *minimum_size,
+ gint *natural_size)
{
GtkTreeView *tree_view;
gint natural_width = 0;
GList *column_iter;
GtkRequisition requisition;
- tree_view = GTK_TREE_VIEW (layout);
+ tree_view = GTK_TREE_VIEW (widget);
- gtk_tree_view_get_minimum_size (GTK_WIDGET (layout), &requisition);
+ gtk_tree_view_get_minimum_size (GTK_WIDGET (widget), &requisition);
if (orientation == GTK_ORIENTATION_HORIZONTAL)
{
@@ -15751,19 +15751,19 @@ gtk_tree_view_get_desired_size (GtkExtendedLayout *layout,
}
static void
-gtk_tree_view_get_desired_width (GtkExtendedLayout *layout,
- gint *minimum_size,
- gint *natural_size)
+gtk_tree_view_get_width (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size)
{
- gtk_tree_view_get_desired_size (layout, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size);
+ gtk_tree_view_get_size (widget, GTK_ORIENTATION_HORIZONTAL, minimum_size, natural_size);
}
static void
-gtk_tree_view_get_desired_height (GtkExtendedLayout *layout,
- gint *minimum_size,
- gint *natural_size)
+gtk_tree_view_get_height (GtkSizeRequest *widget,
+ gint *minimum_size,
+ gint *natural_size)
{
- gtk_tree_view_get_desired_size (layout, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
+ gtk_tree_view_get_size (widget, GTK_ORIENTATION_VERTICAL, minimum_size, natural_size);
}
#define __GTK_TREE_VIEW_C__
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
