summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--demos/gtk-demo/panes.c60
-rw-r--r--demos/gtk-demo/textview.c8
-rw-r--r--demos/node-editor/node-editor-window.ui2
-rw-r--r--docs/tools/widgets.c42
-rw-r--r--gtk/a11y/gtkpanedaccessible.c2
-rw-r--r--gtk/a11y/gtkpanedaccessible.h6
-rw-r--r--gtk/gtkfilechooserwidget.c2
-rw-r--r--gtk/gtkpaned.c1508
-rw-r--r--gtk/gtkpaned.h49
-rw-r--r--gtk/ui/gtkfilechooserwidget.ui6
-rw-r--r--tests/testcalendar.c8
-rw-r--r--tests/testgrid.c8
-rw-r--r--tests/testgtk.c132
-rw-r--r--tests/testiconview.c6
-rw-r--r--testsuite/reftests/button-wrapping.ref.ui16
-rw-r--r--testsuite/reftests/button-wrapping.ui16
-rw-r--r--testsuite/reftests/label-sizing.ref.ui1152
-rw-r--r--testsuite/reftests/label-sizing.ui1152
-rw-r--r--testsuite/reftests/paned-undersized.ref.ui4
-rw-r--r--testsuite/reftests/paned-undersized.ui2
20 files changed, 2145 insertions, 2036 deletions
diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c
index 7d94ae5cbe..f47cc32b60 100644
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -19,32 +19,14 @@ toggle_resize (GtkWidget *widget,
{
GtkWidget *parent;
GtkPaned *paned;
- gboolean is_child1;
- gboolean resize, shrink;
parent = gtk_widget_get_parent (child);
paned = GTK_PANED (parent);
- is_child1 = (child == gtk_paned_get_child1 (paned));
-
- if (is_child1)
- g_object_get (paned,
- "resize-child1", &resize,
- "shrink-child1", &shrink,
- NULL);
- else
- g_object_get (paned,
- "resize-child2", &resize,
- "shrink-child2", &shrink,
- NULL);
-
- g_object_ref (child);
- gtk_container_remove (GTK_CONTAINER (parent), child);
- if (is_child1)
- gtk_paned_pack1 (paned, child, !resize, shrink);
+ if (child == gtk_paned_get_start_child (paned))
+ gtk_paned_set_resize_start_child (paned, !gtk_paned_get_resize_start_child (paned));
else
- gtk_paned_pack2 (paned, child, !resize, shrink);
- g_object_unref (child);
+ gtk_paned_set_resize_end_child (paned, !gtk_paned_get_resize_end_child (paned));
}
static void
@@ -53,32 +35,14 @@ toggle_shrink (GtkWidget *widget,
{
GtkWidget *parent;
GtkPaned *paned;
- gboolean is_child1;
- gboolean resize, shrink;
parent = gtk_widget_get_parent (child);
paned = GTK_PANED (parent);
- is_child1 = (child == gtk_paned_get_child1 (paned));
-
- if (is_child1)
- g_object_get (paned,
- "resize-child1", &resize,
- "shrink-child1", &shrink,
- NULL);
- else
- g_object_get (paned,
- "resize-child2", &resize,
- "shrink-child2", &shrink,
- NULL);
-
- g_object_ref (child);
- gtk_container_remove (GTK_CONTAINER (parent), child);
- if (is_child1)
- gtk_paned_pack1 (paned, child, resize, !shrink);
+ if (child == gtk_paned_get_start_child (paned))
+ gtk_paned_set_shrink_start_child (paned, !gtk_paned_get_shrink_start_child (paned));
else
- gtk_paned_pack2 (paned, child, resize, !shrink);
- g_object_unref (child);
+ gtk_paned_set_shrink_end_child (paned, !gtk_paned_get_shrink_end_child (paned));
}
static GtkWidget *
@@ -93,8 +57,8 @@ create_pane_options (GtkPaned *paned,
GtkWidget *label;
GtkWidget *check_button;
- child1 = gtk_paned_get_child1 (paned);
- child2 = gtk_paned_get_child2 (paned);
+ child1 = gtk_paned_get_start_child (paned);
+ child2 = gtk_paned_get_end_child (paned);
frame = gtk_frame_new (frame_label);
gtk_widget_set_margin_start (frame, 4);
@@ -167,22 +131,22 @@ do_panes (GtkWidget *do_widget)
gtk_container_add (GTK_CONTAINER (vbox), vpaned);
hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_paned_add1 (GTK_PANED (vpaned), hpaned);
+ gtk_paned_set_start_child (GTK_PANED (vpaned), hpaned);
frame = gtk_frame_new (NULL);
gtk_widget_set_size_request (frame, 60, 60);
- gtk_paned_add1 (GTK_PANED (hpaned), frame);
+ gtk_paned_set_start_child (GTK_PANED (hpaned), frame);
button = gtk_button_new_with_mnemonic ("_Hi there");
gtk_frame_set_child (GTK_FRAME (frame), button);
frame = gtk_frame_new (NULL);
gtk_widget_set_size_request (frame, 80, 60);
- gtk_paned_add2 (GTK_PANED (hpaned), frame);
+ gtk_paned_set_end_child (GTK_PANED (hpaned), frame);
frame = gtk_frame_new (NULL);
gtk_widget_set_size_request (frame, 60, 80);
- gtk_paned_add2 (GTK_PANED (vpaned), frame);
+ gtk_paned_set_end_child (GTK_PANED (vpaned), frame);
/* Now create toggle buttons to control sizing */
diff --git a/demos/gtk-demo/textview.c b/demos/gtk-demo/textview.c
index bb90358b0c..cf7004a7e8 100644
--- a/demos/gtk-demo/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -498,7 +498,9 @@ do_textview (GtkWidget *do_widget)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_paned_add1 (GTK_PANED (vpaned), sw);
+ gtk_paned_set_start_child (GTK_PANED (vpaned), sw);
+ gtk_paned_set_resize_start_child (GTK_PANED (vpaned), FALSE);
+ gtk_paned_set_shrink_start_child (GTK_PANED (vpaned), TRUE);
gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view1);
@@ -506,7 +508,9 @@ do_textview (GtkWidget *do_widget)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_paned_add2 (GTK_PANED (vpaned), sw);
+ gtk_paned_set_end_child (GTK_PANED (vpaned), sw);
+ gtk_paned_set_resize_end_child (GTK_PANED (vpaned), TRUE);
+ gtk_paned_set_shrink_end_child (GTK_PANED (vpaned), TRUE);
gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), view2);
diff --git a/demos/node-editor/node-editor-window.ui b/demos/node-editor/node-editor-window.ui
index 3a8373a080..835b154ec6 100644
--- a/demos/node-editor/node-editor-window.ui
+++ b/demos/node-editor/node-editor-window.ui
@@ -123,7 +123,7 @@
</child>
<child>
<object class="GtkPaned">
- <property name="shrink-child2">false</property>
+ <property name="shrink-end-child">false</property>
<property name="position">400</property>
<child>
<object class="GtkScrolledWindow">
diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 715343998e..3415b2b730 100644
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -656,28 +656,38 @@ create_panes (void)
GtkWidget *hbox;
GtkWidget *vbox;
GtkWidget *pane;
+ GtkWidget *frame;
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_paned_pack1 (GTK_PANED (pane),
- g_object_new (GTK_TYPE_FRAME, NULL),
- FALSE, FALSE);
- gtk_paned_pack2 (GTK_PANED (pane),
- g_object_new (GTK_TYPE_FRAME, NULL),
- FALSE, FALSE);
- gtk_container_add (GTK_CONTAINER (hbox),
- pane);
+
+ frame = gtk_frame_new ("");
+ gtk_paned_set_start_child (GTK_PANED (pane), frame);
+ gtk_paned_set_resize_start_child (GTK_PANED (pane), FALSE);
+ gtk_paned_set_shrink_start_child (GTK_PANED (pane), FALSE);
+
+ frame = gtk_frame_new ("");
+ gtk_paned_set_end_child (GTK_PANED (pane), frame);
+ gtk_paned_set_resize_end_child (GTK_PANED (pane), FALSE);
+ gtk_paned_set_shrink_end_child (GTK_PANED (pane), FALSE);
+
+ gtk_container_add (GTK_CONTAINER (hbox), pane);
pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
- gtk_paned_pack1 (GTK_PANED (pane),
- g_object_new (GTK_TYPE_FRAME, NULL),
- FALSE, FALSE);
- gtk_paned_pack2 (GTK_PANED (pane),
- g_object_new (GTK_TYPE_FRAME, NULL),
- FALSE, FALSE);
- gtk_container_add (GTK_CONTAINER (hbox),
- pane);
+
+ frame = gtk_frame_new ("");
+ gtk_paned_set_start_child (GTK_PANED (pane), frame);
+ gtk_paned_set_resize_start_child (GTK_PANED (pane), FALSE);
+ gtk_paned_set_shrink_start_child (GTK_PANED (pane), FALSE);
+
+ frame = gtk_frame_new ("");
+ gtk_paned_set_end_child (GTK_PANED (pane), frame);
+ gtk_paned_set_resize_end_child (GTK_PANED (pane), FALSE);
+ gtk_paned_set_shrink_end_child (GTK_PANED (pane), FALSE);
+
+ gtk_container_add (GTK_CONTAINER (hbox), pane);
+
gtk_container_add (GTK_CONTAINER (vbox), hbox);
gtk_container_add (GTK_CONTAINER (vbox),
g_object_new (GTK_TYPE_LABEL,
diff --git a/gtk/a11y/gtkpanedaccessible.c b/gtk/a11y/gtkpanedaccessible.c
index de657ef217..ba574485d8 100644
--- a/gtk/a11y/gtkpanedaccessible.c
+++ b/gtk/a11y/gtkpanedaccessible.c
@@ -23,7 +23,7 @@
static void atk_value_interface_init (AtkValueIface *iface);
-G_DEFINE_TYPE_WITH_CODE (GtkPanedAccessible, gtk_paned_accessible, GTK_TYPE_CONTAINER_ACCESSIBLE,
+G_DEFINE_TYPE_WITH_CODE (GtkPanedAccessible, gtk_paned_accessible, GTK_TYPE_WIDGET_ACCESSIBLE,
G_IMPLEMENT_INTERFACE (ATK_TYPE_VALUE, atk_value_interface_init))
static void
diff --git a/gtk/a11y/gtkpanedaccessible.h b/gtk/a11y/gtkpanedaccessible.h
index ba5f83acc3..a551b42e72 100644
--- a/gtk/a11y/gtkpanedaccessible.h
+++ b/gtk/a11y/gtkpanedaccessible.h
@@ -22,7 +22,7 @@
#error "Only <gtk/gtk-a11y.h> can be included directly."
#endif
-#include <gtk/a11y/gtkcontaineraccessible.h>
+#include <gtk/a11y/gtkwidgetaccessible.h>
G_BEGIN_DECLS
@@ -39,14 +39,14 @@ typedef struct _GtkPanedAccessiblePrivate GtkPanedAccessiblePrivate;
struct _GtkPanedAccessible
{
- GtkContainerAccessible parent;
+ GtkWidgetAccessible parent;
GtkPanedAccessiblePrivate *priv;
};
struct _GtkPanedAccessibleClass
{
- GtkContainerAccessibleClass parent_class;
+ GtkWidgetAccessibleClass parent_class;
};
GDK_AVAILABLE_IN_ALL
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 4c61e180f8..ca2e03a4f9 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -3300,7 +3300,7 @@ settings_load (GtkFileChooserWidget *impl)
update_time_renderer_visible (impl);
if (sidebar_width < 0)
{
- GtkWidget *sidebar = gtk_paned_get_child1 (GTK_PANED (impl->browse_widgets_hpaned));
+ GtkWidget *sidebar = gtk_paned_get_start_child (GTK_PANED (impl->browse_widgets_hpaned));
gtk_widget_measure (sidebar, GTK_ORIENTATION_HORIZONTAL, -1,
NULL, &sidebar_width, NULL, NULL);
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 146c51d001..dd6c16acd7 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -41,6 +41,7 @@
#include "gtktypebuiltins.h"
#include "gtkwidgetprivate.h"
#include "gtkcssboxesprivate.h"
+#include "gtkbuildable.h"
#include "a11y/gtkpanedaccessible.h"
@@ -56,9 +57,9 @@
* the two panes is adjustable by the user by dragging
* a handle.
*
- * Child widgets are
- * added to the panes of the widget with gtk_paned_pack1() and
- * gtk_paned_pack2(). The division between the two children is set by default
+ * Child widgets are added to the panes of the widget with
+ * gtk_paned_set_start_child() and gtk_paned_set_end_child().
+ * The division between the two children is set by default
* from the size requests of the children, but it can be adjusted by the
* user.
*
@@ -66,9 +67,8 @@
* small handle that the user can drag to adjust the division. It does not
* draw any relief around the children or around the separator. (The space
* in which the separator is called the gutter.) Often, it is useful to put
- * each child inside a #GtkFrame with the shadow type set to %GTK_SHADOW_IN
- * so that the gutter appears as a ridge. No separator is drawn if one of
- * the children is missing.
+ * each child inside a #GtkFrame so that the gutter appears as a ridge.
+ * No separator is drawn if one of the children is missing.
*
* Each child has two options that can be set, @resize and @shrink. If
* @resize is true, then when the #GtkPaned is resized, that child will
@@ -122,12 +122,12 @@ typedef struct _GtkPanedClass GtkPanedClass;
struct _GtkPaned
{
- GtkContainer parent_instance;
+ GtkWidget parent_instance;
};
struct _GtkPanedClass
{
- GtkContainerClass parent_class;
+ GtkWidgetClass parent_class;
gboolean (* cycle_child_focus) (GtkPaned *paned,
gboolean reverse);
@@ -143,10 +143,10 @@ struct _GtkPanedClass
typedef struct
{
GtkPaned *first_paned;
- GtkWidget *child1;
- GtkWidget *child2;
- GtkWidget *last_child1_focus;
- GtkWidget *last_child2_focus;
+ GtkWidget *start_child;
+ GtkWidget *end_child;
+ GtkWidget *last_start_child_focus;
+ GtkWidget *last_end_child_focus;
GtkWidget *saved_focus;
GtkOrientation orientation;
@@ -155,7 +155,7 @@ typedef struct
GtkGesture *pan_gesture; /* Used for touch */
GtkGesture *drag_gesture; /* Used for mice */
- gint child1_size;
+ gint start_child_size;
gint drag_pos;
gint last_allocation;
gint max_position;
@@ -163,10 +163,10 @@ typedef struct
gint original_position;
guint in_recursion : 1;
- guint child1_resize : 1;
- guint child1_shrink : 1;
- guint child2_resize : 1;
- guint child2_shrink : 1;
+ guint resize_start_child : 1;
+ guint shrink_start_child : 1;
+ guint resize_end_child : 1;
+ guint shrink_end_child : 1;
guint position_set : 1;
guint panning : 1;
} GtkPanedPrivate;
@@ -178,10 +178,12 @@ enum {
PROP_MIN_POSITION,
PROP_MAX_POSITION,
PROP_WIDE_HANDLE,
- PROP_RESIZE_CHILD1,
- PROP_RESIZE_CHILD2,
- PROP_SHRINK_CHILD1,
- PROP_SHRINK_CHILD2,
+ PROP_RESIZE_START_CHILD,
+ PROP_RESIZE_END_CHILD,
+ PROP_SHRINK_START_CHILD,
+ PROP_SHRINK_END_CHILD,
+ PROP_START_CHILD,
+ PROP_END_CHILD,
LAST_PROP,
/* GtkOrientable */
@@ -199,14 +201,14 @@ enum {
};
static void gtk_paned_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec);
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec);
static void gtk_paned_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec);
-static void gtk_paned_finalize (GObject *object);
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec);
+static void gtk_paned_dispose (GObject *object);
static void gtk_paned_measure (GtkWidget *widget,
GtkOrientation orientation,
int for_size,
@@ -219,58 +221,51 @@ static void gtk_paned_size_allocate (GtkWidget *widget,
int height,
int baseline);
static void gtk_paned_unrealize (GtkWidget *widget);
-static gboolean gtk_paned_focus (GtkWidget *widget,
- GtkDirectionType direction);
static void gtk_paned_css_changed (GtkWidget *widget,
GtkCssStyleChange *change);
-static void gtk_paned_add (GtkContainer *container,
- GtkWidget *widget);
-static void gtk_paned_remove (GtkContainer *container,
- GtkWidget *widget);
-static void gtk_paned_forall (GtkContainer *container,
- GtkCallback callback,
- gpointer callback_data);
static void gtk_paned_calc_position (GtkPaned *paned,
gint allocation,
- gint child1_req,
- gint child2_req);
+ gint start_child_req,
+ gint end_child_req);
static void gtk_paned_set_focus_child (GtkWidget *widget,
- GtkWidget *child);
+ GtkWidget *child);
static void gtk_paned_set_saved_focus (GtkPaned *paned,
- GtkWidget *widget);
+ GtkWidget *widget);
static void gtk_paned_set_first_paned (GtkPaned *paned,
- GtkPaned *first_paned);
-static void gtk_paned_set_last_child1_focus (GtkPaned *paned,
- GtkWidget *widget);
-static void gtk_paned_set_last_child2_focus (GtkPaned *paned,
- GtkWidget *widget);
+ GtkPaned *first_paned);
+static void gtk_paned_set_last_start_child_focus (GtkPaned *paned,
+ GtkWidget *widget);
+static void gtk_paned_set_last_end_child_focus (GtkPaned *paned,
+ GtkWidget *widget);
static gboolean gtk_paned_cycle_child_focus (GtkPaned *paned,
- gboolean reverse);
+ gboolean reverse);
static gboolean gtk_paned_cycle_handle_focus (GtkPaned *paned,
- gboolean reverse);
+ gboolean reverse);
static gboolean gtk_paned_move_handle (GtkPaned *paned,
- GtkScrollType scroll);
+ GtkScrollType scroll);
static gboolean gtk_paned_accept_position (GtkPaned *paned);
static gboolean gtk_paned_cancel_position (GtkPaned *paned);
static gboolean gtk_paned_toggle_handle_focus (GtkPaned *paned);
-static GType gtk_paned_child_type (GtkContainer *container);
-
static void update_drag (GtkPaned *paned,
int xpos,
int ypos);
-G_DEFINE_TYPE_WITH_CODE (GtkPaned, gtk_paned, GTK_TYPE_CONTAINER,
+static void gtk_paned_buildable_iface_init (GtkBuildableIface *iface);
+
+G_DEFINE_TYPE_WITH_CODE (GtkPaned, gtk_paned, GTK_TYPE_WIDGET,
G_ADD_PRIVATE (GtkPaned)
G_IMPLEMENT_INTERFACE (GTK_TYPE_ORIENTABLE,
- NULL))
+ NULL)
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_BUILDABLE,
+ gtk_paned_buildable_iface_init))
static guint signals[LAST_SIGNAL] = { 0 };
static GParamSpec *paned_props[LAST_PROP] = { NULL, };
static void
add_tab_bindings (GtkWidgetClass *widget_class,
- GdkModifierType modifiers)
+ GdkModifierType modifiers)
{
gtk_widget_class_add_binding_signal (widget_class,
GDK_KEY_Tab, modifiers,
@@ -278,19 +273,19 @@ add_tab_bindings (GtkWidgetClass *widget_class,
NULL);
gtk_widget_class_add_binding_signal (widget_class,
GDK_KEY_KP_Tab, modifiers,
- "toggle-handle-focus",
+ "toggle-handle-focus",
NULL);
}
static void
add_move_binding (GtkWidgetClass *widget_class,
- guint keyval,
- GdkModifierType mask,
- GtkScrollType scroll)
+ guint keyval,
+ GdkModifierType mask,
+ GtkScrollType scroll)
{
gtk_widget_class_add_binding_signal (widget_class,
keyval, mask,
- "move-handle",
+ "move-handle",
"(i)", scroll);
}
@@ -331,27 +326,93 @@ gtk_paned_handle_contains (GtkGizmo *handle,
}
static void
+gtk_paned_compute_expand (GtkWidget *widget,
+ gboolean *hexpand,
+ gboolean *vexpand)
+{
+ GtkPanedPrivate *priv = gtk_paned_get_instance_private (GTK_PANED (widget));
+ gboolean h = FALSE;
+ gboolean v = FALSE;
+
+ if (priv->start_child)
+ {
+ h = h || gtk_widget_compute_expand (priv->start_child, GTK_ORIENTATION_HORIZONTAL);
+ v = v || gtk_widget_compute_expand (priv->start_child, GTK_ORIENTATION_VERTICAL);
+ }
+
+ if (priv->end_child)
+ {
+ h = h || gtk_widget_compute_expand (priv->end_child, GTK_ORIENTATION_HORIZONTAL);
+ v = v || gtk_widget_compute_expand (priv->end_child, GTK_ORIENTATION_VERTICAL);
+ }
+
+ *hexpand = h;
+ *vexpand = v;
+}
+
+static GtkSizeRequestMode
+gtk_paned_get_request_mode (GtkWidget *widget)
+{
+ GtkPanedPrivate *priv = gtk_paned_get_instance_private (GTK_PANED (widget));
+ int wfh = 0, hfw = 0;
+
+ if (priv->start_child)
+ {
+ switch (gtk_widget_get_request_mode (priv->start_child))
+ {
+ case GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH:
+ hfw++;
+ break;
+ case GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT:
+ wfh++;
+ break;
+ case GTK_SIZE_REQUEST_CONSTANT_SIZE:
+ default:
+ break;
+ }
+ }
+ if (priv->end_child)
+ {
+ switch (gtk_widget_get_request_mode (priv->end_child))
+ {
+ case GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH:
+ hfw++;
+ break;
+ case GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT:
+ wfh++;
+ break;
+ case GTK_SIZE_REQUEST_CONSTANT_SIZE:
+ default:
+ break;
+ }
+ }
+
+ if (hfw == 0 && wfh == 0)
+ return GTK_SIZE_REQUEST_CONSTANT_SIZE;
+ else
+ return wfh > hfw ?
+ GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT :
+ GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH;
+}
+
+static void
gtk_paned_class_init (GtkPanedClass *class)
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
- GtkContainerClass *container_class = GTK_CONTAINER_CLASS (class);
object_class->set_property = gtk_paned_set_property;
object_class->get_property = gtk_paned_get_property;
- object_class->finalize = gtk_paned_finalize;
+ object_class->dispose = gtk_paned_dispose;
widget_class->measure = gtk_paned_measure;
widget_class->size_allocate = gtk_paned_size_allocate;
widget_class->unrealize = gtk_paned_unrealize;
- widget_class->focus = gtk_paned_focus;
+ widget_class->focus = gtk_widget_focus_child;
widget_class->set_focus_child = gtk_paned_set_focus_child;
widget_class->css_changed = gtk_paned_css_changed;
-
- container_class->add = gtk_paned_add;
- container_class->remove = gtk_paned_remove;
- container_class->forall = gtk_paned_forall;
- container_class->child_type = gtk_paned_child_type;
+ widget_class->get_request_mode = gtk_paned_get_request_mode;
+ widget_class->compute_expand = gtk_paned_compute_expand;
class->cycle_child_focus = gtk_paned_cycle_child_focus;
class->toggle_handle_focus = gtk_paned_toggle_handle_focus;
@@ -360,7 +421,6 @@ gtk_paned_class_init (GtkPanedClass *class)
class->accept_position = gtk_paned_accept_position;
class->cancel_position = gtk_paned_cancel_position;
-
paned_props[PROP_POSITION] =
g_param_spec_int ("position",
P_("Position"),
@@ -418,57 +478,71 @@ gtk_paned_class_init (GtkPanedClass *class)
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
/**
- * GtkPaned:resize-child1:
+ * GtkPaned:resize-start-child:
*
- * The "resize-child1" property determines whether the first child expands and
+ * The "resize-start-child" property determines whether the first child expands and
* shrinks along with the paned widget.
*/
- paned_props[PROP_RESIZE_CHILD1] =
- g_param_spec_boolean ("resize-child1",
+ paned_props[PROP_RESIZE_START_CHILD] =
+ g_param_spec_boolean ("resize-start-child",
P_("Resize first child"),
P_("If TRUE, the first child expands and shrinks along with the paned widget"),
TRUE,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
/**
- * GtkPaned:resize-child2:
+ * GtkPaned:resize-end-child:
*
- * The "resize-child2" property determines whether the second child expands and
+ * The "resize-end-child" property determines whether the second child expands and
* shrinks along with the paned widget.
*/
- paned_props[PROP_RESIZE_CHILD2] =
- g_param_spec_boolean ("resize-child2",
+ paned_props[PROP_RESIZE_END_CHILD] =
+ g_param_spec_boolean ("resize-end-child",
P_("Resize second child"),
P_("If TRUE, the second child expands and shrinks along with the paned widget"),
TRUE,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
/**
- * GtkPaned:shrink-child1:
+ * GtkPaned:shrink-start-child:
*
- * The "shrink-child1" property determines whether the first child can be made
+ * The "shrink-start-child" property determines whether the first child can be made
* smaller than its requisition.
*/
- paned_props[PROP_SHRINK_CHILD1] =
- g_param_spec_boolean ("shrink-child1",
+ paned_props[PROP_SHRINK_START_CHILD] =
+ g_param_spec_boolean ("shrink-start-child",
P_("Shrink first child"),
P_("If TRUE, the first child can be made smaller than its requisition"),
TRUE,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
/**
- * GtkPaned:shrink-child2:
+ * GtkPaned:shrink-end-child:
*
- * The "shrink-child2" property determines whether the second child can be made
+ * The "shrink-end-child" property determines whether the second child can be made
* smaller than its requisition.
*/
- paned_props[PROP_SHRINK_CHILD2] =
- g_param_spec_boolean ("shrink-child2",
+ paned_props[PROP_SHRINK_END_CHILD] =
+ g_param_spec_boolean ("shrink-end-child",
P_("Shrink second child"),
P_("If TRUE, the second child can be made smaller than its requisition"),
TRUE,
GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+ paned_props[PROP_START_CHILD] =
+ g_param_spec_object ("start-child",
+ P_("First child"),
+ P_("The first child"),
+ GTK_TYPE_WIDGET,
+ GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+
+ paned_props[PROP_END_CHILD] =
+ g_param_spec_object ("end-child",
+ P_("Second child"),
+ P_("The second child"),
+ GTK_TYPE_WIDGET,
+ GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
+
g_object_class_install_properties (object_class, LAST_PROP, paned_props);
g_object_class_override_property (object_class, PROP_ORIENTATION, "orientation");
@@ -477,7 +551,7 @@ gtk_paned_class_init (GtkPanedClass *class)
* @widget: the object that received the signal
* @reversed: whether cycling backward or forward
*
- * The ::cycle-child-focus signal is a
+ * The ::cycle-child-focus signal is a
* [keybinding signal][GtkBindingSignal]
* which gets emitted to cycle the focus between the children of the paned.
*
@@ -485,47 +559,47 @@ gtk_paned_class_init (GtkPanedClass *class)
*/
signals [CYCLE_CHILD_FOCUS] =
g_signal_new (I_("cycle-child-focus"),
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (GtkPanedClass, cycle_child_focus),
- NULL, NULL,
- _gtk_marshal_BOOLEAN__BOOLEAN,
- G_TYPE_BOOLEAN, 1,
- G_TYPE_BOOLEAN);
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkPanedClass, cycle_child_focus),
+ NULL, NULL,
+ _gtk_marshal_BOOLEAN__BOOLEAN,
+ G_TYPE_BOOLEAN, 1,
+ G_TYPE_BOOLEAN);
/**
* GtkPaned::toggle-handle-focus:
* @widget: the object that received the signal
*
- * The ::toggle-handle-focus is a
+ * The ::toggle-handle-focus is a
* [keybinding signal][GtkBindingSignal]
- * which gets emitted to accept the current position of the handle and then
+ * which gets emitted to accept the current position of the handle and then
* move focus to the next widget in the focus chain.
*
* The default binding is Tab.
*/
signals [TOGGLE_HANDLE_FOCUS] =
g_signal_new (I_("toggle-handle-focus"),
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (GtkPanedClass, toggle_handle_focus),
- NULL, NULL,
- _gtk_marshal_BOOLEAN__VOID,
- G_TYPE_BOOLEAN, 0);
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkPanedClass, toggle_handle_focus),
+ NULL, NULL,
+ _gtk_marshal_BOOLEAN__VOID,
+ G_TYPE_BOOLEAN, 0);
/**
* GtkPaned::move-handle:
* @widget: the object that received the signal
* @scroll_type: a #GtkScrollType
*
- * The ::move-handle signal is a
+ * The ::move-handle signal is a
* [keybinding signal][GtkBindingSignal]
- * which gets emitted to move the handle when the user is using key bindings
+ * which gets emitted to move the handle when the user is using key bindings
* to move it.
*/
signals[MOVE_HANDLE] =
g_signal_new (I_("move-handle"),
- G_TYPE_FROM_CLASS (object_class),
+ G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (GtkPanedClass, move_handle),
NULL, NULL,
@@ -538,7 +612,7 @@ gtk_paned_class_init (GtkPanedClass *class)
* @widget: the object that received the signal
* @reversed: whether cycling backward or forward
*
- * The ::cycle-handle-focus signal is a
+ * The ::cycle-handle-focus signal is a
* [keybinding signal][GtkBindingSignal]
* which gets emitted to cycle whether the paned should grab focus to allow
* the user to change position of the handle by using key bindings.
@@ -547,54 +621,54 @@ gtk_paned_class_init (GtkPanedClass *class)
*/
signals [CYCLE_HANDLE_FOCUS] =
g_signal_new (I_("cycle-handle-focus"),
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (GtkPanedClass, cycle_handle_focus),
- NULL, NULL,
- _gtk_marshal_BOOLEAN__BOOLEAN,
- G_TYPE_BOOLEAN, 1,
- G_TYPE_BOOLEAN);
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkPanedClass, cycle_handle_focus),
+ NULL, NULL,
+ _gtk_marshal_BOOLEAN__BOOLEAN,
+ G_TYPE_BOOLEAN, 1,
+ G_TYPE_BOOLEAN);
/**
* GtkPaned::accept-position:
* @widget: the object that received the signal
*
- * The ::accept-position signal is a
+ * The ::accept-position signal is a
* [keybinding signal][GtkBindingSignal]
- * which gets emitted to accept the current position of the handle when
+ * which gets emitted to accept the current position of the handle when
* moving it using key bindings.
*
* The default binding for this signal is Return or Space.
*/
signals [ACCEPT_POSITION] =
g_signal_new (I_("accept-position"),
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (GtkPanedClass, accept_position),
- NULL, NULL,
- _gtk_marshal_BOOLEAN__VOID,
- G_TYPE_BOOLEAN, 0);
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkPanedClass, accept_position),
+ NULL, NULL,
+ _gtk_marshal_BOOLEAN__VOID,
+ G_TYPE_BOOLEAN, 0);
/**
* GtkPaned::cancel-position:
* @widget: the object that received the signal
*
- * The ::cancel-position signal is a
+ * The ::cancel-position signal is a
* [keybinding signal][GtkBindingSignal]
- * which gets emitted to cancel moving the position of the handle using key
- * bindings. The position of the handle will be reset to the value prior to
+ * which gets emitted to cancel moving the position of the handle using key
+ * bindings. The position of the handle will be reset to the value prior to
* moving it.
*
* The default binding for this signal is Escape.
*/
signals [CANCEL_POSITION] =
g_signal_new (I_("cancel-position"),
- G_TYPE_FROM_CLASS (object_class),
- G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
- G_STRUCT_OFFSET (GtkPanedClass, cancel_position),
- NULL, NULL,
- _gtk_marshal_BOOLEAN__VOID,
- G_TYPE_BOOLEAN, 0);
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
+ G_STRUCT_OFFSET (GtkPanedClass, cancel_position),
+ NULL, NULL,
+ _gtk_marshal_BOOLEAN__VOID,
+ G_TYPE_BOOLEAN, 0);
/* F6 and friends */
gtk_widget_class_add_binding_signal (widget_class,
@@ -602,20 +676,20 @@ gtk_paned_class_init (GtkPanedClass *class)
"cycle-child-focus",
"(b)", FALSE);
gtk_widget_class_add_binding_signal (widget_class,
- GDK_KEY_F6, GDK_SHIFT_MASK,
+ GDK_KEY_F6, GDK_SHIFT_MASK,
"cycle-child-focus",
"(b)", TRUE);
/* F8 and friends */
gtk_widget_class_add_binding_signal (widget_class,
- GDK_KEY_F8, 0,
- "cycle-handle-focus",
+ GDK_KEY_F8, 0,
+ "cycle-handle-focus",
"(b)", FALSE);
gtk_widget_class_add_binding_signal (widget_class,
- GDK_KEY_F8, GDK_SHIFT_MASK,
- "cycle-handle-focus",
+ GDK_KEY_F8, GDK_SHIFT_MASK,
+ "cycle-handle-focus",
"(b)", TRUE);
-
+
add_tab_bindings (widget_class, 0);
add_tab_bindings (widget_class, GDK_CONTROL_MASK);
add_tab_bindings (widget_class, GDK_SHIFT_MASK);
@@ -623,8 +697,8 @@ gtk_paned_class_init (GtkPanedClass *class)
/* accept and cancel positions */
gtk_widget_class_add_binding_signal (widget_class,
- GDK_KEY_Escape, 0,
- "cancel-position",
+ GDK_KEY_Escape, 0,
+ "cancel-position",
NULL);
gtk_widget_class_add_binding_signal (widget_class,
@@ -632,15 +706,15 @@ gtk_paned_class_init (GtkPanedClass *class)
"accept-position",
NULL);
gtk_widget_class_add_binding_signal (widget_class,
- GDK_KEY_ISO_Enter, 0,
+ GDK_KEY_ISO_Enter, 0,
"accept-position",
NULL);
gtk_widget_class_add_binding_signal (widget_class,
- GDK_KEY_KP_Enter, 0,
+ GDK_KEY_KP_Enter, 0,
"accept-position",
NULL);
gtk_widget_class_add_binding_signal (widget_class,
- GDK_KEY_space, 0,
+ GDK_KEY_space, 0,
"accept-position",
NULL);
gtk_widget_class_add_binding_signal (widget_class,
@@ -682,16 +756,55 @@ gtk_paned_class_init (GtkPanedClass *class)
gtk_widget_class_set_css_name (widget_class, I_("paned"));
}
-static GType
-gtk_paned_child_type (GtkContainer *container)
+static GtkBuildableIface *parent_buildable_iface;
+
+static void
+gtk_paned_buildable_add_child (GtkBuildable *buildable,
+ GtkBuilder *builder,
+ GObject *child,
+ const gchar *type)
{
- GtkPaned *paned = GTK_PANED (container);
- GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
+ GtkPaned *self = GTK_PANED (buildable);
+ GtkPanedPrivate *priv = gtk_paned_get_instance_private (self);
- if (!priv->child1 || !priv->child2)
- return GTK_TYPE_WIDGET;
+ if (g_strcmp0 (type, "start") == 0)
+ {
+ gtk_paned_set_start_child (self, GTK_WIDGET (child));
+ gtk_paned_set_resize_start_child (self, FALSE);
+ gtk_paned_set_shrink_start_child (self, TRUE);
+ }
+ else if (g_strcmp0 (type, "end") == 0)
+ {
+ gtk_paned_set_end_child (self, GTK_WIDGET (child));
+ gtk_paned_set_resize_end_child (self, TRUE);
+ gtk_paned_set_shrink_end_child (self, TRUE);
+ }
+ else if (GTK_IS_WIDGET (child))
+ {
+ if (priv->start_child == NULL)
+ {
+ gtk_paned_set_start_child (self, GTK_WIDGET (child));
+ gtk_paned_set_resize_start_child (self, FALSE);
+ gtk_paned_set_shrink_start_child (self, TRUE);
+ }
+ else if (priv->end_child == NULL)
+ {
+ gtk_paned_set_end_child (self, GTK_WIDGET (child));
+ gtk_paned_set_resize_end_child (self, TRUE);
+ gtk_paned_set_shrink_end_child (self, TRUE);
+ }
+ else
+ g_warning ("GtkPaned only accepts two widgets as children");
+ }
else
- return G_TYPE_NONE;
+ parent_buildable_iface->add_child (buildable, builder, child, type);
+}
+
+static void
+gtk_paned_buildable_iface_init (GtkBuildableIface *iface)
+{
+ parent_buildable_iface = g_type_interface_peek_parent (iface);
+ iface->add_child = gtk_paned_buildable_add_child;
}
static gboolean
@@ -808,9 +921,9 @@ gesture_drag_end_cb (GtkGestureDrag *gesture,
static void
gtk_paned_set_property (GObject *object,
- guint prop_id,
- const GValue *value,
- GParamSpec *pspec)
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
{
GtkPaned *paned = GTK_PANED (object);
GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
@@ -856,37 +969,23 @@ gtk_paned_set_property (GObject *object,
case PROP_WIDE_HANDLE:
gtk_paned_set_wide_handle (paned, g_value_get_boolean (value));
break;
- case PROP_RESIZE_CHILD1:
- if (priv->child1_resize != g_value_get_boolean (value))
- {
- priv->child1_resize = g_value_get_boolean (value);
- g_object_notify_by_pspec (object, pspec);
- gtk_widget_queue_resize (GTK_WIDGET (object));
- }
+ case PROP_RESIZE_START_CHILD:
+ gtk_paned_set_resize_start_child (paned, g_value_get_boolean (value));
break;
- case PROP_RESIZE_CHILD2:
- if (priv->child2_resize != g_value_get_boolean (value))
- {
- priv->child2_resize = g_value_get_boolean (value);
- g_object_notify_by_pspec (object, pspec);
- gtk_widget_queue_resize (GTK_WIDGET (object));
- }
+ case PROP_RESIZE_END_CHILD:
+ gtk_paned_set_resize_end_child (paned, g_value_get_boolean (value));
break;
- case PROP_SHRINK_CHILD1:
- if (priv->child1_shrink != g_value_get_boolean (value))
- {
- priv->child1_shrink = g_value_get_boolean (value);
- g_object_notify_by_pspec (object, pspec);
- gtk_widget_queue_resize (GTK_WIDGET (object));
- }
+ case PROP_SHRINK_START_CHILD:
+ gtk_paned_set_shrink_start_child (paned, g_value_get_boolean (value));
break;
- case PROP_SHRINK_CHILD2:
- if (priv->child2_shrink != g_value_get_boolean (value))
- {
- priv->child2_shrink = g_value_get_boolean (value);
- g_object_notify_by_pspec (object, pspec);
- gtk_widget_queue_resize (GTK_WIDGET (object));
- }
+ case PROP_SHRINK_END_CHILD:
+ gtk_paned_set_shrink_end_child (paned, g_value_get_boolean (value));
+ break;
+ case PROP_START_CHILD:
+ gtk_paned_set_start_child (paned, g_value_get_object (value));
+ break;
+ case PROP_END_CHILD:
+ gtk_paned_set_end_child (paned, g_value_get_object (value));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -896,9 +995,9 @@ gtk_paned_set_property (GObject *object,
static void
gtk_paned_get_property (GObject *object,
- guint prop_id,
- GValue *value,
- GParamSpec *pspec)
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
{
GtkPaned *paned = GTK_PANED (object);
GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
@@ -909,7 +1008,7 @@ gtk_paned_get_property (GObject *object,
g_value_set_enum (value, priv->orientation);
break;
case PROP_POSITION:
- g_value_set_int (value, priv->child1_size);
+ g_value_set_int (value, priv->start_child_size);
break;
case PROP_POSITION_SET:
g_value_set_boolean (value, priv->position_set);
@@ -923,17 +1022,23 @@ gtk_paned_get_property (GObject *object,
case PROP_WIDE_HANDLE:
g_value_set_boolean (value, gtk_paned_get_wide_handle (paned));
break;
- case PROP_RESIZE_CHILD1:
- g_value_set_boolean (value, priv->child1_resize);
+ case PROP_RESIZE_START_CHILD:
+ g_value_set_boolean (value, priv->resize_start_child);
+ break;
+ case PROP_RESIZE_END_CHILD:
+ g_value_set_boolean (value, priv->resize_end_child);
break;
- case PROP_RESIZE_CHILD2:
- g_value_set_boolean (value, priv->child2_resize);
+ case PROP_SHRINK_START_CHILD:
+ g_value_set_boolean (value, priv->shrink_start_child);
break;
- case PROP_SHRINK_CHILD1:
- g_value_set_boolean (value, priv->child1_shrink);
+ case PROP_SHRINK_END_CHILD:
+ g_value_set_boolean (value, priv->shrink_end_child);
break;
- case PROP_SHRINK_CHILD2:
- g_value_set_boolean (value, priv->child2_shrink);
+ case PROP_START_CHILD:
+ g_value_set_object (value, gtk_paned_get_start_child (paned));
+ break;
+ case PROP_END_CHILD:
+ g_value_set_object (value, gtk_paned_get_end_child (paned));
break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -942,24 +1047,26 @@ gtk_paned_get_property (GObject *object,
}
static void
-gtk_paned_finalize (GObject *object)
+gtk_paned_dispose (GObject *object)
{
GtkPaned *paned = GTK_PANED (object);
GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
-
+
gtk_paned_set_saved_focus (paned, NULL);
gtk_paned_set_first_paned (paned, NULL);
- gtk_widget_unparent (priv->handle_widget);
+ g_clear_pointer (&priv->start_child, gtk_widget_unparent);
+ g_clear_pointer (&priv->end_child, gtk_widget_unparent);
+ g_clear_pointer (&priv->handle_widget, gtk_widget_unparent);
- G_OBJECT_CLASS (gtk_paned_parent_class)->finalize (object);
+ G_OBJECT_CLASS (gtk_paned_parent_class)->dispose (object);
}
static void
gtk_paned_compute_position (GtkPaned *paned,
gint allocation,
- gint child1_req,
- gint child2_req,
+ gint start_child_req,
+ gint end_child_req,
gint *min_pos,
gint *max_pos,
gint *out_pos)
@@ -967,23 +1074,23 @@ gtk_paned_compute_position (GtkPaned *paned,
GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
gint min, max, pos;
- min = priv->child1_shrink ? 0 : child1_req;
+ min = priv->shrink_start_child ? 0 : start_child_req;
max = allocation;
- if (!priv->child2_shrink)
- max = MAX (1, max - child2_req);
+ if (!priv->shrink_end_child)
+ max = MAX (1, max - end_child_req);
max = MAX (min, max);
if (!priv->position_set)
{
- if (priv->child1_resize && !priv->child2_resize)
- pos = MAX (0, allocation - child2_req);
- else if (!priv->child1_resize && priv->child2_resize)
- pos = child1_req;
- else if (child1_req + child2_req != 0)
- pos = allocation * ((gdouble)child1_req / (child1_req + child2_req)) + 0.5;
+ if (priv->resize_start_child && !priv->resize_end_child)
+ pos = MAX (0, allocation - end_child_req);
+ else if (!priv->resize_start_child && priv->resize_end_child)
+ pos = start_child_req;
+ else if (start_child_req + end_child_req != 0)
+ pos = allocation * ((gdouble)start_child_req / (start_child_req + end_child_req)) + 0.5;
else
- pos = allocation * 0.5 + 0.5;
+ pos = allocation * 0.5 + 0.5;
}
else
{
@@ -991,20 +1098,20 @@ gtk_paned_compute_position (GtkPaned *paned,
* (priv->last_allocation <= 0) just clamp it and leave it.
*/
if (priv->last_allocation > 0)
- {
- if (priv->child1_resize && !priv->child2_resize)
- pos = priv->child1_size + allocation - priv->last_allocation;
- else if (!(!priv->child1_resize && priv->child2_resize))
- pos = allocation * ((gdouble) priv->child1_size / (priv->last_allocation)) + 0.5;
+ {
+ if (priv->resize_start_child && !priv->resize_end_child)
+ pos = priv->start_child_size + allocation - priv->last_allocation;
+ else if (!(!priv->resize_start_child && priv->resize_end_child))
+ pos = allocation * ((gdouble) priv->start_child_size / (priv->last_allocation)) + 0.5;
else
- pos = priv->child1_size;
- }
+ pos = priv->start_child_size;
+ }
else
- pos = priv->child1_size;
+ pos = priv->start_child_size;
}
pos = CLAMP (pos, min, max);
-
+
if (min_pos)
*min_pos = min;
if (max_pos)
@@ -1025,27 +1132,27 @@ gtk_paned_get_preferred_size_for_orientation (GtkWidget *widget,
*minimum = *natural = 0;
- if (priv->child1 && gtk_widget_get_visible (priv->child1))
+ if (priv->start_child && gtk_widget_get_visible (priv->start_child))
{
- gtk_widget_measure (priv->child1, priv->orientation, size, &child_min, &child_nat, NULL, NULL);
- if (priv->child1_shrink)
+ gtk_widget_measure (priv->start_child, priv->orientation, size, &child_min, &child_nat, NULL, NULL);
+ if (priv->shrink_start_child)
*minimum = 0;
else
*minimum = child_min;
*natural = child_nat;
}
- if (priv->child2 && gtk_widget_get_visible (priv->child2))
+ if (priv->end_child && gtk_widget_get_visible (priv->end_child))
{
- gtk_widget_measure (priv->child2, priv->orientation, size, &child_min, &child_nat, NULL, NULL);
+ gtk_widget_measure (priv->end_child, priv->orientation, size, &child_min, &child_nat, NULL, NULL);
- if (!priv->child2_shrink)
+ if (!priv->shrink_end_child)
*minimum += child_min;
*natural += child_nat;
}
- if (priv->child1 && gtk_widget_get_visible (priv->child1) &&
- priv->child2 && gtk_widget_get_visible (priv->child2))
+ if (priv->start_child && gtk_widget_get_visible (priv->start_child) &&
+ priv->end_child && gtk_widget_get_visible (priv->end_child))
{
gint handle_size;
@@ -1068,14 +1175,14 @@ gtk_paned_get_preferred_size_for_opposite_orientation (GtkWidget *widget,
{
GtkPaned *paned = GTK_PANED (widget);
GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
- gint for_child1, for_child2;
+ gint for_start_child, for_end_child;
gint child_min, child_nat;
if (size > -1 &&
- priv->child1 && gtk_widget_get_visible (priv->child1) &&
- priv->child2 && gtk_widget_get_visible (priv->child2))
+ priv->start_child && gtk_widget_get_visible (priv->start_child) &&
+ priv->end_child && gtk_widget_get_visible (priv->end_child))
{
- gint child1_req, child2_req;
+ gint start_child_req, end_child_req;
gint handle_size;
gtk_widget_measure (priv->handle_widget,
@@ -1084,28 +1191,28 @@ gtk_paned_get_preferred_size_for_opposite_orientation (GtkWidget *widget,
NULL, &handle_size,
NULL, NULL);
- gtk_widget_measure (priv->child1, priv->orientation, -1, &child1_req, NULL, NULL, NULL);
- gtk_widget_measure (priv->child2, priv->orientation, -1, &child2_req, NULL, NULL, NULL);
+ gtk_widget_measure (priv->start_child, priv->orientation, -1, &start_child_req, NULL, NULL, NULL);
+ gtk_widget_measure (priv->end_child, priv->orientation, -1, &end_child_req, NULL, NULL, NULL);
gtk_paned_compute_position (paned,
- size - handle_size, child1_req, child2_req,
- NULL, NULL, &for_child1);
+ size - handle_size, start_child_req, end_child_req,
+ NULL, NULL, &for_start_child);
- for_child2 = size - for_child1 - handle_size;
+ for_end_child = size - for_start_child - handle_size;
}
else
{
- for_child1 = size;
- for_child2 = size;
+ for_start_child = size;
+ for_end_child = size;
}
*minimum = *natural = 0;
- if (priv->child1 && gtk_widget_get_visible (priv->child1))
+ if (priv->start_child && gtk_widget_get_visible (priv->start_child))
{
- gtk_widget_measure (priv->child1,
+ gtk_widget_measure (priv->start_child,
OPPOSITE_ORIENTATION (priv->orientation),
- for_child1,
+ for_start_child,
&child_min, &child_nat,
NULL, NULL);
@@ -1113,11 +1220,11 @@ gtk_paned_get_preferred_size_for_opposite_orientation (GtkWidget *widget,
*natural = child_nat;
}
- if (priv->child2 && gtk_widget_get_visible (priv->child2))
+ if (priv->end_child && gtk_widget_get_visible (priv->end_child))
{
- gtk_widget_measure (priv->child2,
+ gtk_widget_measure (priv->end_child,
OPPOSITE_ORIENTATION (priv->orientation),
- for_child2,
+ for_end_child,
&child_min, &child_nat,
NULL, NULL);
@@ -1160,11 +1267,11 @@ gtk_paned_size_allocate (GtkWidget *widget,
GtkPaned *paned = GTK_PANED (widget);
GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
- if (priv->child1 && gtk_widget_get_visible (priv->child1) &&
- priv->child2 && gtk_widget_get_visible (priv->child2))
+ if (priv->start_child && gtk_widget_get_visible (priv->start_child) &&
+ priv->end_child && gtk_widget_get_visible (priv->end_child))
{
- GtkAllocation child1_allocation;
- GtkAllocation child2_allocation;
+ GtkAllocation start_child_allocation;
+ GtkAllocation end_child_allocation;
GtkAllocation handle_allocation;
gint handle_size;
@@ -1176,117 +1283,117 @@ gtk_paned_size_allocate (GtkWidget *widget,
if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
{
- gint child1_width, child2_width;
+ gint start_child_width, end_child_width;
- gtk_widget_measure (priv->child1, GTK_ORIENTATION_HORIZONTAL,
+ gtk_widget_measure (priv->start_child, GTK_ORIENTATION_HORIZONTAL,
height,
- &child1_width, NULL, NULL, NULL);
- gtk_widget_measure (priv->child2, GTK_ORIENTATION_HORIZONTAL,
+ &start_child_width, NULL, NULL, NULL);
+ gtk_widget_measure (priv->end_child, GTK_ORIENTATION_HORIZONTAL,
height,
- &child2_width, NULL, NULL, NULL);
+ &end_child_width, NULL, NULL, NULL);
gtk_paned_calc_position (paned,
MAX (1, width - handle_size),
- child1_width,
- child2_width);
+ start_child_width,
+ end_child_width);
handle_allocation = (GdkRectangle){
- priv->child1_size,
+ priv->start_child_size,
0,
handle_size,
height
};
- child1_allocation.height = child2_allocation.height = height;
- child1_allocation.width = MAX (1, priv->child1_size);
- child1_allocation.x = 0;
- child1_allocation.y = child2_allocation.y = 0;
+ start_child_allocation.height = end_child_allocation.height = height;
+ start_child_allocation.width = MAX (1, priv->start_child_size);
+ start_child_allocation.x = 0;
+ start_child_allocation.y = end_child_allocation.y = 0;
- child2_allocation.x = child1_allocation.x + priv->child1_size + handle_size;
- child2_allocation.width = MAX (1, width - priv->child1_size - handle_size);
+ end_child_allocation.x = start_child_allocation.x + priv->start_child_size + handle_size;
+ end_child_allocation.width = MAX (1, width - priv->start_child_size - handle_size);
if (gtk_widget_get_direction (GTK_WIDGET (widget)) == GTK_TEXT_DIR_RTL)
{
- flip_child (width, &(child2_allocation));
- flip_child (width, &(child1_allocation));
+ flip_child (width, &(end_child_allocation));
+ flip_child (width, &(start_child_allocation));
flip_child (width, &(handle_allocation));
}
- if (child1_width > child1_allocation.width)
+ if (start_child_width > start_child_allocation.width)
{
if (gtk_widget_get_direction (GTK_WIDGET (widget)) == GTK_TEXT_DIR_LTR)
- child1_allocation.x -= child1_width - child1_allocation.width;
- child1_allocation.width = child1_width;
+ start_child_allocation.x -= start_child_width - start_child_allocation.width;
+ start_child_allocation.width = start_child_width;
}
- if (child2_width > child2_allocation.width)
+ if (end_child_width > end_child_allocation.width)
{
if (gtk_widget_get_direction (GTK_WIDGET (widget)) == GTK_TEXT_DIR_RTL)
- child2_allocation.x -= child2_width - child2_allocation.width;
- child2_allocation.width = child2_width;
+ end_child_allocation.x -= end_child_width - end_child_allocation.width;
+ end_child_allocation.width = end_child_width;
}
}
else
{
- gint child1_height, child2_height;
+ gint start_child_height, end_child_height;
- gtk_widget_measure (priv->child1, GTK_ORIENTATION_VERTICAL,
+ gtk_widget_measure (priv->start_child, GTK_ORIENTATION_VERTICAL,
width,
- &child1_height, NULL, NULL, NULL);
- gtk_widget_measure (priv->child2, GTK_ORIENTATION_VERTICAL,
+ &start_child_height, NULL, NULL, NULL);
+ gtk_widget_measure (priv->end_child, GTK_ORIENTATION_VERTICAL,
width,
- &child2_height, NULL, NULL, NULL);
+ &end_child_height, NULL, NULL, NULL);
gtk_paned_calc_position (paned,
MAX (1, height - handle_size),
- child1_height,
- child2_height);
+ start_child_height,
+ end_child_height);
handle_allocation = (GdkRectangle){
0,
- priv->child1_size,
+ priv->start_child_size,
width,
handle_size,
};
- child1_allocation.width = child2_allocation.width = width;
- child1_allocation.height = MAX (1, priv->child1_size);
- child1_allocation.x = child2_allocation.x = 0;
- child1_allocation.y = 0;
+ start_child_allocation.width = end_child_allocation.width = width;
+ start_child_allocation.height = MAX (1, priv->start_child_size);
+ start_child_allocation.x = end_child_allocation.x = 0;
+ start_child_allocation.y = 0;
- child2_allocation.y = child1_allocation.y + priv->child1_size + handle_size;
- child2_allocation.height = MAX (1, height - child2_allocation.y);
+ end_child_allocation.y = start_child_allocation.y + priv->start_child_size + handle_size;
+ end_child_allocation.height = MAX (1, height - end_child_allocation.y);
- if (child1_height > child1_allocation.height)
+ if (start_child_height > start_child_allocation.height)
{
- child1_allocation.y -= child1_height - child1_allocation.height;
- child1_allocation.height = child1_height;
+ start_child_allocation.y -= start_child_height - start_child_allocation.height;
+ start_child_allocation.height = start_child_height;
}
- if (child2_height > child2_allocation.height)
- child2_allocation.height = child2_height;
+ if (end_child_height > end_child_allocation.height)
+ end_child_allocation.height = end_child_height;
}
gtk_widget_set_child_visible (priv->handle_widget, TRUE);
gtk_widget_size_allocate (priv->handle_widget, &handle_allocation, -1);
- gtk_widget_size_allocate (priv->child1, &child1_allocation, -1);
- gtk_widget_size_allocate (priv->child2, &child2_allocation, -1);
+ gtk_widget_size_allocate (priv->start_child, &start_child_allocation, -1);
+ gtk_widget_size_allocate (priv->end_child, &end_child_allocation, -1);
}
else
{
- if (priv->child1 && gtk_widget_get_visible (priv->child1))
+ if (priv->start_child && gtk_widget_get_visible (priv->start_child))
{
- gtk_widget_set_child_visible (priv->child1, TRUE);
+ gtk_widget_set_child_visible (priv->start_child, TRUE);
- gtk_widget_size_allocate (priv->child1,
+ gtk_widget_size_allocate (priv->start_child,
&(GtkAllocation) {0, 0, width, height}, -1);
}
- else if (priv->child2 && gtk_widget_get_visible (priv->child2))
+ else if (priv->end_child && gtk_widget_get_visible (priv->end_child))
{
- gtk_widget_set_child_visible (priv->child2, TRUE);
+ gtk_widget_set_child_visible (priv->end_child, TRUE);
- gtk_widget_size_allocate (priv->child2,
+ gtk_widget_size_allocate (priv->end_child,
&(GtkAllocation) {0, 0, width, height}, -1);
}
@@ -1301,8 +1408,8 @@ gtk_paned_unrealize (GtkWidget *widget)
{
GtkPaned *paned = GTK_PANED (widget);
- gtk_paned_set_last_child1_focus (paned, NULL);
- gtk_paned_set_last_child2_focus (paned, NULL);
+ gtk_paned_set_last_start_child_focus (paned, NULL);
+ gtk_paned_set_last_end_child_focus (paned, NULL);
gtk_paned_set_saved_focus (paned, NULL);
gtk_paned_set_first_paned (paned, NULL);
@@ -1347,21 +1454,21 @@ gtk_paned_init (GtkPaned *paned)
priv->orientation = GTK_ORIENTATION_HORIZONTAL;
- priv->child1 = NULL;
- priv->child2 = NULL;
+ priv->start_child = NULL;
+ priv->end_child = NULL;
priv->position_set = FALSE;
priv->last_allocation = -1;
- priv->last_child1_focus = NULL;
- priv->last_child2_focus = NULL;
+ priv->last_start_child_focus = NULL;
+ priv->last_end_child_focus = NULL;
priv->in_recursion = FALSE;
priv->original_position = -1;
priv->max_position = G_MAXINT;
- priv->child1_resize = TRUE;
- priv->child2_resize = TRUE;
- priv->child1_shrink = TRUE;
- priv->child2_shrink = TRUE;
+ priv->resize_start_child = TRUE;
+ priv->resize_end_child = TRUE;
+ priv->shrink_start_child = TRUE;
+ priv->shrink_end_child = TRUE;
_gtk_orientable_set_style_classes (GTK_ORIENTABLE (paned));
@@ -1435,28 +1542,10 @@ update_drag (GtkPaned *paned,
size = CLAMP (size, priv->min_position, priv->max_position);
- if (size != priv->child1_size)
+ if (size != priv->start_child_size)
gtk_paned_set_position (paned, size);
}
-static gboolean
-gtk_paned_focus (GtkWidget *widget,
- GtkDirectionType direction)
-
-{
- gboolean retval;
-
- /* This is a hack, but how can this be done without
- * excessive cut-and-paste from gtkcontainer.c?
- */
-
- gtk_widget_set_can_focus (widget, FALSE);
- retval = GTK_WIDGET_CLASS (gtk_paned_parent_class)->focus (widget, direction);
- gtk_widget_set_can_focus (widget, TRUE);
-
- return retval;
-}
-
static void
gtk_paned_css_changed (GtkWidget *widget,
GtkCssStyleChange *change)
@@ -1491,161 +1580,176 @@ gtk_paned_new (GtkOrientation orientation)
NULL);
}
-/**
- * gtk_paned_add1:
- * @paned: a paned widget
- * @child: the child to add
- *
- * Adds a child to the top or left pane with default parameters. This is
- * equivalent to
- * `gtk_paned_pack1 (paned, child, FALSE, TRUE)`.
- */
void
-gtk_paned_add1 (GtkPaned *paned,
- GtkWidget *widget)
+gtk_paned_set_start_child (GtkPaned *paned,
+ GtkWidget *child)
{
- gtk_paned_pack1 (paned, widget, FALSE, TRUE);
+ GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
+
+ g_return_if_fail (GTK_IS_PANED (paned));
+ g_return_if_fail (child == NULL || GTK_IS_WIDGET (child));
+
+ g_clear_pointer (&priv->start_child, gtk_widget_unparent);
+
+ if (child)
+ {
+ priv->start_child = child;
+ gtk_widget_insert_before (child, GTK_WIDGET (paned), priv->handle_widget);
+ }
+
+ g_object_notify (G_OBJECT (paned), "start-child");
+}
+
+GtkWidget *
+gtk_paned_get_start_child (GtkPaned *paned)
+{
+ GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
+
+ g_return_val_if_fail (GTK_IS_PANED (paned), NULL);
+
+ return priv->start_child;
}
-/**
- * gtk_paned_add2:
- * @paned: a paned widget
- * @child: the child to add
- *
- * Adds a child to the bottom or right pane with default parameters. This
- * is equivalent to
- * `gtk_paned_pack2 (paned, child, TRUE, TRUE)`.
- */
void
-gtk_paned_add2 (GtkPaned *paned,
- GtkWidget *widget)
+gtk_paned_set_resize_start_child (GtkPaned *paned,
+ gboolean resize)
{
- gtk_paned_pack2 (paned, widget, TRUE, TRUE);
+ GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
+
+ g_return_if_fail (GTK_IS_PANED (paned));
+
+ if (priv->resize_start_child == resize)
+ return;
+
+ priv->resize_start_child = resize;
+
+ g_object_notify (G_OBJECT (paned), "resize-start-child");
+}
+
+gboolean
+gtk_paned_get_resize_start_child (GtkPaned *paned)
+{
+ GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
+
+ g_return_val_if_fail (GTK_IS_PANED (paned), FALSE);
+
+ return priv->resize_start_child;
}
-/**
- * gtk_paned_pack1:
- * @paned: a paned widget
- * @child: the child to add
- * @resize: should this child expand when the paned widget is resized.
- * @shrink: can this child be made smaller than its requisition.
- *
- * Adds a child to the top or left pane.
- */
void
-gtk_paned_pack1 (GtkPaned *paned,
- GtkWidget *child,
- gboolean resize,
- gboolean shrink)
+gtk_paned_set_shrink_start_child (GtkPaned *paned,
+ gboolean shrink)
{
GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
g_return_if_fail (GTK_IS_PANED (paned));
- g_return_if_fail (GTK_IS_WIDGET (child));
- if (!priv->child1)
- {
- priv->child1 = child;
- priv->child1_resize = resize;
- priv->child1_shrink = shrink;
+ if (priv->shrink_start_child == shrink)
+ return;
- gtk_widget_insert_before (child, GTK_WIDGET (paned), priv->handle_widget);
- }
+ priv->shrink_start_child = shrink;
+
+ g_object_notify (G_OBJECT (paned), "shrink-start-child");
+}
+
+gboolean
+gtk_paned_get_shrink_start_child (GtkPaned *paned)
+{
+ GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
+
+ g_return_val_if_fail (GTK_IS_PANED (paned), FALSE);
+
+ return priv->shrink_start_child;
}
-/**
- * gtk_paned_pack2:
- * @paned: a paned widget
- * @child: the child to add
- * @resize: should this child expand when the paned widget is resized.
- * @shrink: can this child be made smaller than its requisition.
- *
- * Adds a child to the bottom or right pane.
- */
void
-gtk_paned_pack2 (GtkPaned *paned,
- GtkWidget *child,
- gboolean resize,
- gboolean shrink)
+gtk_paned_set_end_child (GtkPaned *paned,
+ GtkWidget *child)
{
GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
g_return_if_fail (GTK_IS_PANED (paned));
- g_return_if_fail (GTK_IS_WIDGET (child));
+ g_return_if_fail (child == NULL || GTK_IS_WIDGET (child));
- if (!priv->child2)
- {
- priv->child2 = child;
- priv->child2_resize = resize;
- priv->child2_shrink = shrink;
+ g_clear_pointer (&priv->end_child, gtk_widget_unparent);
+ if (child)
+ {
+ priv->end_child = child;
gtk_widget_insert_after (child, GTK_WIDGET (paned), priv->handle_widget);
}
+
+ g_object_notify (G_OBJECT (paned), "end-child");
}
+GtkWidget *
+gtk_paned_get_end_child (GtkPaned *paned)
+{
+ GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
-static void
-gtk_paned_add (GtkContainer *container,
- GtkWidget *widget)
+ g_return_val_if_fail (GTK_IS_PANED (paned), NULL);
+
+ return priv->end_child;
+}
+
+void
+gtk_paned_set_resize_end_child (GtkPaned *paned,
+ gboolean resize)
{
- GtkPanedPrivate *priv;
- GtkPaned *paned;
+ GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
- g_return_if_fail (GTK_IS_PANED (container));
+ g_return_if_fail (GTK_IS_PANED (paned));
- paned = GTK_PANED (container);
- priv = gtk_paned_get_instance_private (paned);
+ if (priv->resize_end_child == resize)
+ return;
- if (!priv->child1)
- gtk_paned_add1 (paned, widget);
- else if (!priv->child2)
- gtk_paned_add2 (paned, widget);
- else
- g_warning ("GtkPaned cannot have more than 2 children");
+ priv->resize_end_child = resize;
+
+ g_object_notify (G_OBJECT (paned), "resize-end-child");
}
-static void
-gtk_paned_remove (GtkContainer *container,
- GtkWidget *widget)
+gboolean
+gtk_paned_get_resize_end_child (GtkPaned *paned)
{
- GtkPaned *paned = GTK_PANED (container);
GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
- if (priv->child1 == widget)
- {
- gtk_widget_unparent (widget);
+ g_return_val_if_fail (GTK_IS_PANED (paned), FALSE);
- priv->child1 = NULL;
- }
- else if (priv->child2 == widget)
- {
- gtk_widget_unparent (widget);
+ return priv->resize_end_child;
+}
- priv->child2 = NULL;
- }
+void
+gtk_paned_set_shrink_end_child (GtkPaned *paned,
+ gboolean shrink)
+{
+ GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
+
+ g_return_if_fail (GTK_IS_PANED (paned));
+
+ if (priv->shrink_end_child == shrink)
+ return;
+
+ priv->shrink_end_child = shrink;
+
+ g_object_notify (G_OBJECT (paned), "shrink-end-child");
}
-static void
-gtk_paned_forall (GtkContainer *container,
- GtkCallback callback,
- gpointer callback_data)
+gboolean
+gtk_paned_get_shrink_end_child (GtkPaned *paned)
{
- GtkPanedPrivate *priv = gtk_paned_get_instance_private (GTK_PANED (container));
+ GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
- g_return_if_fail (callback != NULL);
+ g_return_val_if_fail (GTK_IS_PANED (paned), FALSE);
- if (priv->child1)
- (*callback) (priv->child1, callback_data);
- if (priv->child2)
- (*callback) (priv->child2, callback_data);
+ return priv->shrink_end_child;
}
/**
* gtk_paned_get_position:
* @paned: a #GtkPaned widget
- *
+ *
* Obtains the position of the divider between the two panes.
- *
+ *
* Returns: position of the divider
**/
gint
@@ -1655,7 +1759,7 @@ gtk_paned_get_position (GtkPaned *paned)
g_return_val_if_fail (GTK_IS_PANED (paned), 0);
- return priv->child1_size;
+ return priv->start_child_size;
}
/**
@@ -1663,12 +1767,12 @@ gtk_paned_get_position (GtkPaned *paned)
* @paned: a #GtkPaned widget
* @position: pixel position of divider, a negative value means that the position
* is unset.
- *
+ *
* Sets the position of the divider between the two panes.
**/
void
gtk_paned_set_position (GtkPaned *paned,
- gint position)
+ gint position)
{
GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
@@ -1688,13 +1792,13 @@ gtk_paned_set_position (GtkPaned *paned,
if (!priv->position_set)
g_object_notify_by_pspec (G_OBJECT (paned), paned_props[PROP_POSITION_SET]);
- if (priv->child1_size != position)
+ if (priv->start_child_size != position)
{
g_object_notify_by_pspec (G_OBJECT (paned), paned_props[PROP_POSITION]);
gtk_widget_queue_allocate (GTK_WIDGET (paned));
}
- priv->child1_size = position;
+ priv->start_child_size = position;
priv->position_set = TRUE;
}
else
@@ -1709,74 +1813,38 @@ gtk_paned_set_position (GtkPaned *paned,
#ifdef G_OS_WIN32
/* Hacky work-around for bug #144269 */
- if (priv->child2 != NULL)
+ if (priv->end_child != NULL)
{
- gtk_widget_queue_draw (priv->child2);
+ gtk_widget_queue_draw (priv->end_child);
}
#endif
}
-/**
- * gtk_paned_get_child1:
- * @paned: a #GtkPaned widget
- *
- * Obtains the first child of the paned widget.
- *
- * Returns: (nullable) (transfer none): first child, or %NULL if it is not set.
- **/
-GtkWidget *
-gtk_paned_get_child1 (GtkPaned *paned)
-{
- GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
-
- g_return_val_if_fail (GTK_IS_PANED (paned), NULL);
-
- return priv->child1;
-}
-
-/**
- * gtk_paned_get_child2:
- * @paned: a #GtkPaned widget
- *
- * Obtains the second child of the paned widget.
- *
- * Returns: (nullable) (transfer none): second child, or %NULL if it is not set.
- **/
-GtkWidget *
-gtk_paned_get_child2 (GtkPaned *paned)
-{
- GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
-
- g_return_val_if_fail (GTK_IS_PANED (paned), NULL);
-
- return priv->child2;
-}
-
static void
gtk_paned_calc_position (GtkPaned *paned,
gint allocation,
- gint child1_req,
- gint child2_req)
+ gint start_child_req,
+ gint end_child_req)
{
GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
gint old_position;
gint old_min_position;
gint old_max_position;
- old_position = priv->child1_size;
+ old_position = priv->start_child_size;
old_min_position = priv->min_position;
old_max_position = priv->max_position;
gtk_paned_compute_position (paned,
- allocation, child1_req, child2_req,
+ allocation, start_child_req, end_child_req,
&priv->min_position, &priv->max_position,
- &priv->child1_size);
+ &priv->start_child_size);
- gtk_widget_set_child_visible (priv->child1, priv->child1_size != 0);
- gtk_widget_set_child_visible (priv->child2, priv->child1_size != allocation);
+ gtk_widget_set_child_visible (priv->start_child, priv->start_child_size != 0);
+ gtk_widget_set_child_visible (priv->end_child, priv->start_child_size != allocation);
g_object_freeze_notify (G_OBJECT (paned));
- if (priv->child1_size != old_position)
+ if (priv->start_child_size != old_position)
g_object_notify_by_pspec (G_OBJECT (paned), paned_props[PROP_POSITION]);
if (priv->min_position != old_min_position)
g_object_notify_by_pspec (G_OBJECT (paned), paned_props[PROP_MIN_POSITION]);
@@ -1794,13 +1862,13 @@ gtk_paned_set_saved_focus (GtkPaned *paned, GtkWidget *widget)
if (priv->saved_focus)
g_object_remove_weak_pointer (G_OBJECT (priv->saved_focus),
- (gpointer *)&(priv->saved_focus));
+ (gpointer *)&(priv->saved_focus));
priv->saved_focus = widget;
if (priv->saved_focus)
g_object_add_weak_pointer (G_OBJECT (priv->saved_focus),
- (gpointer *)&(priv->saved_focus));
+ (gpointer *)&(priv->saved_focus));
}
static void
@@ -1810,45 +1878,45 @@ gtk_paned_set_first_paned (GtkPaned *paned, GtkPaned *first_paned)
if (priv->first_paned)
g_object_remove_weak_pointer (G_OBJECT (priv->first_paned),
- (gpointer *)&(priv->first_paned));
+ (gpointer *)&(priv->first_paned));
priv->first_paned = first_paned;
if (priv->first_paned)
g_object_add_weak_pointer (G_OBJECT (priv->first_paned),
- (gpointer *)&(priv->first_paned));
+ (gpointer *)&(priv->first_paned));
}
static void
-gtk_paned_set_last_child1_focus (GtkPaned *paned, GtkWidget *widget)
+gtk_paned_set_last_start_child_focus (GtkPaned *paned, GtkWidget *widget)
{
GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
- if (priv->last_child1_focus)
- g_object_remove_weak_pointer (G_OBJECT (priv->last_child1_focus),
- (gpointer *)&(priv->last_child1_focus));
+ if (priv->last_start_child_focus)
+ g_object_remove_weak_pointer (G_OBJECT (priv->last_start_child_focus),
+ (gpointer *)&(priv->last_start_child_focus));
- priv->last_child1_focus = widget;
+ priv->last_start_child_focus = widget;
- if (priv->last_child1_focus)
- g_object_add_weak_pointer (G_OBJECT (priv->last_child1_focus),
- (gpointer *)&(priv->last_child1_focus));
+ if (priv->last_start_child_focus)
+ g_object_add_weak_pointer (G_OBJECT (priv->last_start_child_focus),
+ (gpointer *)&(priv->last_start_child_focus));
}
static void
-gtk_paned_set_last_child2_focus (GtkPaned *paned, GtkWidget *widget)
+gtk_paned_set_last_end_child_focus (GtkPaned *paned, GtkWidget *widget)
{
GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
- if (priv->last_child2_focus)
- g_object_remove_weak_pointer (G_OBJECT (priv->last_child2_focus),
- (gpointer *)&(priv->last_child2_focus));
+ if (priv->last_end_child_focus)
+ g_object_remove_weak_pointer (G_OBJECT (priv->last_end_child_focus),
+ (gpointer *)&(priv->last_end_child_focus));
- priv->last_child2_focus = widget;
+ priv->last_end_child_focus = widget;
- if (priv->last_child2_focus)
- g_object_add_weak_pointer (G_OBJECT (priv->last_child2_focus),
- (gpointer *)&(priv->last_child2_focus));
+ if (priv->last_end_child_focus)
+ g_object_add_weak_pointer (G_OBJECT (priv->last_end_child_focus),
+ (gpointer *)&(priv->last_end_child_focus));
}
static GtkWidget *
@@ -1865,7 +1933,7 @@ paned_get_focus_widget (GtkPaned *paned)
static void
gtk_paned_set_focus_child (GtkWidget *widget,
- GtkWidget *child)
+ GtkWidget *child)
{
GtkPaned *paned = GTK_PANED (widget);
GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
@@ -1879,20 +1947,20 @@ gtk_paned_set_focus_child (GtkWidget *widget,
last_focus = paned_get_focus_widget (paned);
if (last_focus)
- {
- /* If there is one or more paned widgets between us and the
- * focus widget, we want the topmost of those as last_focus
- */
- for (w = last_focus; w != GTK_WIDGET (paned); w = gtk_widget_get_parent (w))
- if (GTK_IS_PANED (w))
- last_focus = w;
+ {
+ /* If there is one or more paned widgets between us and the
+ * focus widget, we want the topmost of those as last_focus
+ */
+ for (w = last_focus; w != GTK_WIDGET (paned); w = gtk_widget_get_parent (w))
+ if (GTK_IS_PANED (w))
+ last_focus = w;
focus_child = gtk_widget_get_focus_child (widget);
- if (focus_child == priv->child1)
- gtk_paned_set_last_child1_focus (paned, last_focus);
- else if (focus_child == priv->child2)
- gtk_paned_set_last_child2_focus (paned, last_focus);
- }
+ if (focus_child == priv->start_child)
+ gtk_paned_set_last_start_child_focus (paned, last_focus);
+ else if (focus_child == priv->end_child)
+ gtk_paned_set_last_end_child_focus (paned, last_focus);
+ }
}
GTK_WIDGET_CLASS (gtk_paned_parent_class)->set_focus_child (widget, child);
@@ -1900,8 +1968,8 @@ gtk_paned_set_focus_child (GtkWidget *widget,
static void
gtk_paned_get_cycle_chain (GtkPaned *paned,
- GtkDirectionType direction,
- GList **widgets)
+ GtkDirectionType direction,
+ GList **widgets)
{
GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
GtkWidget *ancestor = NULL;
@@ -1916,16 +1984,16 @@ gtk_paned_get_cycle_chain (GtkPaned *paned,
g_assert (widgets != NULL);
- if (priv->last_child1_focus &&
- !gtk_widget_is_ancestor (priv->last_child1_focus, widget))
+ if (priv->last_start_child_focus &&
+ !gtk_widget_is_ancestor (priv->last_start_child_focus, widget))
{
- gtk_paned_set_last_child1_focus (paned, NULL);
+ gtk_paned_set_last_start_child_focus (paned, NULL);
}
- if (priv->last_child2_focus &&
- !gtk_widget_is_ancestor (priv->last_child2_focus, widget))
+ if (priv->last_end_child_focus &&
+ !gtk_widget_is_ancestor (priv->last_end_child_focus, widget))
{
- gtk_paned_set_last_child2_focus (paned, NULL);
+ gtk_paned_set_last_end_child_focus (paned, NULL);
}
parent = gtk_widget_get_parent (widget);
@@ -1943,49 +2011,49 @@ gtk_paned_get_cycle_chain (GtkPaned *paned,
focus_child = gtk_widget_get_focus_child (GTK_WIDGET (paned));
if (direction == GTK_DIR_TAB_FORWARD)
{
- if (focus_child == priv->child1)
- {
- temp_list = g_list_append (temp_list, priv->last_child2_focus);
- temp_list = g_list_append (temp_list, priv->child2);
- temp_list = g_list_append (temp_list, ancestor);
- }
- else if (focus_child == priv->child2)
- {
- temp_list = g_list_append (temp_list, ancestor);
- temp_list = g_list_append (temp_list, priv->last_child1_focus);
- temp_list = g_list_append (temp_list, priv->child1);
- }
+ if (focus_child == priv->start_child)
+ {
+ temp_list = g_list_append (temp_list, priv->last_end_child_focus);
+ temp_list = g_list_append (temp_list, priv->end_child);
+ temp_list = g_list_append (temp_list, ancestor);
+ }
+ else if (focus_child == priv->end_child)
+ {
+ temp_list = g_list_append (temp_list, ancestor);
+ temp_list = g_list_append (temp_list, priv->last_start_child_focus);
+ temp_list = g_list_append (temp_list, priv->start_child);
+ }
else
- {
- temp_list = g_list_append (temp_list, priv->last_child1_focus);
- temp_list = g_list_append (temp_list, priv->child1);
- temp_list = g_list_append (temp_list, priv->last_child2_focus);
- temp_list = g_list_append (temp_list, priv->child2);
- temp_list = g_list_append (temp_list, ancestor);
- }
+ {
+ temp_list = g_list_append (temp_list, priv->last_start_child_focus);
+ temp_list = g_list_append (temp_list, priv->start_child);
+ temp_list = g_list_append (temp_list, priv->last_end_child_focus);
+ temp_list = g_list_append (temp_list, priv->end_child);
+ temp_list = g_list_append (temp_list, ancestor);
+ }
}
else
{
- if (focus_child == priv->child1)
- {
- temp_list = g_list_append (temp_list, ancestor);
- temp_list = g_list_append (temp_list, priv->last_child2_focus);
- temp_list = g_list_append (temp_list, priv->child2);
- }
- else if (focus_child == priv->child2)
- {
- temp_list = g_list_append (temp_list, priv->last_child1_focus);
- temp_list = g_list_append (temp_list, priv->child1);
- temp_list = g_list_append (temp_list, ancestor);
- }
+ if (focus_child == priv->start_child)
+ {
+ temp_list = g_list_append (temp_list, ancestor);
+ temp_list = g_list_append (temp_list, priv->last_end_child_focus);
+ temp_list = g_list_append (temp_list, priv->end_child);
+ }
+ else if (focus_child == priv->end_child)
+ {
+ temp_list = g_list_append (temp_list, priv->last_start_child_focus);
+ temp_list = g_list_append (temp_list, priv->start_child);
+ temp_list = g_list_append (temp_list, ancestor);
+ }
else
- {
- temp_list = g_list_append (temp_list, priv->last_child2_focus);
- temp_list = g_list_append (temp_list, priv->child2);
- temp_list = g_list_append (temp_list, priv->last_child1_focus);
- temp_list = g_list_append (temp_list, priv->child1);
- temp_list = g_list_append (temp_list, ancestor);
- }
+ {
+ temp_list = g_list_append (temp_list, priv->last_end_child_focus);
+ temp_list = g_list_append (temp_list, priv->end_child);
+ temp_list = g_list_append (temp_list, priv->last_start_child_focus);
+ temp_list = g_list_append (temp_list, priv->start_child);
+ temp_list = g_list_append (temp_list, ancestor);
+ }
}
/* Walk the list and expand all the paned widgets. */
@@ -1994,18 +2062,18 @@ gtk_paned_get_cycle_chain (GtkPaned *paned,
widget = list->data;
if (widget)
- {
- if (GTK_IS_PANED (widget))
- {
- priv->in_recursion = TRUE;
- gtk_paned_get_cycle_chain (GTK_PANED (widget), direction, widgets);
- priv->in_recursion = FALSE;
- }
- else
- {
- *widgets = g_list_append (*widgets, widget);
- }
- }
+ {
+ if (GTK_IS_PANED (widget))
+ {
+ priv->in_recursion = TRUE;
+ gtk_paned_get_cycle_chain (GTK_PANED (widget), direction, widgets);
+ priv->in_recursion = FALSE;
+ }
+ else
+ {
+ *widgets = g_list_append (*widgets, widget);
+ }
+ }
}
g_list_free (temp_list);
@@ -2013,17 +2081,17 @@ gtk_paned_get_cycle_chain (GtkPaned *paned,
static gboolean
gtk_paned_cycle_child_focus (GtkPaned *paned,
- gboolean reversed)
+ gboolean reversed)
{
GList *cycle_chain = NULL;
GList *list;
-
+
GtkDirectionType direction = reversed? GTK_DIR_TAB_BACKWARD : GTK_DIR_TAB_FORWARD;
/* ignore f6 if the handle is focused */
if (gtk_widget_is_focus (GTK_WIDGET (paned)))
return TRUE;
-
+
/* we can't just let the event propagate up the hierarchy,
* because the paned will want to cycle focus _unless_ an
* ancestor paned handles the event
@@ -2035,13 +2103,13 @@ gtk_paned_cycle_child_focus (GtkPaned *paned,
break;
g_list_free (cycle_chain);
-
+
return TRUE;
}
static void
get_child_panes (GtkWidget *widget,
- GList **panes)
+ GList **panes)
{
if (!widget || !gtk_widget_get_realized (widget))
return;
@@ -2051,9 +2119,9 @@ get_child_panes (GtkWidget *widget,
GtkPaned *paned = GTK_PANED (widget);
GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
- get_child_panes (priv->child1, panes);
+ get_child_panes (priv->start_child, panes);
*panes = g_list_prepend (*panes, widget);
- get_child_panes (priv->child2, panes);
+ get_child_panes (priv->end_child, panes);
}
else if (GTK_IS_CONTAINER (widget))
{
@@ -2072,7 +2140,7 @@ get_all_panes (GtkPaned *paned)
for (w = GTK_WIDGET (paned); w != NULL; w = gtk_widget_get_parent (w))
{
if (GTK_IS_PANED (w))
- topmost = GTK_PANED (w);
+ topmost = GTK_PANED (w);
}
g_assert (topmost);
@@ -2084,8 +2152,8 @@ get_all_panes (GtkPaned *paned)
static void
gtk_paned_find_neighbours (GtkPaned *paned,
- GtkPaned **next,
- GtkPaned **prev)
+ GtkPaned **next,
+ GtkPaned **prev)
{
GList *all_panes;
GList *this_link;
@@ -2096,7 +2164,7 @@ gtk_paned_find_neighbours (GtkPaned *paned,
this_link = g_list_find (all_panes, paned);
g_assert (this_link);
-
+
if (this_link->next)
*next = this_link->next->data;
else
@@ -2112,7 +2180,7 @@ gtk_paned_find_neighbours (GtkPaned *paned,
static gboolean
gtk_paned_move_handle (GtkPaned *paned,
- GtkScrollType scroll)
+ GtkScrollType scroll)
{
GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
@@ -2121,67 +2189,67 @@ gtk_paned_move_handle (GtkPaned *paned,
gint old_position;
gint new_position;
gint increment;
-
+
enum {
- SINGLE_STEP_SIZE = 1,
- PAGE_STEP_SIZE = 75
+ SINGLE_STEP_SIZE = 1,
+ PAGE_STEP_SIZE = 75
};
-
+
new_position = old_position = gtk_paned_get_position (paned);
increment = 0;
-
+
switch (scroll)
- {
- case GTK_SCROLL_STEP_LEFT:
- case GTK_SCROLL_STEP_UP:
- case GTK_SCROLL_STEP_BACKWARD:
- increment = - SINGLE_STEP_SIZE;
- break;
-
- case GTK_SCROLL_STEP_RIGHT:
- case GTK_SCROLL_STEP_DOWN:
- case GTK_SCROLL_STEP_FORWARD:
- increment = SINGLE_STEP_SIZE;
- break;
-
- case GTK_SCROLL_PAGE_LEFT:
- case GTK_SCROLL_PAGE_UP:
- case GTK_SCROLL_PAGE_BACKWARD:
- increment = - PAGE_STEP_SIZE;
- break;
-
- case GTK_SCROLL_PAGE_RIGHT:
- case GTK_SCROLL_PAGE_DOWN:
- case GTK_SCROLL_PAGE_FORWARD:
- increment = PAGE_STEP_SIZE;
- break;
-
- case GTK_SCROLL_START:
- new_position = priv->min_position;
- break;
-
- case GTK_SCROLL_END:
- new_position = priv->max_position;
- break;
-
- case GTK_SCROLL_NONE:
- case GTK_SCROLL_JUMP:
- default:
- break;
- }
+ {
+ case GTK_SCROLL_STEP_LEFT:
+ case GTK_SCROLL_STEP_UP:
+ case GTK_SCROLL_STEP_BACKWARD:
+ increment = - SINGLE_STEP_SIZE;
+ break;
+
+ case GTK_SCROLL_STEP_RIGHT:
+ case GTK_SCROLL_STEP_DOWN:
+ case GTK_SCROLL_STEP_FORWARD:
+ increment = SINGLE_STEP_SIZE;
+ break;
+
+ case GTK_SCROLL_PAGE_LEFT:
+ case GTK_SCROLL_PAGE_UP:
+ case GTK_SCROLL_PAGE_BACKWARD:
+ increment = - PAGE_STEP_SIZE;
+ break;
+
+ case GTK_SCROLL_PAGE_RIGHT:
+ case GTK_SCROLL_PAGE_DOWN:
+ case GTK_SCROLL_PAGE_FORWARD:
+ increment = PAGE_STEP_SIZE;
+ break;
+
+ case GTK_SCROLL_START:
+ new_position = priv->min_position;
+ break;
+
+ case GTK_SCROLL_END:
+ new_position = priv->max_position;
+ break;
+
+ case GTK_SCROLL_NONE:
+ case GTK_SCROLL_JUMP:
+ default:
+ break;
+ }
if (increment)
- {
- if (is_rtl (paned))
- increment = -increment;
-
- new_position = old_position + increment;
- }
-
+ {
+ if (is_rtl (paned))
+ increment = -increment;
+
+ new_position = old_position + increment;
+ }
+
new_position = CLAMP (new_position, priv->min_position, priv->max_position);
-
+
if (old_position != new_position)
- gtk_paned_set_position (paned, new_position);
+ gtk_paned_set_position (paned, new_position);
return TRUE;
}
@@ -2197,26 +2265,26 @@ gtk_paned_restore_focus (GtkPaned *paned)
if (gtk_widget_is_focus (GTK_WIDGET (paned)))
{
if (priv->saved_focus &&
- gtk_widget_get_sensitive (priv->saved_focus))
- {
- gtk_widget_grab_focus (priv->saved_focus);
- }
+ gtk_widget_get_sensitive (priv->saved_focus))
+ {
+ gtk_widget_grab_focus (priv->saved_focus);
+ }
else
- {
- /* the saved focus is somehow not available for focusing,
- * try
- * 1) tabbing into the paned widget
- * if that didn't work,
- * 2) unset focus for the window if there is one
- */
-
- if (!gtk_widget_child_focus (GTK_WIDGET (paned), GTK_DIR_TAB_FORWARD))
- {
+ {
+ /* the saved focus is somehow not available for focusing,
+ * try
+ * 1) tabbing into the paned widget
+ * if that didn't work,
+ * 2) unset focus for the window if there is one
+ */
+
+ if (!gtk_widget_child_focus (GTK_WIDGET (paned), GTK_DIR_TAB_FORWARD))
+ {
GtkRoot *root = gtk_widget_get_root (GTK_WIDGET (paned));
gtk_root_set_focus (root, NULL);
- }
- }
-
+ }
+ }
+
gtk_paned_set_saved_focus (paned, NULL);
gtk_paned_set_first_paned (paned, NULL);
}
@@ -2247,10 +2315,10 @@ gtk_paned_cancel_position (GtkPaned *paned)
if (gtk_widget_is_focus (GTK_WIDGET (paned)))
{
if (priv->original_position != -1)
- {
- gtk_paned_set_position (paned, priv->original_position);
- priv->original_position = -1;
- }
+ {
+ gtk_paned_set_position (paned, priv->original_position);
+ priv->original_position = -1;
+ }
gtk_paned_restore_focus (paned);
return TRUE;
@@ -2261,7 +2329,7 @@ gtk_paned_cancel_position (GtkPaned *paned)
static gboolean
gtk_paned_cycle_handle_focus (GtkPaned *paned,
- gboolean reversed)
+ gboolean reversed)
{
GtkPanedPrivate *priv = gtk_paned_get_instance_private (paned);
GtkPaned *next, *prev;
@@ -2271,48 +2339,48 @@ gtk_paned_cycle_handle_focus (GtkPaned *paned,
GtkPaned *focus = NULL;
if (!priv->first_paned)
- {
- /* The first_pane has disappeared. As an ad-hoc solution,
- * we make the currently focused paned the first_paned. To the
- * user this will seem like the paned cycling has been reset.
- */
-
- gtk_paned_set_first_paned (paned, paned);
- }
-
+ {
+ /* The first_pane has disappeared. As an ad-hoc solution,
+ * we make the currently focused paned the first_paned. To the
+ * user this will seem like the paned cycling has been reset.
+ */
+
+ gtk_paned_set_first_paned (paned, paned);
+ }
+
gtk_paned_find_neighbours (paned, &next, &prev);
if (reversed && prev &&
- prev != paned && paned != priv->first_paned)
- {
- focus = prev;
- }
+ prev != paned && paned != priv->first_paned)
+ {
+ focus = prev;
+ }
else if (!reversed && next &&
- next != paned && next != priv->first_paned)
- {
- focus = next;
- }
+ next != paned && next != priv->first_paned)
+ {
+ focus = next;
+ }
else
- {
- gtk_paned_accept_position (paned);
- return TRUE;
- }
+ {
+ gtk_paned_accept_position (paned);
+ return TRUE;
+ }
g_assert (focus);
-
+
gtk_paned_set_saved_focus (focus, priv->saved_focus);
gtk_paned_set_first_paned (focus, priv->first_paned);
-
+
gtk_paned_set_saved_focus (paned, NULL);
gtk_paned_set_first_paned (paned, NULL);
-
+
gtk_widget_grab_focus (GTK_WIDGET (focus));
-
+
if (!gtk_widget_is_focus (GTK_WIDGET (paned)))
- {
- priv->original_position = -1;
- priv->original_position = gtk_paned_get_position (focus);
- }
+ {
+ priv->original_position = -1;
+ priv->original_position = gtk_paned_get_position (focus);
+ }
}
else
{
@@ -2323,45 +2391,45 @@ gtk_paned_cycle_handle_focus (GtkPaned *paned,
gtk_paned_find_neighbours (paned, &next, &prev);
focus_child = gtk_widget_get_focus_child (GTK_WIDGET (paned));
- if (focus_child == priv->child1)
- {
- if (reversed)
- {
- focus = prev;
- first = paned;
- }
- else
- {
- focus = paned;
- first = paned;
- }
- }
- else if (focus_child == priv->child2)
- {
- if (reversed)
- {
- focus = paned;
- first = next;
- }
- else
- {
- focus = next;
- first = next;
- }
- }
+ if (focus_child == priv->start_child)
+ {
+ if (reversed)
+ {
+ focus = prev;
+ first = paned;
+ }
+ else
+ {
+ focus = paned;
+ first = paned;
+ }
+ }
+ else if (focus_child == priv->end_child)
+ {
+ if (reversed)
+ {
+ focus = paned;
+ first = next;
+ }
+ else
+ {
+ focus = next;
+ first = next;
+ }
+ }
else
- {
- /* Focus is not inside this paned, and we don't have focus.
- * Presumably this happened because the application wants us
- * to start keyboard navigating.
- */
- focus = paned;
-
- if (reversed)
- first = paned;
- else
- first = next;
- }
+ {
+ /* Focus is not inside this paned, and we don't have focus.
+ * Presumably this happened because the application wants us
+ * to start keyboard navigating.
+ */
+ focus = paned;
+
+ if (reversed)
+ first = paned;
+ else
+ first = next;
+ }
gtk_paned_set_saved_focus (focus, gtk_root_get_focus (gtk_widget_get_root (GTK_WIDGET (paned))));
gtk_paned_set_first_paned (focus, first);
diff --git a/gtk/gtkpaned.h b/gtk/gtkpaned.h
index 789b329783..cb35932f2e 100644
--- a/gtk/gtkpaned.h
+++ b/gtk/gtkpaned.h
@@ -29,7 +29,7 @@
#error "Only <gtk/gtk.h> can be included directly."
#endif
-#include <gtk/gtkcontainer.h>
+#include <gtk/gtkwidget.h>
G_BEGIN_DECLS
@@ -44,32 +44,45 @@ GType gtk_paned_get_type (void) G_GNUC_CONST;
GDK_AVAILABLE_IN_ALL
GtkWidget * gtk_paned_new (GtkOrientation orientation);
GDK_AVAILABLE_IN_ALL
-void gtk_paned_add1 (GtkPaned *paned,
- GtkWidget *child);
+void gtk_paned_set_start_child (GtkPaned *paned,
+ GtkWidget *child);
GDK_AVAILABLE_IN_ALL
-void gtk_paned_add2 (GtkPaned *paned,
- GtkWidget *child);
+GtkWidget * gtk_paned_get_start_child (GtkPaned *paned);
GDK_AVAILABLE_IN_ALL
-void gtk_paned_pack1 (GtkPaned *paned,
- GtkWidget *child,
- gboolean resize,
- gboolean shrink);
+void gtk_paned_set_resize_start_child (GtkPaned *paned,
+ gboolean resize);
GDK_AVAILABLE_IN_ALL
-void gtk_paned_pack2 (GtkPaned *paned,
- GtkWidget *child,
- gboolean resize,
- gboolean shrink);
+gboolean gtk_paned_get_resize_start_child (GtkPaned *paned);
GDK_AVAILABLE_IN_ALL
-gint gtk_paned_get_position (GtkPaned *paned);
+void gtk_paned_set_end_child (GtkPaned *paned,
+ GtkWidget *child);
GDK_AVAILABLE_IN_ALL
-void gtk_paned_set_position (GtkPaned *paned,
- gint position);
+GtkWidget * gtk_paned_get_end_child (GtkPaned *paned);
+
+GDK_AVAILABLE_IN_ALL
+void gtk_paned_set_shrink_start_child (GtkPaned *paned,
+ gboolean resize);
+GDK_AVAILABLE_IN_ALL
+gboolean gtk_paned_get_shrink_start_child (GtkPaned *paned);
GDK_AVAILABLE_IN_ALL
-GtkWidget * gtk_paned_get_child1 (GtkPaned *paned);
+void gtk_paned_set_resize_end_child (GtkPaned *paned,
+ gboolean resize);
+GDK_AVAILABLE_IN_ALL
+gboolean gtk_paned_get_resize_end_child (GtkPaned *paned);
+
GDK_AVAILABLE_IN_ALL
-GtkWidget * gtk_paned_get_child2 (GtkPaned *paned);
+void gtk_paned_set_shrink_end_child (GtkPaned *paned,
+ gboolean resize);
+GDK_AVAILABLE_IN_ALL
+gboolean gtk_paned_get_shrink_end_child (GtkPaned *paned);
+
+GDK_AVAILABLE_IN_ALL
+gint gtk_paned_get_position (GtkPaned *paned);
+GDK_AVAILABLE_IN_ALL
+void gtk_paned_set_position (GtkPaned *paned,
+ gint position);
GDK_AVAILABLE_IN_ALL
void gtk_paned_set_wide_handle (GtkPaned *paned,
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 244784a9a0..c84cd0ba04 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -10,9 +10,9 @@
<property name="vexpand">1</property>
<child>
<object class="GtkPaned" id="browse_widgets_hpaned">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="vexpand">1</property>
<child>
<object class="GtkPlacesSidebar" id="places_sidebar">
diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index a697fa5937..3f641ddf3b 100644
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -206,7 +206,9 @@ create_calendar(void)
calendar_data.calendar_widget = calendar;
frame = create_frame ("<b>Calendar</b>", calendar, GTK_ALIGN_CENTER, GTK_ALIGN_CENTER);
- gtk_paned_pack1 (GTK_PANED (hpaned), frame, TRUE, FALSE);
+ gtk_paned_set_start_child (GTK_PANED (hpaned), frame);
+ gtk_paned_set_resize_start_child (GTK_PANED (hpaned), TRUE);
+ gtk_paned_set_shrink_start_child (GTK_PANED (hpaned), FALSE);
gtk_calendar_mark_day (GTK_CALENDAR (calendar), 19);
@@ -227,7 +229,9 @@ create_calendar(void)
&calendar_data);
rpane = gtk_box_new (GTK_ORIENTATION_VERTICAL, DEF_PAD_SMALL);
- gtk_paned_pack2 (GTK_PANED (hpaned), rpane, FALSE, FALSE);
+ gtk_paned_set_end_child (GTK_PANED (hpaned), rpane);
+ gtk_paned_set_resize_end_child (GTK_PANED (hpaned), FALSE);
+ gtk_paned_set_shrink_end_child (GTK_PANED (hpaned), FALSE);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, DEF_PAD_SMALL);
frame = create_frame ("<b>Options</b>", vbox, GTK_ALIGN_FILL, GTK_ALIGN_CENTER);
diff --git a/tests/testgrid.c b/tests/testgrid.c
index 36f73650b4..641f1de541 100644
--- a/tests/testgrid.c
+++ b/tests/testgrid.c
@@ -101,8 +101,12 @@ text_grid (void)
gtk_window_set_child (GTK_WINDOW (window), paned1);
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_paned_pack1 (GTK_PANED (paned1), box, TRUE, FALSE);
- gtk_paned_pack2 (GTK_PANED (paned1), gtk_label_new ("Space"), TRUE, FALSE);
+ gtk_paned_set_start_child (GTK_PANED (paned1), box);
+ gtk_paned_set_resize_start_child (GTK_PANED (paned1), TRUE);
+ gtk_paned_set_shrink_start_child (GTK_PANED (paned1), FALSE);
+ gtk_paned_set_end_child (GTK_PANED (paned1), gtk_label_new ("Space"));
+ gtk_paned_set_resize_end_child (GTK_PANED (paned1), TRUE);
+ gtk_paned_set_shrink_end_child (GTK_PANED (paned1), FALSE);
grid = gtk_grid_new ();
gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_VERTICAL);
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 429c0de770..0e4c6e0171 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -4076,28 +4076,22 @@ static void
toggle_resize (GtkWidget *widget, GtkWidget *child)
{
GtkPaned *paned = GTK_PANED (gtk_widget_get_parent (child));
- gboolean is_child1;
- gboolean resize;
- const char *prop;
- is_child1 = (child == gtk_paned_get_child1 (paned));
- prop = is_child1 ? "resize-child1" : "resize-child2";
- g_object_get (paned, prop, &resize, NULL);
- g_object_set (paned, prop, !resize, NULL);
+ if (child == gtk_paned_get_start_child (paned))
+ gtk_paned_set_resize_start_child (paned, !gtk_paned_get_resize_start_child (paned));
+ else
+ gtk_paned_set_resize_end_child (paned, !gtk_paned_get_resize_end_child (paned));
}
static void
toggle_shrink (GtkWidget *widget, GtkWidget *child)
{
GtkPaned *paned = GTK_PANED (gtk_widget_get_parent (child));
- gboolean is_child1;
- gboolean resize;
- const char *prop;
- is_child1 = (child == gtk_paned_get_child1 (paned));
- prop = is_child1 ? "shrink-child1" : "shrink-child2";
- g_object_get (paned, prop, &resize, NULL);
- g_object_set (paned, prop, !resize, NULL);
+ if (child == gtk_paned_get_start_child (paned))
+ gtk_paned_set_shrink_start_child (paned, !gtk_paned_get_shrink_start_child (paned));
+ else
+ gtk_paned_set_shrink_end_child (paned, !gtk_paned_get_shrink_end_child (paned));
}
static GtkWidget *
@@ -4112,8 +4106,8 @@ create_pane_options (GtkPaned *paned,
GtkWidget *label;
GtkWidget *check_button;
- child1 = gtk_paned_get_child1 (paned);
- child2 = gtk_paned_get_child2 (paned);
+ child1 = gtk_paned_get_start_child (paned);
+ child2 = gtk_paned_get_end_child (paned);
frame = gtk_frame_new (frame_label);
@@ -4186,22 +4180,22 @@ create_panes (GtkWidget *widget)
gtk_container_add (GTK_CONTAINER (vbox), vpaned);
hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_paned_add1 (GTK_PANED (vpaned), hpaned);
+ gtk_paned_set_start_child (GTK_PANED (vpaned), hpaned);
frame = gtk_frame_new (NULL);
gtk_widget_set_size_request (frame, 60, 60);
- gtk_paned_add1 (GTK_PANED (hpaned), frame);
+ gtk_paned_set_start_child (GTK_PANED (hpaned), frame);
button = gtk_button_new_with_label ("Hi there");
gtk_frame_set_child (GTK_FRAME (frame), button);
frame = gtk_frame_new (NULL);
gtk_widget_set_size_request (frame, 80, 60);
- gtk_paned_add2 (GTK_PANED (hpaned), frame);
+ gtk_paned_set_end_child (GTK_PANED (hpaned), frame);
frame = gtk_frame_new (NULL);
gtk_widget_set_size_request (frame, 60, 80);
- gtk_paned_add2 (GTK_PANED (vpaned), frame);
+ gtk_paned_set_end_child (GTK_PANED (vpaned), frame);
/* Now create toggle buttons to control sizing */
@@ -4261,7 +4255,9 @@ paned_keyboard_window1 (GtkWidget *widget)
gtk_window_set_child (GTK_WINDOW (window1), hpaned1);
frame1 = gtk_frame_new (NULL);
- gtk_paned_pack1 (GTK_PANED (hpaned1), frame1, FALSE, TRUE);
+ gtk_paned_set_start_child (GTK_PANED (hpaned1), frame1);
+ gtk_paned_set_resize_start_child (GTK_PANED (hpaned1), FALSE);
+ gtk_paned_set_shrink_start_child (GTK_PANED (hpaned1), TRUE);
vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_frame_set_child (GTK_FRAME (frame1), vbox1);
@@ -4276,10 +4272,14 @@ paned_keyboard_window1 (GtkWidget *widget)
gtk_container_add (GTK_CONTAINER (vbox1), button9);
vpaned1 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
- gtk_paned_pack2 (GTK_PANED (hpaned1), vpaned1, TRUE, TRUE);
+ gtk_paned_set_end_child (GTK_PANED (hpaned1), vpaned1);
+ gtk_paned_set_resize_end_child (GTK_PANED (hpaned1), TRUE);
+ gtk_paned_set_shrink_end_child (GTK_PANED (hpaned1), TRUE);
frame2 = gtk_frame_new (NULL);
- gtk_paned_pack1 (GTK_PANED (vpaned1), frame2, FALSE, TRUE);
+ gtk_paned_set_start_child (GTK_PANED (vpaned1), frame2);
+ gtk_paned_set_resize_start_child (GTK_PANED (vpaned1), FALSE);
+ gtk_paned_set_shrink_start_child (GTK_PANED (vpaned1), TRUE);
frame5 = gtk_frame_new (NULL);
gtk_frame_set_child (GTK_FRAME (frame2), frame5);
@@ -4294,7 +4294,9 @@ paned_keyboard_window1 (GtkWidget *widget)
gtk_container_add (GTK_CONTAINER (hbox1), button6);
frame3 = gtk_frame_new (NULL);
- gtk_paned_pack2 (GTK_PANED (vpaned1), frame3, TRUE, TRUE);
+ gtk_paned_set_end_child (GTK_PANED (vpaned1), frame3);
+ gtk_paned_set_resize_end_child (GTK_PANED (vpaned1), TRUE);
+ gtk_paned_set_shrink_end_child (GTK_PANED (vpaned1), TRUE);
frame4 = gtk_frame_new ("Buttons");
gtk_frame_set_child (GTK_FRAME (frame3), frame4);
@@ -4342,25 +4344,33 @@ paned_keyboard_window2 (GtkWidget *widget)
gtk_window_set_child (GTK_WINDOW (window2), hpaned2);
frame6 = gtk_frame_new (NULL);
- gtk_paned_pack1 (GTK_PANED (hpaned2), frame6, FALSE, TRUE);
+ gtk_paned_set_start_child (GTK_PANED (hpaned2), frame6);
+ gtk_paned_set_resize_start_child (GTK_PANED (hpaned2), FALSE);
+ gtk_paned_set_shrink_start_child (GTK_PANED (hpaned2), TRUE);
button13 = gtk_button_new_with_label ("button13");
gtk_frame_set_child (GTK_FRAME (frame6), button13);
hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_paned_pack2 (GTK_PANED (hpaned2), hbox2, TRUE, TRUE);
+ gtk_paned_set_end_child (GTK_PANED (hpaned2), hbox2);
+ gtk_paned_set_resize_end_child (GTK_PANED (hpaned2), TRUE);
+ gtk_paned_set_shrink_end_child (GTK_PANED (hpaned2), TRUE);
vpaned2 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
gtk_container_add (GTK_CONTAINER (hbox2), vpaned2);
frame7 = gtk_frame_new (NULL);
- gtk_paned_pack1 (GTK_PANED (vpaned2), frame7, FALSE, TRUE);
+ gtk_paned_set_start_child (GTK_PANED (vpaned2), frame7);
+ gtk_paned_set_resize_start_child (GTK_PANED (vpaned2), FALSE);
+ gtk_paned_set_shrink_start_child (GTK_PANED (vpaned2), TRUE);
button12 = gtk_button_new_with_label ("button12");
gtk_frame_set_child (GTK_FRAME (frame7), button12);
frame8 = gtk_frame_new (NULL);
- gtk_paned_pack2 (GTK_PANED (vpaned2), frame8, TRUE, TRUE);
+ gtk_paned_set_end_child (GTK_PANED (vpaned2), frame8);
+ gtk_paned_set_resize_end_child (GTK_PANED (vpaned2), TRUE);
+ gtk_paned_set_shrink_end_child (GTK_PANED (vpaned2), TRUE);
button11 = gtk_button_new_with_label ("button11");
gtk_frame_set_child (GTK_FRAME (frame8), button11);
@@ -4407,31 +4417,43 @@ paned_keyboard_window3 (GtkWidget *widget)
gtk_container_add (GTK_CONTAINER (vbox2), hpaned3);
frame9 = gtk_frame_new (NULL);
- gtk_paned_pack1 (GTK_PANED (hpaned3), frame9, FALSE, TRUE);
+ gtk_paned_set_start_child (GTK_PANED (hpaned3), frame9);
+ gtk_paned_set_resize_start_child (GTK_PANED (hpaned3), FALSE);
+ gtk_paned_set_shrink_start_child (GTK_PANED (hpaned3), TRUE);
button14 = gtk_button_new_with_label ("button14");
gtk_frame_set_child (GTK_FRAME (frame9), button14);
hpaned4 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_paned_pack2 (GTK_PANED (hpaned3), hpaned4, TRUE, TRUE);
+ gtk_paned_set_end_child (GTK_PANED (hpaned3), hpaned4);
+ gtk_paned_set_resize_end_child (GTK_PANED (hpaned3), TRUE);
+ gtk_paned_set_shrink_end_child (GTK_PANED (hpaned3), TRUE);
frame10 = gtk_frame_new (NULL);
- gtk_paned_pack1 (GTK_PANED (hpaned4), frame10, FALSE, TRUE);
+ gtk_paned_set_start_child (GTK_PANED (hpaned4), frame10);
+ gtk_paned_set_resize_start_child (GTK_PANED (hpaned4), FALSE);
+ gtk_paned_set_shrink_start_child (GTK_PANED (hpaned4), TRUE);
button15 = gtk_button_new_with_label ("button15");
gtk_frame_set_child (GTK_FRAME (frame10), button15);
hpaned5 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_paned_pack2 (GTK_PANED (hpaned4), hpaned5, TRUE, TRUE);
+ gtk_paned_set_end_child (GTK_PANED (hpaned4), hpaned5);
+ gtk_paned_set_resize_end_child (GTK_PANED (hpaned4), TRUE);
+ gtk_paned_set_shrink_end_child (GTK_PANED (hpaned4), TRUE);
frame11 = gtk_frame_new (NULL);
- gtk_paned_pack1 (GTK_PANED (hpaned5), frame11, FALSE, TRUE);
+ gtk_paned_set_start_child (GTK_PANED (hpaned5), frame11);
+ gtk_paned_set_resize_start_child (GTK_PANED (hpaned5), FALSE);
+ gtk_paned_set_shrink_start_child (GTK_PANED (hpaned5), TRUE);
button16 = gtk_button_new_with_label ("button16");
gtk_frame_set_child (GTK_FRAME (frame11), button16);
frame12 = gtk_frame_new (NULL);
- gtk_paned_pack2 (GTK_PANED (hpaned5), frame12, TRUE, TRUE);
+ gtk_paned_set_end_child (GTK_PANED (hpaned5), frame12);
+ gtk_paned_set_resize_end_child (GTK_PANED (hpaned5), TRUE);
+ gtk_paned_set_shrink_end_child (GTK_PANED (hpaned5), TRUE);
button17 = gtk_button_new_with_label ("button17");
gtk_frame_set_child (GTK_FRAME (frame12), button17);
@@ -4465,7 +4487,7 @@ paned_keyboard_window4 (GtkWidget *widget)
gtk_window_set_title (GTK_WINDOW (window4), "window4");
gtk_window_set_display (GTK_WINDOW (window4),
- gtk_widget_get_display (widget));
+ gtk_widget_get_display (widget));
vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_window_set_child (GTK_WINDOW (window4), vbox3);
@@ -4478,43 +4500,63 @@ paned_keyboard_window4 (GtkWidget *widget)
gtk_container_add (GTK_CONTAINER (vbox3), hpaned6);
vpaned3 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
- gtk_paned_pack1 (GTK_PANED (hpaned6), vpaned3, FALSE, TRUE);
+ gtk_paned_set_start_child (GTK_PANED (hpaned6), vpaned3);
+ gtk_paned_set_resize_start_child (GTK_PANED (hpaned6), FALSE);
+ gtk_paned_set_shrink_start_child (GTK_PANED (hpaned6), TRUE);
button19 = gtk_button_new_with_label ("button19");
- gtk_paned_pack1 (GTK_PANED (vpaned3), button19, FALSE, TRUE);
+ gtk_paned_set_start_child (GTK_PANED (vpaned3), button19);
+ gtk_paned_set_resize_start_child (GTK_PANED (vpaned3), FALSE);
+ gtk_paned_set_shrink_start_child (GTK_PANED (vpaned3), TRUE);
button18 = gtk_button_new_with_label ("button18");
- gtk_paned_pack2 (GTK_PANED (vpaned3), button18, TRUE, TRUE);
+ gtk_paned_set_end_child (GTK_PANED (vpaned3), button18);
+ gtk_paned_set_resize_end_child (GTK_PANED (vpaned3), TRUE);
+ gtk_paned_set_shrink_end_child (GTK_PANED (vpaned3), TRUE);
hbox3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_paned_pack2 (GTK_PANED (hpaned6), hbox3, TRUE, TRUE);
+ gtk_paned_set_end_child (GTK_PANED (hpaned6), hbox3);
+ gtk_paned_set_resize_end_child (GTK_PANED (hpaned6), TRUE);
+ gtk_paned_set_shrink_end_child (GTK_PANED (hpaned6), TRUE);
vpaned4 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
gtk_container_add (GTK_CONTAINER (hbox3), vpaned4);
button21 = gtk_button_new_with_label ("button21");
- gtk_paned_pack1 (GTK_PANED (vpaned4), button21, FALSE, TRUE);
+ gtk_paned_set_start_child (GTK_PANED (vpaned4), button21);
+ gtk_paned_set_resize_start_child (GTK_PANED (vpaned4), FALSE);
+ gtk_paned_set_shrink_start_child (GTK_PANED (vpaned4), TRUE);
button20 = gtk_button_new_with_label ("button20");
- gtk_paned_pack2 (GTK_PANED (vpaned4), button20, TRUE, TRUE);
+ gtk_paned_set_end_child (GTK_PANED (vpaned4), button20);
+ gtk_paned_set_resize_end_child (GTK_PANED (vpaned4), TRUE);
+ gtk_paned_set_shrink_end_child (GTK_PANED (vpaned4), TRUE);
vpaned5 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
gtk_container_add (GTK_CONTAINER (hbox3), vpaned5);
button23 = gtk_button_new_with_label ("button23");
- gtk_paned_pack1 (GTK_PANED (vpaned5), button23, FALSE, TRUE);
+ gtk_paned_set_start_child (GTK_PANED (vpaned5), button23);
+ gtk_paned_set_resize_start_child (GTK_PANED (vpaned5), FALSE);
+ gtk_paned_set_shrink_start_child (GTK_PANED (vpaned5), TRUE);
button22 = gtk_button_new_with_label ("button22");
- gtk_paned_pack2 (GTK_PANED (vpaned5), button22, TRUE, TRUE);
+ gtk_paned_set_end_child (GTK_PANED (vpaned5), button22);
+ gtk_paned_set_resize_end_child (GTK_PANED (vpaned5), TRUE);
+ gtk_paned_set_shrink_end_child (GTK_PANED (vpaned5), TRUE);
vpaned6 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
gtk_container_add (GTK_CONTAINER (hbox3), vpaned6);
button25 = gtk_button_new_with_label ("button25");
- gtk_paned_pack1 (GTK_PANED (vpaned6), button25, FALSE, TRUE);
+ gtk_paned_set_start_child (GTK_PANED (vpaned6), button25);
+ gtk_paned_set_resize_start_child (GTK_PANED (vpaned6), FALSE);
+ gtk_paned_set_shrink_start_child (GTK_PANED (vpaned6), TRUE);
button24 = gtk_button_new_with_label ("button24");
- gtk_paned_pack2 (GTK_PANED (vpaned6), button24, TRUE, TRUE);
+ gtk_paned_set_end_child (GTK_PANED (vpaned6), button24);
+ gtk_paned_set_resize_end_child (GTK_PANED (vpaned6), TRUE);
+ gtk_paned_set_shrink_end_child (GTK_PANED (vpaned6), TRUE);
return window4;
}
diff --git a/tests/testiconview.c b/tests/testiconview.c
index 1b9c4d942f..5779b125a9 100644
--- a/tests/testiconview.c
+++ b/tests/testiconview.c
@@ -526,14 +526,14 @@ main (gint argc, gchar **argv)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_paned_add1 (GTK_PANED (paned), scrolled_window);
+ gtk_paned_set_start_child (GTK_PANED (paned), scrolled_window);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), tv);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_paned_add2 (GTK_PANED (paned), scrolled_window);
+ gtk_paned_set_end_child (GTK_PANED (paned), scrolled_window);
bbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_set_halign (bbox, GTK_ALIGN_START);
@@ -581,7 +581,7 @@ main (gint argc, gchar **argv)
gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), icon_list);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_paned_add2 (GTK_PANED (paned), scrolled_window);
+ gtk_paned_set_end_child (GTK_PANED (paned), scrolled_window);
gtk_widget_show (window);
diff --git a/testsuite/reftests/button-wrapping.ref.ui b/testsuite/reftests/button-wrapping.ref.ui
index 1df5eb6235..ff466e1a61 100644
--- a/testsuite/reftests/button-wrapping.ref.ui
+++ b/testsuite/reftests/button-wrapping.ref.ui
@@ -9,8 +9,8 @@
<property name="orientation">vertical</property>
<child>
<object class="GtkPaned" id="paned1">
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="position_set">1</property>
<child>
<object class="GtkCheckButton" id="checkbutton1">
@@ -34,8 +34,8 @@ World</property>
</child>
<child>
<object class="GtkPaned" id="paned2">
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="position_set">1</property>
<child>
<object class="GtkRadioButton" id="radiobutton1">
@@ -60,8 +60,8 @@ World</property>
</child>
<child>
<object class="GtkPaned" id="paned3">
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="position_set">1</property>
<child>
<object class="GtkToggleButton" id="togglebutton1">
@@ -86,8 +86,8 @@ World</property>
</child>
<child>
<object class="GtkPaned" id="paned4">
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="position_set">1</property>
<child>
<object class="GtkButton" id="button1">
diff --git a/testsuite/reftests/button-wrapping.ui b/testsuite/reftests/button-wrapping.ui
index aa4c674170..b1e7af8039 100644
--- a/testsuite/reftests/button-wrapping.ui
+++ b/testsuite/reftests/button-wrapping.ui
@@ -9,8 +9,8 @@
<property name="orientation">vertical</property>
<child>
<object class="GtkPaned" id="paned1">
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="position_set">1</property>
<child>
<object class="GtkCheckButton" id="checkbutton1">
@@ -34,8 +34,8 @@
</child>
<child>
<object class="GtkPaned" id="paned2">
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="position_set">1</property>
<child>
<object class="GtkRadioButton" id="radiobutton1">
@@ -60,8 +60,8 @@
</child>
<child>
<object class="GtkPaned" id="paned3">
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="position_set">1</property>
<child>
<object class="GtkToggleButton" id="togglebutton1">
@@ -86,8 +86,8 @@
</child>
<child>
<object class="GtkPaned" id="paned4">
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="position_set">1</property>
<child>
<object class="GtkButton" id="button1">
diff --git a/testsuite/reftests/label-sizing.ref.ui b/testsuite/reftests/label-sizing.ref.ui
index cc40b4126e..9b860df9c0 100644
--- a/testsuite/reftests/label-sizing.ref.ui
+++ b/testsuite/reftests/label-sizing.ref.ui
@@ -91,14 +91,14 @@
</child>
<child>
<object class="GtkPaned" id="paned1">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required1">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required1">
@@ -126,9 +126,9 @@
</child>
<child>
<object class="GtkPaned" id="natural1">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required1">
@@ -198,14 +198,14 @@
</child>
<child>
<object class="GtkPaned" id="paned2">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required2">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required2">
@@ -235,9 +235,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural2">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required2">
@@ -307,14 +307,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned3">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required3">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required3">
@@ -342,9 +342,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural3">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required3">
@@ -414,14 +414,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned4">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required4">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required4">
@@ -449,9 +449,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural4">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required4">
@@ -521,14 +521,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned5">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required5">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required5">
@@ -558,9 +558,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural5">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required5">
@@ -632,14 +632,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned6">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required6">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required6">
@@ -671,9 +671,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural6">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required6">
@@ -745,14 +745,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned7">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required7">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required7">
@@ -782,9 +782,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural7">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required7">
@@ -856,14 +856,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned8">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required8">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required8">
@@ -893,9 +893,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural8">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required8">
@@ -967,14 +967,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned9">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required9">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required9">
@@ -1004,9 +1004,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural9">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required9">
@@ -1078,14 +1078,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned10">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required10">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required10">
@@ -1117,9 +1117,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural10">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required10">
@@ -1191,14 +1191,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned11">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required11">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required11">
@@ -1228,9 +1228,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural11">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required11">
@@ -1302,14 +1302,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned12">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required12">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required12">
@@ -1339,9 +1339,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural12">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required12">
@@ -1413,14 +1413,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned13">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required13">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required13">
@@ -1450,9 +1450,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural13">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required13">
@@ -1524,14 +1524,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned14">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required14">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required14">
@@ -1561,9 +1561,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural14">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required14">
@@ -1635,14 +1635,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned15">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required15">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required15">
@@ -1672,9 +1672,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural15">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required15">
@@ -1746,14 +1746,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned16">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required16">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required16">
@@ -1783,9 +1783,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural16">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required16">
@@ -1857,14 +1857,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned17">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required17">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required17">
@@ -1894,9 +1894,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural17">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required17">
@@ -1968,14 +1968,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned18">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required18">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required18">
@@ -2007,9 +2007,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural18">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required18">
@@ -2083,14 +2083,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned19">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required19">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required19">
@@ -2120,9 +2120,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural19">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required19">
@@ -2194,14 +2194,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned20">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required20">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required20">
@@ -2231,9 +2231,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural20">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required20">
@@ -2305,14 +2305,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned21">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required21">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required21">
@@ -2344,9 +2344,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural21">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required21">
@@ -2420,14 +2420,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned22">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required22">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required22">
@@ -2461,9 +2461,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural22">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required22">
@@ -2539,14 +2539,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned23">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required23">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required23">
@@ -2578,9 +2578,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural23">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required23">
@@ -2654,14 +2654,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned24">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required24">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required24">
@@ -2693,9 +2693,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural24">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required24">
@@ -2769,14 +2769,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned25">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required25">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required25">
@@ -2808,9 +2808,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural25">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required25">
@@ -2884,14 +2884,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned26">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required26">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required26">
@@ -2925,9 +2925,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural26">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required26">
@@ -3003,14 +3003,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned27">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required27">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required27">
@@ -3042,9 +3042,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural27">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required27">
@@ -3118,14 +3118,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned28">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required28">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required28">
@@ -3157,9 +3157,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural28">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required28">
@@ -3233,14 +3233,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned29">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required29">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required29">
@@ -3272,9 +3272,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural29">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required29">
@@ -3348,14 +3348,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned30">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required30">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required30">
@@ -3387,9 +3387,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural30">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required30">
@@ -3463,14 +3463,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned31">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required31">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required31">
@@ -3502,9 +3502,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural31">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required31">
@@ -3578,14 +3578,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned32">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required32">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required32">
@@ -3617,9 +3617,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural32">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required32">
@@ -3693,14 +3693,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned33">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required33">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required33">
@@ -3730,9 +3730,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural33">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required33">
@@ -3804,14 +3804,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned34">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required34">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required34">
@@ -3843,9 +3843,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural34">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required34">
@@ -3919,14 +3919,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned35">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required35">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required35">
@@ -3956,9 +3956,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural35">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required35">
@@ -4030,14 +4030,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned36">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required36">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required36">
@@ -4067,9 +4067,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural36">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required36">
@@ -4141,14 +4141,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned37">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required37">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required37">
@@ -4180,9 +4180,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural37">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required37">
@@ -4256,14 +4256,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned38">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required38">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required38">
@@ -4297,9 +4297,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural38">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required38">
@@ -4375,14 +4375,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned39">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required39">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required39">
@@ -4414,9 +4414,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural39">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required39">
@@ -4490,14 +4490,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned40">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required40">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required40">
@@ -4529,9 +4529,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural40">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required40">
@@ -4605,14 +4605,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned41">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required41">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required41">
@@ -4644,9 +4644,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural41">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required41">
@@ -4720,14 +4720,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned42">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required42">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required42">
@@ -4761,9 +4761,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural42">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required42">
@@ -4839,14 +4839,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned43">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required43">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required43">
@@ -4878,9 +4878,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural43">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required43">
@@ -4954,14 +4954,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned44">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required44">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required44">
@@ -4993,9 +4993,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural44">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required44">
@@ -5069,14 +5069,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned45">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required45">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required45">
@@ -5108,9 +5108,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural45">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required45">
@@ -5184,14 +5184,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned46">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required46">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required46">
@@ -5223,9 +5223,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural46">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required46">
@@ -5299,14 +5299,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned47">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required47">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required47">
@@ -5338,9 +5338,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural47">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required47">
@@ -5414,14 +5414,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned48">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required48">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required48">
@@ -5453,9 +5453,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural48">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required48">
@@ -5529,14 +5529,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned49">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required49">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required49">
@@ -5566,9 +5566,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural49">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required49">
@@ -5640,14 +5640,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned50">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required50">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required50">
@@ -5679,9 +5679,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural50">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required50">
@@ -5753,14 +5753,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned51">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required51">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required51">
@@ -5790,9 +5790,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural51">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required51">
@@ -5864,14 +5864,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned52">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required52">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required52">
@@ -5901,9 +5901,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural52">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required52">
@@ -5975,14 +5975,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned53">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required53">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required53">
@@ -6014,9 +6014,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural53">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required53">
@@ -6090,14 +6090,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned54">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required54">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required54">
@@ -6131,9 +6131,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural54">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required54">
@@ -6207,14 +6207,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned55">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required55">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required55">
@@ -6246,9 +6246,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural55">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required55">
@@ -6322,14 +6322,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned56">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required56">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required56">
@@ -6361,9 +6361,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural56">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required56">
@@ -6437,14 +6437,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned57">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required57">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required57">
@@ -6476,9 +6476,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural57">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required57">
@@ -6552,14 +6552,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned58">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required58">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required58">
@@ -6593,9 +6593,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural58">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required58">
@@ -6669,14 +6669,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned59">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required59">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required59">
@@ -6708,9 +6708,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural59">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required59">
@@ -6784,14 +6784,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned60">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required60">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required60">
@@ -6823,9 +6823,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural60">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required60">
@@ -6899,14 +6899,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned61">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required61">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required61">
@@ -6938,9 +6938,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural61">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required61">
@@ -7014,14 +7014,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned62">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required62">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required62">
@@ -7053,9 +7053,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural62">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required62">
@@ -7129,14 +7129,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned63">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required63">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required63">
@@ -7168,9 +7168,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural63">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required63">
@@ -7244,14 +7244,14 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="paned64">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required64">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required64">
@@ -7283,9 +7283,9 @@ ABCD</property>
</child>
<child>
<object class="GtkPaned" id="natural64">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required64">
diff --git a/testsuite/reftests/label-sizing.ui b/testsuite/reftests/label-sizing.ui
index a4d07c7dee..ca5f21b548 100644
--- a/testsuite/reftests/label-sizing.ui
+++ b/testsuite/reftests/label-sizing.ui
@@ -91,14 +91,14 @@
</child>
<child>
<object class="GtkPaned" id="paned1">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required1">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required1">
@@ -126,9 +126,9 @@
</child>
<child>
<object class="GtkPaned" id="natural1">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required1">
@@ -198,14 +198,14 @@
</child>
<child>
<object class="GtkPaned" id="paned2">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required2">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required2">
@@ -235,9 +235,9 @@
</child>
<child>
<object class="GtkPaned" id="natural2">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required2">
@@ -309,14 +309,14 @@
</child>
<child>
<object class="GtkPaned" id="paned3">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required3">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required3">
@@ -346,9 +346,9 @@
</child>
<child>
<object class="GtkPaned" id="natural3">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required3">
@@ -420,14 +420,14 @@
</child>
<child>
<object class="GtkPaned" id="paned4">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required4">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required4">
@@ -459,9 +459,9 @@
</child>
<child>
<object class="GtkPaned" id="natural4">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required4">
@@ -535,14 +535,14 @@
</child>
<child>
<object class="GtkPaned" id="paned5">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required5">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required5">
@@ -572,9 +572,9 @@
</child>
<child>
<object class="GtkPaned" id="natural5">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required5">
@@ -646,14 +646,14 @@
</child>
<child>
<object class="GtkPaned" id="paned6">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required6">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required6">
@@ -685,9 +685,9 @@
</child>
<child>
<object class="GtkPaned" id="natural6">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required6">
@@ -761,14 +761,14 @@
</child>
<child>
<object class="GtkPaned" id="paned7">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required7">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required7">
@@ -800,9 +800,9 @@
</child>
<child>
<object class="GtkPaned" id="natural7">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required7">
@@ -876,14 +876,14 @@
</child>
<child>
<object class="GtkPaned" id="paned8">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required8">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required8">
@@ -917,9 +917,9 @@
</child>
<child>
<object class="GtkPaned" id="natural8">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required8">
@@ -995,14 +995,14 @@
</child>
<child>
<object class="GtkPaned" id="paned9">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required9">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required9">
@@ -1032,9 +1032,9 @@
</child>
<child>
<object class="GtkPaned" id="natural9">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required9">
@@ -1106,14 +1106,14 @@
</child>
<child>
<object class="GtkPaned" id="paned10">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required10">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required10">
@@ -1145,9 +1145,9 @@
</child>
<child>
<object class="GtkPaned" id="natural10">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required10">
@@ -1221,14 +1221,14 @@
</child>
<child>
<object class="GtkPaned" id="paned11">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required11">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required11">
@@ -1260,9 +1260,9 @@
</child>
<child>
<object class="GtkPaned" id="natural11">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required11">
@@ -1336,14 +1336,14 @@
</child>
<child>
<object class="GtkPaned" id="paned12">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required12">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required12">
@@ -1377,9 +1377,9 @@
</child>
<child>
<object class="GtkPaned" id="natural12">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required12">
@@ -1455,14 +1455,14 @@
</child>
<child>
<object class="GtkPaned" id="paned13">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required13">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required13">
@@ -1492,9 +1492,9 @@
</child>
<child>
<object class="GtkPaned" id="natural13">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required13">
@@ -1566,14 +1566,14 @@
</child>
<child>
<object class="GtkPaned" id="paned14">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required14">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required14">
@@ -1605,9 +1605,9 @@
</child>
<child>
<object class="GtkPaned" id="natural14">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required14">
@@ -1681,14 +1681,14 @@
</child>
<child>
<object class="GtkPaned" id="paned15">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required15">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required15">
@@ -1720,9 +1720,9 @@
</child>
<child>
<object class="GtkPaned" id="natural15">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required15">
@@ -1796,14 +1796,14 @@
</child>
<child>
<object class="GtkPaned" id="paned16">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required16">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required16">
@@ -1837,9 +1837,9 @@
</child>
<child>
<object class="GtkPaned" id="natural16">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required16">
@@ -1915,14 +1915,14 @@
</child>
<child>
<object class="GtkPaned" id="paned17">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required17">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required17">
@@ -1952,9 +1952,9 @@
</child>
<child>
<object class="GtkPaned" id="natural17">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required17">
@@ -2026,14 +2026,14 @@
</child>
<child>
<object class="GtkPaned" id="paned18">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required18">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required18">
@@ -2065,9 +2065,9 @@
</child>
<child>
<object class="GtkPaned" id="natural18">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required18">
@@ -2141,14 +2141,14 @@
</child>
<child>
<object class="GtkPaned" id="paned19">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required19">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required19">
@@ -2180,9 +2180,9 @@
</child>
<child>
<object class="GtkPaned" id="natural19">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required19">
@@ -2256,14 +2256,14 @@
</child>
<child>
<object class="GtkPaned" id="paned20">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required20">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required20">
@@ -2297,9 +2297,9 @@
</child>
<child>
<object class="GtkPaned" id="natural20">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required20">
@@ -2375,14 +2375,14 @@
</child>
<child>
<object class="GtkPaned" id="paned21">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required21">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required21">
@@ -2414,9 +2414,9 @@
</child>
<child>
<object class="GtkPaned" id="natural21">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required21">
@@ -2490,14 +2490,14 @@
</child>
<child>
<object class="GtkPaned" id="paned22">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required22">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required22">
@@ -2531,9 +2531,9 @@
</child>
<child>
<object class="GtkPaned" id="natural22">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required22">
@@ -2609,14 +2609,14 @@
</child>
<child>
<object class="GtkPaned" id="paned23">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required23">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required23">
@@ -2650,9 +2650,9 @@
</child>
<child>
<object class="GtkPaned" id="natural23">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required23">
@@ -2728,14 +2728,14 @@
</child>
<child>
<object class="GtkPaned" id="paned24">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required24">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required24">
@@ -2771,9 +2771,9 @@
</child>
<child>
<object class="GtkPaned" id="natural24">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required24">
@@ -2851,14 +2851,14 @@
</child>
<child>
<object class="GtkPaned" id="paned25">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required25">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required25">
@@ -2890,9 +2890,9 @@
</child>
<child>
<object class="GtkPaned" id="natural25">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required25">
@@ -2966,14 +2966,14 @@
</child>
<child>
<object class="GtkPaned" id="paned26">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required26">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required26">
@@ -3007,9 +3007,9 @@
</child>
<child>
<object class="GtkPaned" id="natural26">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required26">
@@ -3085,14 +3085,14 @@
</child>
<child>
<object class="GtkPaned" id="paned27">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required27">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required27">
@@ -3126,9 +3126,9 @@
</child>
<child>
<object class="GtkPaned" id="natural27">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required27">
@@ -3204,14 +3204,14 @@
</child>
<child>
<object class="GtkPaned" id="paned28">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required28">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required28">
@@ -3247,9 +3247,9 @@
</child>
<child>
<object class="GtkPaned" id="natural28">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required28">
@@ -3327,14 +3327,14 @@
</child>
<child>
<object class="GtkPaned" id="paned29">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required29">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required29">
@@ -3366,9 +3366,9 @@
</child>
<child>
<object class="GtkPaned" id="natural29">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required29">
@@ -3442,14 +3442,14 @@
</child>
<child>
<object class="GtkPaned" id="paned30">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required30">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required30">
@@ -3483,9 +3483,9 @@
</child>
<child>
<object class="GtkPaned" id="natural30">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required30">
@@ -3561,14 +3561,14 @@
</child>
<child>
<object class="GtkPaned" id="paned31">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required31">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required31">
@@ -3602,9 +3602,9 @@
</child>
<child>
<object class="GtkPaned" id="natural31">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required31">
@@ -3680,14 +3680,14 @@
</child>
<child>
<object class="GtkPaned" id="paned32">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required32">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required32">
@@ -3723,9 +3723,9 @@
</child>
<child>
<object class="GtkPaned" id="natural32">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required32">
@@ -3803,14 +3803,14 @@
</child>
<child>
<object class="GtkPaned" id="paned33">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required33">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required33">
@@ -3840,9 +3840,9 @@
</child>
<child>
<object class="GtkPaned" id="natural33">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required33">
@@ -3914,14 +3914,14 @@
</child>
<child>
<object class="GtkPaned" id="paned34">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required34">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required34">
@@ -3953,9 +3953,9 @@
</child>
<child>
<object class="GtkPaned" id="natural34">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required34">
@@ -4029,14 +4029,14 @@
</child>
<child>
<object class="GtkPaned" id="paned35">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required35">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required35">
@@ -4068,9 +4068,9 @@
</child>
<child>
<object class="GtkPaned" id="natural35">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required35">
@@ -4144,14 +4144,14 @@
</child>
<child>
<object class="GtkPaned" id="paned36">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required36">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required36">
@@ -4185,9 +4185,9 @@
</child>
<child>
<object class="GtkPaned" id="natural36">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required36">
@@ -4263,14 +4263,14 @@
</child>
<child>
<object class="GtkPaned" id="paned37">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required37">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required37">
@@ -4302,9 +4302,9 @@
</child>
<child>
<object class="GtkPaned" id="natural37">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required37">
@@ -4378,14 +4378,14 @@
</child>
<child>
<object class="GtkPaned" id="paned38">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required38">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required38">
@@ -4419,9 +4419,9 @@
</child>
<child>
<object class="GtkPaned" id="natural38">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required38">
@@ -4497,14 +4497,14 @@
</child>
<child>
<object class="GtkPaned" id="paned39">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required39">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required39">
@@ -4538,9 +4538,9 @@
</child>
<child>
<object class="GtkPaned" id="natural39">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required39">
@@ -4616,14 +4616,14 @@
</child>
<child>
<object class="GtkPaned" id="paned40">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required40">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required40">
@@ -4659,9 +4659,9 @@
</child>
<child>
<object class="GtkPaned" id="natural40">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required40">
@@ -4739,14 +4739,14 @@
</child>
<child>
<object class="GtkPaned" id="paned41">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required41">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required41">
@@ -4778,9 +4778,9 @@
</child>
<child>
<object class="GtkPaned" id="natural41">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required41">
@@ -4854,14 +4854,14 @@
</child>
<child>
<object class="GtkPaned" id="paned42">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required42">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required42">
@@ -4895,9 +4895,9 @@
</child>
<child>
<object class="GtkPaned" id="natural42">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required42">
@@ -4973,14 +4973,14 @@
</child>
<child>
<object class="GtkPaned" id="paned43">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required43">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required43">
@@ -5014,9 +5014,9 @@
</child>
<child>
<object class="GtkPaned" id="natural43">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required43">
@@ -5092,14 +5092,14 @@
</child>
<child>
<object class="GtkPaned" id="paned44">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required44">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required44">
@@ -5135,9 +5135,9 @@
</child>
<child>
<object class="GtkPaned" id="natural44">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required44">
@@ -5215,14 +5215,14 @@
</child>
<child>
<object class="GtkPaned" id="paned45">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required45">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required45">
@@ -5254,9 +5254,9 @@
</child>
<child>
<object class="GtkPaned" id="natural45">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required45">
@@ -5330,14 +5330,14 @@
</child>
<child>
<object class="GtkPaned" id="paned46">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required46">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required46">
@@ -5371,9 +5371,9 @@
</child>
<child>
<object class="GtkPaned" id="natural46">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required46">
@@ -5449,14 +5449,14 @@
</child>
<child>
<object class="GtkPaned" id="paned47">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required47">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required47">
@@ -5490,9 +5490,9 @@
</child>
<child>
<object class="GtkPaned" id="natural47">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required47">
@@ -5568,14 +5568,14 @@
</child>
<child>
<object class="GtkPaned" id="paned48">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required48">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required48">
@@ -5611,9 +5611,9 @@
</child>
<child>
<object class="GtkPaned" id="natural48">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required48">
@@ -5691,14 +5691,14 @@
</child>
<child>
<object class="GtkPaned" id="paned49">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required49">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required49">
@@ -5728,9 +5728,9 @@
</child>
<child>
<object class="GtkPaned" id="natural49">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required49">
@@ -5802,14 +5802,14 @@
</child>
<child>
<object class="GtkPaned" id="paned50">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required50">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required50">
@@ -5841,9 +5841,9 @@
</child>
<child>
<object class="GtkPaned" id="natural50">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required50">
@@ -5917,14 +5917,14 @@
</child>
<child>
<object class="GtkPaned" id="paned51">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required51">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required51">
@@ -5956,9 +5956,9 @@
</child>
<child>
<object class="GtkPaned" id="natural51">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required51">
@@ -6032,14 +6032,14 @@
</child>
<child>
<object class="GtkPaned" id="paned52">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required52">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required52">
@@ -6073,9 +6073,9 @@
</child>
<child>
<object class="GtkPaned" id="natural52">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required52">
@@ -6151,14 +6151,14 @@
</child>
<child>
<object class="GtkPaned" id="paned53">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required53">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required53">
@@ -6190,9 +6190,9 @@
</child>
<child>
<object class="GtkPaned" id="natural53">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required53">
@@ -6266,14 +6266,14 @@
</child>
<child>
<object class="GtkPaned" id="paned54">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required54">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required54">
@@ -6307,9 +6307,9 @@
</child>
<child>
<object class="GtkPaned" id="natural54">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required54">
@@ -6385,14 +6385,14 @@
</child>
<child>
<object class="GtkPaned" id="paned55">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required55">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required55">
@@ -6426,9 +6426,9 @@
</child>
<child>
<object class="GtkPaned" id="natural55">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required55">
@@ -6504,14 +6504,14 @@
</child>
<child>
<object class="GtkPaned" id="paned56">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required56">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required56">
@@ -6547,9 +6547,9 @@
</child>
<child>
<object class="GtkPaned" id="natural56">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required56">
@@ -6627,14 +6627,14 @@
</child>
<child>
<object class="GtkPaned" id="paned57">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required57">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required57">
@@ -6666,9 +6666,9 @@
</child>
<child>
<object class="GtkPaned" id="natural57">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required57">
@@ -6742,14 +6742,14 @@
</child>
<child>
<object class="GtkPaned" id="paned58">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required58">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required58">
@@ -6783,9 +6783,9 @@
</child>
<child>
<object class="GtkPaned" id="natural58">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required58">
@@ -6861,14 +6861,14 @@
</child>
<child>
<object class="GtkPaned" id="paned59">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required59">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required59">
@@ -6902,9 +6902,9 @@
</child>
<child>
<object class="GtkPaned" id="natural59">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required59">
@@ -6980,14 +6980,14 @@
</child>
<child>
<object class="GtkPaned" id="paned60">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required60">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required60">
@@ -7023,9 +7023,9 @@
</child>
<child>
<object class="GtkPaned" id="natural60">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required60">
@@ -7103,14 +7103,14 @@
</child>
<child>
<object class="GtkPaned" id="paned61">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required61">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required61">
@@ -7142,9 +7142,9 @@
</child>
<child>
<object class="GtkPaned" id="natural61">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required61">
@@ -7218,14 +7218,14 @@
</child>
<child>
<object class="GtkPaned" id="paned62">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required62">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required62">
@@ -7259,9 +7259,9 @@
</child>
<child>
<object class="GtkPaned" id="natural62">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required62">
@@ -7337,14 +7337,14 @@
</child>
<child>
<object class="GtkPaned" id="paned63">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required63">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required63">
@@ -7378,9 +7378,9 @@
</child>
<child>
<object class="GtkPaned" id="natural63">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required63">
@@ -7456,14 +7456,14 @@
</child>
<child>
<object class="GtkPaned" id="paned64">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<child>
<object class="GtkPaned" id="required64">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="required-required64">
@@ -7499,9 +7499,9 @@
</child>
<child>
<object class="GtkPaned" id="natural64">
- <property name="shrink-child2">0</property>
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-end-child">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="natural-required64">
diff --git a/testsuite/reftests/paned-undersized.ref.ui b/testsuite/reftests/paned-undersized.ref.ui
index 7687c14623..d7e0de7a9b 100644
--- a/testsuite/reftests/paned-undersized.ref.ui
+++ b/testsuite/reftests/paned-undersized.ref.ui
@@ -5,8 +5,8 @@
<property name="height_request">120</property>
<child>
<object class="GtkPaned" id="paned1">
- <property name="shrink-child1">0</property>
- <property name="resize-child1">0</property>
+ <property name="shrink-start-child">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<property name="position">10</property>
<child>
diff --git a/testsuite/reftests/paned-undersized.ui b/testsuite/reftests/paned-undersized.ui
index 14aa8a4f04..cf60449800 100644
--- a/testsuite/reftests/paned-undersized.ui
+++ b/testsuite/reftests/paned-undersized.ui
@@ -5,7 +5,7 @@
<property name="decorated">0</property>
<child>
<object class="GtkPaned" id="paned1">
- <property name="resize-child1">0</property>
+ <property name="resize-start-child">0</property>
<property name="orientation">vertical</property>
<property name="position">10</property>
<child>
View Lorry Controller Status