/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007 Free Software Foundation
+ 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
#include <glib.h>
#include <gtk/gtk.h>
-#include <gtk/gtksignal.h>
#include "psppire-hbuttonbox.h"
#include "psppire-dialog.h"
-#include <gtk/gtkbbox.h>
-
#include <gettext.h>
#define _(msgid) gettext (msgid)
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)
{
GtkBox *base_box;
GtkButtonBox *box;
- GtkBoxChild *child;
GList *children;
GtkAllocation child_allocation;
gint nvis_children;
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;
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);
}
}
}