X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-vbuttonbox.c;h=2af878f38e967c03819d8c6545be514b2a03f103;hb=20f28c180d171a2f0e707c274b249d90f8d903e0;hp=59ae0cc45385fe573bf3665a1c7222f1260c6ec6;hpb=146997e1690f055481e2003529eaa4f8848ca4a8;p=pspp
diff --git a/src/ui/gui/psppire-vbuttonbox.c b/src/ui/gui/psppire-vbuttonbox.c
index 59ae0cc453..2af878f38e 100644
--- a/src/ui/gui/psppire-vbuttonbox.c
+++ b/src/ui/gui/psppire-vbuttonbox.c
@@ -1,33 +1,27 @@
-/*
- PSPPIRE --- A Graphical User Interface for PSPP
- Copyright (C) 2007 Free Software Foundation
+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2007, 2010, 2011 Free Software Foundation
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA. */
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see . */
#include
#include
#include
-#include
#include "psppire-vbuttonbox.h"
#include "psppire-dialog.h"
-#include
-
#include
#define _(msgid) gettext (msgid)
@@ -43,7 +37,7 @@ static void gtk_vbutton_box_size_allocate (GtkWidget *widget,
GtkAllocation *allocation);
-static GtkButtonBoxStyle default_layout_style = GTK_BUTTONBOX_EDGE;
+static const GtkButtonBoxStyle default_layout_style = GTK_BUTTONBOX_EDGE;
GType
psppire_vbutton_box_get_type (void)
@@ -120,9 +114,9 @@ gtk_vbutton_box_size_request (GtkWidget *widget,
box = GTK_BOX (widget);
bbox = GTK_BUTTON_BOX (widget);
- spacing = box->spacing;
- layout = bbox->layout_style != GTK_BUTTONBOX_DEFAULT_STYLE
- ? bbox->layout_style : default_layout_style;
+ spacing = gtk_box_get_spacing (box);
+ layout = gtk_button_box_get_layout (bbox) != GTK_BUTTONBOX_DEFAULT_STYLE
+ ? gtk_button_box_get_layout (bbox) : default_layout_style;
_psppire_button_box_child_requisition (widget,
&nvis_children,
@@ -156,8 +150,8 @@ gtk_vbutton_box_size_request (GtkWidget *widget,
requisition->width = child_width;
}
- requisition->width += GTK_CONTAINER (box)->border_width * 2;
- requisition->height += GTK_CONTAINER (box)->border_width * 2;
+ requisition->width += gtk_container_get_border_width (GTK_CONTAINER (box)) * 2;
+ requisition->height += gtk_container_get_border_width (GTK_CONTAINER (box)) * 2;
}
@@ -168,7 +162,6 @@ gtk_vbutton_box_size_allocate (GtkWidget *widget,
{
GtkBox *base_box;
GtkButtonBox *box;
- GtkBoxChild *child;
GList *children;
GtkAllocation child_allocation;
gint nvis_children;
@@ -186,28 +179,28 @@ gtk_vbutton_box_size_allocate (GtkWidget *widget,
base_box = GTK_BOX (widget);
box = GTK_BUTTON_BOX (widget);
- spacing = base_box->spacing;
- layout = box->layout_style != GTK_BUTTONBOX_DEFAULT_STYLE
- ? box->layout_style : default_layout_style;
+ spacing = gtk_box_get_spacing (base_box);
+ layout = gtk_button_box_get_layout (box) != GTK_BUTTONBOX_DEFAULT_STYLE
+ ? gtk_button_box_get_layout (box) : default_layout_style;
_psppire_button_box_child_requisition (widget,
&nvis_children,
&n_secondaries,
&child_width,
&child_height);
- widget->allocation = *allocation;
- height = allocation->height - GTK_CONTAINER (box)->border_width*2;
+ gtk_widget_set_allocation (widget, allocation);
+ height = allocation->height - gtk_container_get_border_width (GTK_CONTAINER (box))*2;
switch (layout)
{
case GTK_BUTTONBOX_SPREAD:
childspacing = (height - (nvis_children * child_height)) / (nvis_children + 1);
- y = allocation->y + GTK_CONTAINER (box)->border_width + childspacing;
+ y = allocation->y + gtk_container_get_border_width (GTK_CONTAINER (box)) + childspacing;
secondary_y = y + ((nvis_children - n_secondaries) * (child_height + childspacing));
break;
case GTK_BUTTONBOX_EDGE:
if (nvis_children >= 2)
{
childspacing = (height - (nvis_children*child_height)) / (nvis_children-1);
- y = allocation->y + GTK_CONTAINER (box)->border_width;
+ y = allocation->y + gtk_container_get_border_width (GTK_CONTAINER (box));
secondary_y = y + ((nvis_children - n_secondaries) * (child_height + childspacing));
}
else
@@ -219,19 +212,19 @@ gtk_vbutton_box_size_allocate (GtkWidget *widget,
break;
case GTK_BUTTONBOX_START:
childspacing = spacing;
- y = allocation->y + GTK_CONTAINER (box)->border_width;
+ y = allocation->y + gtk_container_get_border_width (GTK_CONTAINER (box));
secondary_y = allocation->y + allocation->height
- child_height * n_secondaries
- spacing * (n_secondaries - 1)
- - GTK_CONTAINER (box)->border_width;
+ - gtk_container_get_border_width (GTK_CONTAINER (box));
break;
case GTK_BUTTONBOX_END:
childspacing = spacing;
y = allocation->y + allocation->height
- child_height * (nvis_children - n_secondaries)
- spacing * (nvis_children - n_secondaries - 1)
- - GTK_CONTAINER (box)->border_width;
- secondary_y = allocation->y + GTK_CONTAINER (box)->border_width;
+ - gtk_container_get_border_width (GTK_CONTAINER (box));
+ secondary_y = allocation->y + gtk_container_get_border_width (GTK_CONTAINER (box));
break;
default:
g_assert_not_reached();
@@ -241,20 +234,22 @@ gtk_vbutton_box_size_allocate (GtkWidget *widget,
x = allocation->x + (allocation->width - child_width) / 2;
childspace = child_height + childspacing;
- children = GTK_BOX (box)->children;
-
+ children = gtk_container_get_children (GTK_CONTAINER (box));
while (children)
{
- child = children->data;
+ GtkWidget *child = children->data;
children = children->next;
- if (GTK_WIDGET_VISIBLE (child->widget))
+ if (gtk_widget_get_visible (child))
{
+ gboolean is_secondary = FALSE;
+ gtk_container_child_get (GTK_CONTAINER (box), child, "secondary", &is_secondary, NULL);
+
child_allocation.width = child_width;
child_allocation.height = child_height;
child_allocation.x = x;
- if (child->is_secondary)
+ if (is_secondary)
{
child_allocation.y = secondary_y;
secondary_y += childspace;
@@ -265,7 +260,7 @@ gtk_vbutton_box_size_allocate (GtkWidget *widget,
y += childspace;
}
- gtk_widget_size_allocate (child->widget, &child_allocation);
+ gtk_widget_size_allocate (child, &child_allocation);
}
}
}