summaryrefslogtreecommitdiff
path: root/gtk/gtktable.c
diff options
context:
space:
mode:
Diffstat (limited to 'gtk/gtktable.c')
-rw-r--r--gtk/gtktable.c85
1 files changed, 45 insertions, 40 deletions
diff --git a/gtk/gtktable.c b/gtk/gtktable.c
index e011611215..0380aa0c39 100644
--- a/gtk/gtktable.c
+++ b/gtk/gtktable.c
@@ -31,7 +31,7 @@
-struct _GtkTablePriv
+struct _GtkTablePrivate
{
GtkTableRowCol *cols;
GtkTableRowCol *rows;
@@ -240,7 +240,7 @@ gtk_table_class_init (GtkTableClass *class)
0, 65535, 0,
GTK_PARAM_READWRITE));
- g_type_class_add_private (class, sizeof (GtkTablePriv));
+ g_type_class_add_private (class, sizeof (GtkTablePrivate));
}
static GType
@@ -256,7 +256,7 @@ gtk_table_get_property (GObject *object,
GParamSpec *pspec)
{
GtkTable *table = GTK_TABLE (object);
- GtkTablePriv *priv = table->priv;
+ GtkTablePrivate *priv = table->priv;
switch (prop_id)
{
@@ -288,7 +288,7 @@ gtk_table_set_property (GObject *object,
GParamSpec *pspec)
{
GtkTable *table = GTK_TABLE (object);
- GtkTablePriv *priv = table->priv;
+ GtkTablePrivate *priv = table->priv;
switch (prop_id)
{
@@ -321,7 +321,7 @@ gtk_table_set_child_property (GtkContainer *container,
GParamSpec *pspec)
{
GtkTable *table = GTK_TABLE (container);
- GtkTablePriv *priv = table->priv;
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *table_child;
GList *list;
@@ -402,7 +402,7 @@ gtk_table_get_child_property (GtkContainer *container,
GParamSpec *pspec)
{
GtkTable *table = GTK_TABLE (container);
- GtkTablePriv *priv = table->priv;
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *table_child;
GList *list;
@@ -459,11 +459,11 @@ gtk_table_get_child_property (GtkContainer *container,
static void
gtk_table_init (GtkTable *table)
{
- GtkTablePriv *priv;
+ GtkTablePrivate *priv;
table->priv = G_TYPE_INSTANCE_GET_PRIVATE (table,
GTK_TYPE_TABLE,
- GtkTablePriv);
+ GtkTablePrivate);
priv = table->priv;
gtk_widget_set_has_window (GTK_WIDGET (table), FALSE);
@@ -487,7 +487,7 @@ gtk_table_new (guint rows,
gboolean homogeneous)
{
GtkTable *table;
- GtkTablePriv *priv;
+ GtkTablePrivate *priv;
if (rows == 0)
rows = 1;
@@ -509,7 +509,7 @@ gtk_table_resize (GtkTable *table,
guint n_rows,
guint n_cols)
{
- GtkTablePriv *priv;
+ GtkTablePrivate *priv;
g_return_if_fail (GTK_IS_TABLE (table));
g_return_if_fail (n_rows > 0 && n_rows <= 65535);
@@ -593,13 +593,13 @@ gtk_table_attach (GtkTable *table,
guint xpadding,
guint ypadding)
{
- GtkTablePriv *priv = table->priv;
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *table_child;
g_return_if_fail (GTK_IS_TABLE (table));
g_return_if_fail (GTK_IS_WIDGET (child));
- g_return_if_fail (child->parent == NULL);
-
+ g_return_if_fail (gtk_widget_get_parent (child) == NULL);
+
/* g_return_if_fail (left_attach >= 0); */
g_return_if_fail (left_attach < right_attach);
/* g_return_if_fail (top_attach >= 0); */
@@ -654,7 +654,7 @@ gtk_table_set_row_spacing (GtkTable *table,
guint row,
guint spacing)
{
- GtkTablePriv *priv;
+ GtkTablePrivate *priv;
g_return_if_fail (GTK_IS_TABLE (table));
@@ -685,7 +685,7 @@ guint
gtk_table_get_row_spacing (GtkTable *table,
guint row)
{
- GtkTablePriv *priv;
+ GtkTablePrivate *priv;
g_return_val_if_fail (GTK_IS_TABLE (table), 0);
@@ -701,7 +701,7 @@ gtk_table_set_col_spacing (GtkTable *table,
guint column,
guint spacing)
{
- GtkTablePriv *priv;
+ GtkTablePrivate *priv;
g_return_if_fail (GTK_IS_TABLE (table));
@@ -732,7 +732,7 @@ guint
gtk_table_get_col_spacing (GtkTable *table,
guint column)
{
- GtkTablePriv *priv;
+ GtkTablePrivate *priv;
g_return_val_if_fail (GTK_IS_TABLE (table), 0);
@@ -747,7 +747,7 @@ void
gtk_table_set_row_spacings (GtkTable *table,
guint spacing)
{
- GtkTablePriv *priv;
+ GtkTablePrivate *priv;
guint row;
g_return_if_fail (GTK_IS_TABLE (table));
@@ -786,7 +786,7 @@ void
gtk_table_set_col_spacings (GtkTable *table,
guint spacing)
{
- GtkTablePriv *priv;
+ GtkTablePrivate *priv;
guint col;
g_return_if_fail (GTK_IS_TABLE (table));
@@ -825,7 +825,7 @@ void
gtk_table_set_homogeneous (GtkTable *table,
gboolean homogeneous)
{
- GtkTablePriv *priv;
+ GtkTablePrivate *priv;
g_return_if_fail (GTK_IS_TABLE (table));
@@ -877,7 +877,7 @@ gtk_table_get_size (GtkTable *table,
guint *rows,
guint *columns)
{
- GtkTablePriv *priv;
+ GtkTablePrivate *priv;
g_return_if_fail (GTK_IS_TABLE (table));
@@ -894,7 +894,7 @@ static void
gtk_table_finalize (GObject *object)
{
GtkTable *table = GTK_TABLE (object);
- GtkTablePriv *priv = table->priv;
+ GtkTablePrivate *priv = table->priv;
g_free (priv->rows);
g_free (priv->cols);
@@ -907,7 +907,7 @@ gtk_table_size_request (GtkWidget *widget,
GtkRequisition *requisition)
{
GtkTable *table = GTK_TABLE (widget);
- GtkTablePriv *priv = table->priv;
+ GtkTablePrivate *priv = table->priv;
gint row, col;
guint border_width;
@@ -941,7 +941,7 @@ gtk_table_size_allocate (GtkWidget *widget,
{
GtkTable *table = GTK_TABLE (widget);
- widget->allocation = *allocation;
+ gtk_widget_set_allocation (widget, allocation);
gtk_table_size_allocate_init (table);
gtk_table_size_allocate_pass1 (table);
@@ -960,7 +960,7 @@ gtk_table_remove (GtkContainer *container,
GtkWidget *widget)
{
GtkTable *table = GTK_TABLE (container);
- GtkTablePriv *priv = table->priv;
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *child;
GtkWidget *widget_container = GTK_WIDGET (container);
GList *children;
@@ -995,7 +995,7 @@ gtk_table_forall (GtkContainer *container,
gpointer callback_data)
{
GtkTable *table = GTK_TABLE (container);
- GtkTablePriv *priv = table->priv;
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *child;
GList *children;
@@ -1013,7 +1013,7 @@ gtk_table_forall (GtkContainer *container,
static void
gtk_table_size_request_init (GtkTable *table)
{
- GtkTablePriv *priv = table->priv;
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *child;
GList *children;
gint row, col;
@@ -1049,7 +1049,7 @@ gtk_table_size_request_init (GtkTable *table)
static void
gtk_table_size_request_pass1 (GtkTable *table)
{
- GtkTablePriv *priv = table->priv;
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *child;
GList *children;
gint width;
@@ -1088,7 +1088,7 @@ gtk_table_size_request_pass1 (GtkTable *table)
static void
gtk_table_size_request_pass2 (GtkTable *table)
{
- GtkTablePriv *priv = table->priv;
+ GtkTablePrivate *priv = table->priv;
gint max_width;
gint max_height;
gint row, col;
@@ -1113,7 +1113,7 @@ gtk_table_size_request_pass2 (GtkTable *table)
static void
gtk_table_size_request_pass3 (GtkTable *table)
{
- GtkTablePriv *priv = table->priv;
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *child;
GList *children;
gint width, height;
@@ -1238,7 +1238,7 @@ gtk_table_size_request_pass3 (GtkTable *table)
static void
gtk_table_size_allocate_init (GtkTable *table)
{
- GtkTablePriv *priv = table->priv;
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *child;
GList *children;
gint row, col;
@@ -1433,7 +1433,8 @@ gtk_table_size_allocate_init (GtkTable *table)
static void
gtk_table_size_allocate_pass1 (GtkTable *table)
{
- GtkTablePriv *priv = table->priv;
+ GtkTablePrivate *priv = table->priv;
+ GtkAllocation allocation;
gint real_width;
gint real_height;
gint width, height;
@@ -1447,9 +1448,10 @@ gtk_table_size_allocate_pass1 (GtkTable *table)
* then we have to expand any expandable rows and columns
* to fill in the extra space.
*/
+ gtk_widget_get_allocation (GTK_WIDGET (table), &allocation);
border_width = gtk_container_get_border_width (GTK_CONTAINER (table));
- real_width = GTK_WIDGET (table)->allocation.width - border_width * 2;
- real_height = GTK_WIDGET (table)->allocation.height - border_width * 2;
+ real_width = allocation.width - border_width * 2;
+ real_height = allocation.height - border_width * 2;
if (priv->homogeneous)
{
@@ -1638,7 +1640,7 @@ gtk_table_size_allocate_pass1 (GtkTable *table)
static void
gtk_table_size_allocate_pass2 (GtkTable *table)
{
- GtkTablePriv *priv = table->priv;
+ GtkTablePrivate *priv = table->priv;
GtkTableChild *child;
GList *children;
gint max_width;
@@ -1646,6 +1648,7 @@ gtk_table_size_allocate_pass2 (GtkTable *table)
gint x, y;
gint row, col;
GtkAllocation allocation;
+ GtkAllocation table_allocation, widget_allocation;
GtkWidget *widget = GTK_WIDGET (table);
children = priv->children;
@@ -1661,9 +1664,10 @@ gtk_table_size_allocate_pass2 (GtkTable *table)
gtk_widget_get_child_requisition (child->widget, &child_requisition);
+ gtk_widget_get_allocation (GTK_WIDGET (table), &table_allocation);
border_width = gtk_container_get_border_width (GTK_CONTAINER (table));
- x = GTK_WIDGET (table)->allocation.x + border_width;
- y = GTK_WIDGET (table)->allocation.y + border_width;
+ x = table_allocation.x + border_width;
+ y = table_allocation.y + border_width;
max_width = 0;
max_height = 0;
@@ -1715,10 +1719,11 @@ gtk_table_size_allocate_pass2 (GtkTable *table)
allocation.y = y + (max_height - allocation.height) / 2;
}
+ gtk_widget_get_allocation (widget, &widget_allocation);
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
- allocation.x = widget->allocation.x + widget->allocation.width
- - (allocation.x - widget->allocation.x) - allocation.width;
-
+ allocation.x = widget_allocation.x + widget_allocation.width
+ - (allocation.x - widget_allocation.x) - allocation.width;
+
gtk_widget_size_allocate (child->widget, &allocation);
}
}
View Lorry Controller Status