projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
psppire-dictview: Generalize psppire_dict_view_get_var_measurement_stock_id().
[pspp]
/
src
/
ui
/
gui
/
psppire-vbuttonbox.c
diff --git
a/src/ui/gui/psppire-vbuttonbox.c
b/src/ui/gui/psppire-vbuttonbox.c
index 98c2898ce2b4709edacf8d738fff3757e9ae57d7..eb9a662ecb215e7080094a269ecf5ec9c7afe106 100644
(file)
--- a/
src/ui/gui/psppire-vbuttonbox.c
+++ b/
src/ui/gui/psppire-vbuttonbox.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* 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
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
@@
-19,12
+19,9
@@
#include <glib.h>
#include <gtk/gtk.h>
#include <glib.h>
#include <gtk/gtk.h>
-#include <gtk/gtksignal.h>
#include "psppire-vbuttonbox.h"
#include "psppire-dialog.h"
#include "psppire-vbuttonbox.h"
#include "psppire-dialog.h"
-#include <gtk/gtkbbox.h>
-
#include <gettext.h>
#define _(msgid) gettext (msgid)
#include <gettext.h>
#define _(msgid) gettext (msgid)
@@
-165,7
+162,6
@@
gtk_vbutton_box_size_allocate (GtkWidget *widget,
{
GtkBox *base_box;
GtkButtonBox *box;
{
GtkBox *base_box;
GtkButtonBox *box;
- GtkBoxChild *child;
GList *children;
GtkAllocation child_allocation;
gint nvis_children;
GList *children;
GtkAllocation child_allocation;
gint nvis_children;
@@
-238,20
+234,22
@@
gtk_vbutton_box_size_allocate (GtkWidget *widget,
x = allocation->x + (allocation->width - child_width) / 2;
childspace = child_height + childspacing;
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)
{
while (children)
{
- child = children->data;
+
GtkWidget *
child = children->data;
children = children->next;
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;
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;
{
child_allocation.y = secondary_y;
secondary_y += childspace;
@@
-262,7
+260,7
@@
gtk_vbutton_box_size_allocate (GtkWidget *widget,
y += childspace;
}
y += childspace;
}
- gtk_widget_size_allocate (child
->widget
, &child_allocation);
+ gtk_widget_size_allocate (child, &child_allocation);
}
}
}
}
}
}