-/*
- 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 <http://www.gnu.org/licenses/>. */
#include <config.h>
#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 void
+psppire_hbutton_box_get_preferred_height (GtkWidget *widget,
+ gint *minimal_height,
+ gint *natural_height)
+{
+ GtkRequisition requisition;
+
+ gtk_hbutton_box_size_request (widget, &requisition);
+
+ *minimal_height = *natural_height = requisition.height;
+}
+
+
+static void
+psppire_hbutton_box_get_preferred_width (GtkWidget *widget,
+ gint *minimal_width,
+ gint *natural_width)
+{
+ GtkRequisition requisition;
+
+ gtk_hbutton_box_size_request (widget, &requisition);
+
+ *minimal_width = *natural_width = requisition.width;
+}
+
+
+
GType
psppire_hbutton_box_get_type (void)
widget_class = (GtkWidgetClass*) class;
- widget_class->size_request = gtk_hbutton_box_size_request;
+ widget_class->get_preferred_width = psppire_hbutton_box_get_preferred_width;
+ widget_class->get_preferred_height = psppire_hbutton_box_get_preferred_height;
widget_class->size_allocate = gtk_hbutton_box_size_allocate;
}
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) ;
_psppire_button_box_child_requisition (widget,
&nvis_children,
requisition->width =
nvis_children*child_width + ((nvis_children+1)*spacing);
break;
+ default:
case GTK_BUTTONBOX_EDGE:
case GTK_BUTTONBOX_START:
case GTK_BUTTONBOX_END:
requisition->width = nvis_children*child_width + ((nvis_children-1)*spacing);
break;
- default:
- g_assert_not_reached();
- break;
}
requisition->height = child_height;
}
- 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;
}
{
GtkBox *base_box;
GtkButtonBox *box;
- GtkBoxChild *child;
GList *children;
GtkAllocation child_allocation;
gint nvis_children;
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) ;
_psppire_button_box_child_requisition (widget,
&nvis_children,
&n_secondaries,
&child_width,
&child_height);
- widget->allocation = *allocation;
- width = allocation->width - GTK_CONTAINER (box)->border_width*2;
+ gtk_widget_set_allocation (widget, allocation);
+ width = allocation->width - gtk_container_get_border_width (GTK_CONTAINER (box))*2;
switch (layout)
{
case GTK_BUTTONBOX_SPREAD:
childspacing = (width - (nvis_children * child_width)) / (nvis_children + 1);
- x = allocation->x + GTK_CONTAINER (box)->border_width + childspacing;
+ x = allocation->x + gtk_container_get_border_width (GTK_CONTAINER (box)) + childspacing;
secondary_x = x + ((nvis_children - n_secondaries) * (child_width + childspacing));
break;
+ default:
case GTK_BUTTONBOX_EDGE:
if (nvis_children >= 2)
{
childspacing = (width - (nvis_children * child_width)) / (nvis_children - 1);
- x = allocation->x + GTK_CONTAINER (box)->border_width;
+ x = allocation->x + gtk_container_get_border_width (GTK_CONTAINER (box));
secondary_x = x + ((nvis_children - n_secondaries) * (child_width + childspacing));
}
else
break;
case GTK_BUTTONBOX_START:
childspacing = spacing;
- x = allocation->x + GTK_CONTAINER (box)->border_width;
+ x = allocation->x + gtk_container_get_border_width (GTK_CONTAINER (box));
secondary_x = allocation->x + allocation->width
- child_width * 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;
x = allocation->x + allocation->width
- child_width * (nvis_children - n_secondaries)
- spacing * (nvis_children - n_secondaries - 1)
- - GTK_CONTAINER (box)->border_width;
- secondary_x = allocation->x + GTK_CONTAINER (box)->border_width;
- break;
- default:
- g_assert_not_reached();
+ - gtk_container_get_border_width (GTK_CONTAINER (box));
+ secondary_x = allocation->x + gtk_container_get_border_width (GTK_CONTAINER (box));
break;
}
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);
}
}
}
projects / pspp / blobdiff