X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-hbuttonbox.c;h=9ce34bb491e3de783550ef7b9ad74fae347c08fd;hb=fbaa01a45afaa56c8aa46a99ff95864beebe2237;hp=8b146a9bab1d528ca9fb1ed2c63c9d63a8aab0ca;hpb=146997e1690f055481e2003529eaa4f8848ca4a8;p=pspp
diff --git a/src/ui/gui/psppire-hbuttonbox.c b/src/ui/gui/psppire-hbuttonbox.c
index 8b146a9bab..9ce34bb491 100644
--- a/src/ui/gui/psppire-hbuttonbox.c
+++ b/src/ui/gui/psppire-hbuttonbox.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-hbuttonbox.h"
#include "psppire-dialog.h"
-#include
-
#include
#define _(msgid) gettext (msgid)
@@ -43,7 +37,7 @@ static void gtk_hbutton_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_hbutton_box_get_type (void)
@@ -168,7 +162,6 @@ gtk_hbutton_box_size_allocate (GtkWidget *widget,
{
GtkBox *base_box;
GtkButtonBox *box;
- GtkBoxChild *child;
GList *children;
GtkAllocation child_allocation;
gint nvis_children;
@@ -242,25 +235,29 @@ gtk_hbutton_box_size_allocate (GtkWidget *widget,
y = allocation->y + (allocation->height - child_height) / 2;
childspace = child_width + 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.y = y;
- if (child->is_secondary)
- {
+ if (is_secondary)
+ {
child_allocation.x = secondary_x;
secondary_x += childspace;
}
- else
+ else
{
child_allocation.x = x;
x += childspace;
@@ -269,7 +266,7 @@ gtk_hbutton_box_size_allocate (GtkWidget *widget,
if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
child_allocation.x = (allocation->x + allocation->width) - (child_allocation.x + child_width - allocation->x);
- gtk_widget_size_allocate (child->widget, &child_allocation);
+ gtk_widget_size_allocate (child, &child_allocation);
}
}
}