projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
csv-file-writer: Use comma as default delimiter.
[pspp]
/
src
/
ui
/
gui
/
psppire-hbuttonbox.c
diff --git
a/src/ui/gui/psppire-hbuttonbox.c
b/src/ui/gui/psppire-hbuttonbox.c
index 0e62d509e747f8dc7634e39a8b2ce2ce14535462..9ce34bb491e3de783550ef7b9ad74fae347c08fd 100644
(file)
--- a/
src/ui/gui/psppire-hbuttonbox.c
+++ b/
src/ui/gui/psppire-hbuttonbox.c
@@
-1,5
+1,5
@@
/* PSPPIRE - a graphical user interface for PSPP.
/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2007, 2010 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
@@
-162,7
+162,6
@@
gtk_hbutton_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;
@@
-236,25
+235,29
@@
gtk_hbutton_box_size_allocate (GtkWidget *widget,
y = allocation->y + (allocation->height - child_height) / 2;
childspace = child_width + childspacing;
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)
{
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.y = y;
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;
}
child_allocation.x = secondary_x;
secondary_x += childspace;
}
- else
+
else
{
child_allocation.x = x;
x += childspace;
{
child_allocation.x = x;
x += childspace;
@@
-263,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);
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);
}
}
}
}
}
}