diff options
| author | Timm Bäder <mail@baedert.org> | 2017-04-21 18:59:59 +0200 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2017-04-25 20:30:37 +0200 |
| commit | 5729ea7744c2a41ae8fb833db6690a6aa5ad7a84 (patch) | |
| tree | ddda46f8b6c07a999ee9b844ec3a9c863b55a850 /gtk | |
| parent | 8f4c0bea6558dc98a2abd7e63436b1ce4caf689e (diff) | |
| download | gtk+-5729ea7744c2a41ae8fb833db6690a6aa5ad7a84.tar.gz | |
box: Remove expand child property
GtkWidget already has hexpand/vexpand properties.
Diffstat (limited to 'gtk')
50 files changed, 229 insertions, 461 deletions
diff --git a/gtk/gtkactionbar.c b/gtk/gtkactionbar.c index db76a66aca..a6aa7c79e1 100644 --- a/gtk/gtkactionbar.c +++ b/gtk/gtkactionbar.c @@ -412,7 +412,7 @@ gtk_action_bar_pack_start (GtkActionBar *action_bar, { GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (action_bar); - gtk_box_pack_start (GTK_BOX (priv->box), child, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (priv->box), child, TRUE); } /** @@ -431,7 +431,7 @@ gtk_action_bar_pack_end (GtkActionBar *action_bar, { GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (action_bar); - gtk_box_pack_end (GTK_BOX (priv->box), child, FALSE, TRUE); + gtk_box_pack_end (GTK_BOX (priv->box), child, TRUE); } /** diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c index c9077fd3c5..11d844f1de 100644 --- a/gtk/gtkappchooserdialog.c +++ b/gtk/gtkappchooserdialog.c @@ -347,7 +347,9 @@ construct_appchooser_widget (GtkAppChooserDialog *self) /* Need to build the appchooser widget after, because of the content-type construct-only property */ self->priv->app_chooser_widget = gtk_app_chooser_widget_new (self->priv->content_type); - gtk_box_pack_start (GTK_BOX (self->priv->inner_box), self->priv->app_chooser_widget, TRUE, TRUE); + gtk_widget_set_vexpand (self->priv->app_chooser_widget, TRUE); + gtk_box_pack_start (GTK_BOX (self->priv->inner_box), self->priv->app_chooser_widget, TRUE); + g_signal_connect (self->priv->app_chooser_widget, "application-selected", G_CALLBACK (widget_application_selected_cb), self); @@ -360,10 +362,10 @@ construct_appchooser_widget (GtkAppChooserDialog *self) /* Add the custom button to the new appchooser */ gtk_box_pack_start (GTK_BOX (self->priv->inner_box), - self->priv->show_more_button, FALSE, FALSE); + self->priv->show_more_button, FALSE); gtk_box_pack_start (GTK_BOX (self->priv->inner_box), - self->priv->software_button, FALSE, FALSE); + self->priv->software_button, FALSE); info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (self->priv->app_chooser_widget)); gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, info != NULL); diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c index 205a943512..184aa49c45 100644 --- a/gtk/gtkassistant.c +++ b/gtk/gtkassistant.c @@ -1727,14 +1727,14 @@ gtk_assistant_insert_page (GtkAssistant *assistant, priv->pages = g_list_insert (priv->pages, page_info, position); - gtk_box_pack_start (GTK_BOX (priv->sidebar), page_info->regular_title, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (priv->sidebar), page_info->current_title, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (priv->sidebar), page_info->regular_title, FALSE); + gtk_box_pack_start (GTK_BOX (priv->sidebar), page_info->current_title, FALSE); gtk_box_reorder_child (GTK_BOX (priv->sidebar), page_info->regular_title, 2 * position); gtk_box_reorder_child (GTK_BOX (priv->sidebar), page_info->current_title, 2 * position + 1); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_widget_show (box); - gtk_box_pack_start (GTK_BOX (box), page, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), page, TRUE); g_object_set (box, "margin", 12, NULL); g_signal_connect (box, "remove", G_CALLBACK (assistant_remove_page_cb), assistant); @@ -1837,7 +1837,7 @@ add_to_action_area (GtkAssistant *assistant, gtk_widget_set_valign (child, GTK_ALIGN_BASELINE); - gtk_box_pack_end (GTK_BOX (priv->action_area), child, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (priv->action_area), child, FALSE); } /** diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c index 0928956e22..cb849fd32c 100644 --- a/gtk/gtkbbox.c +++ b/gtk/gtkbbox.c @@ -145,7 +145,7 @@ static void gtk_button_box_add (GtkContainer *container, GtkWidget *widget) { - gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (container), widget, TRUE); } static void diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c index 71bac69591..34f57eb478 100644 --- a/gtk/gtkbox.c +++ b/gtk/gtkbox.c @@ -112,7 +112,6 @@ enum { enum { CHILD_PROP_0, - CHILD_PROP_EXPAND, CHILD_PROP_FILL, CHILD_PROP_PACK_TYPE, CHILD_PROP_POSITION, @@ -141,9 +140,6 @@ static GParamSpec *child_props[LAST_CHILD_PROP] = { NULL, }; * GtkBoxChild: * @widget: the child widget, packed into the GtkBox. * neighbors, set when packed, zero by default. - * @expand: flag indicates whether extra space should be given to this child. - * Any extra space given to the parent GtkBox is divided up among all children - * with this attribute set to %TRUE; set when packed, %TRUE by default. * @fill: flag indicates whether any extra space given to this child due to its * @expand attribute being set is actually allocated to the child, rather than * being used as padding around the widget; set when packed, %TRUE by default. @@ -154,7 +150,6 @@ struct _GtkBoxChild { GtkWidget *widget; - guint expand : 1; guint fill : 1; guint pack : 1; }; @@ -276,25 +271,6 @@ gtk_box_class_init (GtkBoxClass *class) g_object_class_install_properties (object_class, LAST_PROP, props); /** - * GtkBox:expand: - * - * Whether the child should receive extra space when the parent grows. - * - * Note that the #GtkWidget:halign, #GtkWidget:valign, #GtkWidget:hexpand - * and #GtkWidget:vexpand properties are the preferred way to influence - * child size allocation in containers. - * - * In contrast to #GtkWidget:hexpand, the expand child property does - * not cause the box to expand itself. - */ - child_props[CHILD_PROP_EXPAND] = - g_param_spec_boolean ("expand", - P_("Expand"), - P_("Whether the child should receive extra space when the parent grows"), - FALSE, - GTK_PARAM_READWRITE); - - /** * GtkBox:fill: * * Whether the child should receive extra space when the parent grows. @@ -437,7 +413,7 @@ count_expand_children (GtkBox *box, if (_gtk_widget_get_visible (child->widget)) { *visible_children += 1; - if (child->expand || gtk_widget_compute_expand (child->widget, private->orientation)) + if (gtk_widget_compute_expand (child->widget, private->orientation)) *expand_children += 1; } } @@ -616,7 +592,7 @@ gtk_box_size_allocate_no_center (GtkWidget *widget, { child_size = sizes[i].minimum_size; - if (child->expand || gtk_widget_compute_expand (child->widget, private->orientation)) + if (gtk_widget_compute_expand (child->widget, private->orientation)) { child_size += size_given_to_child; @@ -832,7 +808,7 @@ gtk_box_size_allocate_with_center (GtkWidget *widget, _gtk_widget_get_visible (child->widget)) { nvis[child->pack] += 1; - if (child->expand || gtk_widget_compute_expand (child->widget, priv->orientation)) + if (gtk_widget_compute_expand (child->widget, priv->orientation)) nexp[child->pack] += 1; } } @@ -889,7 +865,7 @@ gtk_box_size_allocate_with_center (GtkWidget *widget, } /* Determine size of center */ - if (priv->center->expand) + if (gtk_widget_compute_expand (priv->center->widget, priv->orientation)) center_size = MAX (box_size - 2 * MAX (nat_size[0], nat_size[1]), center_req.minimum_size); else center_size = MAX (MIN (center_req.natural_size, box_size - min_size[0] - min_size[1]), center_req.minimum_size); @@ -961,7 +937,7 @@ gtk_box_size_allocate_with_center (GtkWidget *widget, { child_size = sizes[packing][i].minimum_size; - if (child->expand || gtk_widget_compute_expand (child->widget, priv->orientation)) + if (gtk_widget_compute_expand (child->widget, priv->orientation)) { child_size += size_given_to_child[packing]; @@ -1211,36 +1187,25 @@ gtk_box_set_child_property (GtkContainer *container, const GValue *value, GParamSpec *pspec) { - gboolean expand = 0; gboolean fill = 0; GtkPackType pack_type = 0; if (property_id != CHILD_PROP_POSITION) gtk_box_query_child_packing (GTK_BOX (container), child, - &expand, &fill, &pack_type); switch (property_id) { - case CHILD_PROP_EXPAND: - gtk_box_set_child_packing (GTK_BOX (container), - child, - g_value_get_boolean (value), - fill, - pack_type); - break; case CHILD_PROP_FILL: gtk_box_set_child_packing (GTK_BOX (container), child, - expand, g_value_get_boolean (value), pack_type); break; case CHILD_PROP_PACK_TYPE: gtk_box_set_child_packing (GTK_BOX (container), child, - expand, fill, g_value_get_enum (value)); break; @@ -1262,7 +1227,6 @@ gtk_box_get_child_property (GtkContainer *container, GValue *value, GParamSpec *pspec) { - gboolean expand = FALSE; gboolean fill = FALSE; GtkPackType pack_type = 0; GList *list; @@ -1270,15 +1234,11 @@ gtk_box_get_child_property (GtkContainer *container, if (property_id != CHILD_PROP_POSITION) gtk_box_query_child_packing (GTK_BOX (container), child, - &expand, &fill, &pack_type); switch (property_id) { guint i; - case CHILD_PROP_EXPAND: - g_value_set_boolean (value, expand); - break; case CHILD_PROP_FILL: g_value_set_boolean (value, fill); break; @@ -1471,7 +1431,6 @@ gtk_box_direction_changed (GtkWidget *widget, static GtkBoxChild * gtk_box_pack (GtkBox *box, GtkWidget *child, - gboolean expand, gboolean fill, GtkPackType pack_type) { @@ -1485,7 +1444,6 @@ gtk_box_pack (GtkBox *box, child_info = g_new (GtkBoxChild, 1); child_info->widget = child; - child_info->expand = expand ? TRUE : FALSE; child_info->fill = fill ? TRUE : FALSE; child_info->pack = pack_type; @@ -1496,8 +1454,6 @@ gtk_box_pack (GtkBox *box, gtk_widget_set_parent (child, GTK_WIDGET (box)); - if (expand) - gtk_container_child_notify_by_pspec (container, child, child_props[CHILD_PROP_EXPAND]); if (!fill) gtk_container_child_notify_by_pspec (container, child, child_props[CHILD_PROP_FILL]); if (pack_type != GTK_PACK_START) @@ -1817,7 +1773,7 @@ gtk_box_compute_size_for_opposing_orientation (GtkBox *box, { child_size = sizes[i].minimum_size; - if (child->expand || gtk_widget_compute_expand (child->widget, private->orientation)) + if (gtk_widget_compute_expand (child->widget, private->orientation)) { child_size += size_given_to_child; @@ -2043,9 +1999,6 @@ gtk_box_new (GtkOrientation orientation, * gtk_box_pack_start: * @box: a #GtkBox * @child: the #GtkWidget to be added to @box - * @expand: %TRUE if the new child is to be given extra space allocated - * to @box. The extra space will be divided evenly between all children - * that use this option * @fill: %TRUE if space given to @child by the @expand option is * actually allocated to @child, rather than just padding it. This * parameter has no effect if @expand is set to %FALSE. A child is @@ -2059,19 +2012,15 @@ gtk_box_new (GtkOrientation orientation, void gtk_box_pack_start (GtkBox *box, GtkWidget *child, - gboolean expand, gboolean fill) { - gtk_box_pack (box, child, expand, fill, GTK_PACK_START); + gtk_box_pack (box, child, fill, GTK_PACK_START); } /** * gtk_box_pack_end: * @box: a #GtkBox * @child: the #GtkWidget to be added to @box - * @expand: %TRUE if the new child is to be given extra space allocated - * to @box. The extra space will be divided evenly between all children - * of @box that use this option * @fill: %TRUE if space given to @child by the @expand option is * actually allocated to @child, rather than just padding it. This * parameter has no effect if @expand is set to %FALSE. A child is @@ -2085,10 +2034,9 @@ gtk_box_pack_start (GtkBox *box, void gtk_box_pack_end (GtkBox *box, GtkWidget *child, - gboolean expand, gboolean fill) { - gtk_box_pack (box, child, expand, fill, GTK_PACK_END); + gtk_box_pack (box, child, fill, GTK_PACK_END); } /** @@ -2307,8 +2255,6 @@ gtk_box_reorder_child (GtkBox *box, * gtk_box_query_child_packing: * @box: a #GtkBox * @child: the #GtkWidget of the child to query - * @expand: (out) (optional): pointer to return location for expand child - * property * @fill: (out) (optional): pointer to return location for fill child * property * @pack_type: (out) (optional): pointer to return location for pack-type @@ -2319,7 +2265,6 @@ gtk_box_reorder_child (GtkBox *box, void gtk_box_query_child_packing (GtkBox *box, GtkWidget *child, - gboolean *expand, gboolean *fill, GtkPackType *pack_type) { @@ -2344,8 +2289,6 @@ gtk_box_query_child_packing (GtkBox *box, if (list) { - if (expand) - *expand = child_info->expand; if (fill) *fill = child_info->fill; if (pack_type) @@ -2357,7 +2300,6 @@ gtk_box_query_child_packing (GtkBox *box, * gtk_box_set_child_packing: * @box: a #GtkBox * @child: the #GtkWidget of the child to set - * @expand: the new value of the expand child property * @fill: the new value of the fill child property * @pack_type: the new value of the pack-type child property * @@ -2366,7 +2308,6 @@ gtk_box_query_child_packing (GtkBox *box, void gtk_box_set_child_packing (GtkBox *box, GtkWidget *child, - gboolean expand, gboolean fill, GtkPackType pack_type) { @@ -2392,14 +2333,6 @@ gtk_box_set_child_packing (GtkBox *box, gtk_widget_freeze_child_notify (child); if (list) { - expand = expand != FALSE; - - if (child_info->expand != expand) - { - child_info->expand = expand; - gtk_container_child_notify_by_pspec (GTK_CONTAINER (box), child, child_props[CHILD_PROP_EXPAND]); - } - fill = fill != FALSE; if (child_info->fill != fill) @@ -2429,7 +2362,6 @@ gtk_box_add (GtkContainer *container, GtkWidget *widget) { gtk_box_pack_start (GTK_BOX (container), widget, - FALSE, TRUE); } @@ -2570,7 +2502,7 @@ gtk_box_set_center_widget (GtkBox *box, } if (widget) - priv->center = gtk_box_pack (box, widget, FALSE, TRUE, GTK_PACK_START); + priv->center = gtk_box_pack (box, widget, TRUE, GTK_PACK_START); if (old_center) g_object_unref (old_center); diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h index b89812a531..af99839b48 100644 --- a/gtk/gtkbox.h +++ b/gtk/gtkbox.h @@ -83,12 +83,10 @@ GtkWidget* gtk_box_new (GtkOrientation orientation, GDK_AVAILABLE_IN_ALL void gtk_box_pack_start (GtkBox *box, GtkWidget *child, - gboolean expand, gboolean fill); GDK_AVAILABLE_IN_ALL void gtk_box_pack_end (GtkBox *box, GtkWidget *child, - gboolean expand, gboolean fill); GDK_AVAILABLE_IN_ALL @@ -115,13 +113,11 @@ void gtk_box_reorder_child (GtkBox *box, GDK_AVAILABLE_IN_ALL void gtk_box_query_child_packing (GtkBox *box, GtkWidget *child, - gboolean *expand, gboolean *fill, GtkPackType *pack_type); GDK_AVAILABLE_IN_ALL void gtk_box_set_child_packing (GtkBox *box, GtkWidget *child, - gboolean expand, gboolean fill, GtkPackType pack_type); diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c index 712e8feaa1..259a6aeee8 100644 --- a/gtk/gtkcolorchooserwidget.c +++ b/gtk/gtkcolorchooserwidget.c @@ -535,12 +535,12 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc) cc->priv->custom = box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); g_object_set (box, "margin-top", 12, NULL); - gtk_box_pack_end (GTK_BOX (cc->priv->palette), box, FALSE, TRUE); + gtk_box_pack_end (GTK_BOX (cc->priv->palette), box, FALSE); /* translators: label for the custom section in the color chooser */ cc->priv->custom_label = label = gtk_label_new (_("Custom")); gtk_widget_set_halign (label, GTK_ALIGN_START); - gtk_box_pack_end (GTK_BOX (cc->priv->palette), label, FALSE, TRUE); + gtk_box_pack_end (GTK_BOX (cc->priv->palette), label, FALSE); cc->priv->button = button = gtk_color_swatch_new (); gtk_widget_set_name (button, "add-color-button"); diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c index 54c25b22c6..a64d5cf129 100644 --- a/gtk/gtkcombobox.c +++ b/gtk/gtkcombobox.c @@ -1315,7 +1315,8 @@ gtk_combo_box_add (GtkContainer *container, priv->cell_view = NULL; } - gtk_box_pack_start (GTK_BOX (priv->box), widget, TRUE, TRUE); + gtk_widget_set_hexpand (widget, TRUE); + gtk_container_add (GTK_CONTAINER (priv->box), widget); _gtk_bin_set_child (GTK_BIN (container), widget); if (priv->has_entry) diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c index 9bfa7be0ab..cc9e42f162 100644 --- a/gtk/gtkcustompaperunixdialog.c +++ b/gtk/gtkcustompaperunixdialog.c @@ -555,7 +555,7 @@ new_unit_widget (GtkCustomPaperUnixDialog *dialog, else gtk_spin_button_set_digits (GTK_SPIN_BUTTON (button), 1); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); gtk_widget_show (button); data->spin_button = button; @@ -569,7 +569,7 @@ new_unit_widget (GtkCustomPaperUnixDialog *dialog, label = gtk_label_new (_("mm")); gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE); gtk_widget_show (label); gtk_label_set_mnemonic_widget (GTK_LABEL (mnemonic_label), button); @@ -979,13 +979,13 @@ wrap_in_frame (const gchar *label, g_free (bold_text); frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); - gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE); gtk_widget_set_margin_start (child, 12); gtk_widget_set_halign (child, GTK_ALIGN_FILL); gtk_widget_set_valign (child, GTK_ALIGN_FILL); - gtk_box_pack_start (GTK_BOX (frame), child, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (frame), child, FALSE); gtk_widget_show (frame); @@ -1036,11 +1036,11 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 18); - gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE); gtk_widget_show (hbox); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE); gtk_widget_show (vbox); scrolled = gtk_scrolled_window_new (NULL, NULL); @@ -1048,7 +1048,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled), GTK_SHADOW_IN); - gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE); gtk_widget_show (scrolled); treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (priv->custom_paper_list)); @@ -1079,7 +1079,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) context = gtk_widget_get_style_context (toolbar); gtk_style_context_add_class (context, GTK_STYLE_CLASS_INLINE_TOOLBAR); - gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE); gtk_widget_show (toolbar); icon = g_themed_icon_new_with_default_fallbacks ("list-add-symbolic"); @@ -1098,7 +1098,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18); priv->values_box = vbox; - gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE); gtk_widget_show (vbox); grid = gtk_grid_new (); @@ -1130,7 +1130,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) frame = wrap_in_frame (_("Paper Size"), grid); gtk_widget_show (grid); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); gtk_widget_show (frame); grid = gtk_grid_new (); @@ -1203,7 +1203,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) NULL, NULL); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); - gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE); gtk_widget_show (combo); g_signal_connect_swapped (combo, "changed", @@ -1211,7 +1211,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog) frame = wrap_in_frame (_("Paper Margins"), grid); gtk_widget_show (grid); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); gtk_widget_show (frame); update_custom_widgets_from_list (dialog); diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c index 15b097691e..803fc53c43 100644 --- a/gtk/gtkentrycompletion.c +++ b/gtk/gtkentrycompletion.c @@ -629,8 +629,9 @@ gtk_entry_completion_constructed (GObject *object) gtk_container_add (GTK_CONTAINER (popup_frame), priv->vbox); gtk_container_add (GTK_CONTAINER (priv->scrolled_window), priv->tree_view); - gtk_box_pack_start (GTK_BOX (priv->vbox), priv->scrolled_window, - TRUE, TRUE); + gtk_widget_set_hexpand (priv->scrolled_window, TRUE); + gtk_widget_set_vexpand (priv->scrolled_window, TRUE); + gtk_container_add (GTK_CONTAINER (priv->vbox), priv->scrolled_window); /* we don't want to see the action treeview when no actions have * been inserted, so we pack the action treeview after the first @@ -1323,7 +1324,7 @@ gtk_entry_completion_insert_action (GtkEntryCompletion *completion, gtk_tree_path_free (path); gtk_box_pack_start (GTK_BOX (completion->priv->vbox), - completion->priv->action_view, FALSE, FALSE); + completion->priv->action_view, FALSE); gtk_widget_show (completion->priv->action_view); } } diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c index 6524503224..3bc7aad03f 100644 --- a/gtk/gtkfilechooserwidget.c +++ b/gtk/gtkfilechooserwidget.c @@ -926,7 +926,7 @@ update_preview_widget_visibility (GtkFileChooserWidget *impl) if (!priv->preview_label) { priv->preview_label = gtk_label_new (priv->preview_display_name); - gtk_box_pack_start (GTK_BOX (priv->preview_box), priv->preview_label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (priv->preview_box), priv->preview_label, FALSE); gtk_box_reorder_child (GTK_BOX (priv->preview_box), priv->preview_label, 0); gtk_label_set_ellipsize (GTK_LABEL (priv->preview_label), PANGO_ELLIPSIZE_MIDDLE); gtk_widget_show (priv->preview_label); @@ -967,7 +967,7 @@ set_preview_widget (GtkFileChooserWidget *impl, if (priv->preview_widget) { gtk_widget_show (priv->preview_widget); - gtk_box_pack_start (GTK_BOX (priv->preview_box), priv->preview_widget, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (priv->preview_box), priv->preview_widget, TRUE); gtk_box_reorder_child (GTK_BOX (priv->preview_box), priv->preview_widget, (priv->use_preview_label && priv->preview_label) ? 1 : 0); @@ -2687,7 +2687,7 @@ save_widgets_create (GtkFileChooserWidget *impl) gtk_style_context_add_class (gtk_widget_get_style_context (vbox), "search-bar"); priv->save_widgets_table = gtk_grid_new (); - gtk_box_pack_start (GTK_BOX (vbox), priv->save_widgets_table, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), priv->save_widgets_table, FALSE); gtk_grid_set_row_spacing (GTK_GRID (priv->save_widgets_table), 12); gtk_grid_set_column_spacing (GTK_GRID (priv->save_widgets_table), 12); @@ -2707,7 +2707,7 @@ save_widgets_create (GtkFileChooserWidget *impl) gtk_label_set_mnemonic_widget (GTK_LABEL (widget), priv->location_entry); priv->save_widgets = vbox; - gtk_box_pack_start (GTK_BOX (impl), priv->save_widgets, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (impl), priv->save_widgets, FALSE); gtk_box_reorder_child (GTK_BOX (impl), priv->save_widgets, 0); gtk_widget_show (priv->save_widgets); } @@ -2774,7 +2774,7 @@ location_switch_to_filename_entry (GtkFileChooserWidget *impl) if (!priv->location_entry) { location_entry_create (impl); - gtk_box_pack_start (GTK_BOX (priv->location_entry_box), priv->location_entry, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (priv->location_entry_box), priv->location_entry, TRUE); } _gtk_file_chooser_entry_set_base_folder (GTK_FILE_CHOOSER_ENTRY (priv->location_entry), priv->current_folder); diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c index 1f3130ace5..4473d41db5 100644 --- a/gtk/gtkheaderbar.c +++ b/gtk/gtkheaderbar.c @@ -140,7 +140,7 @@ init_sizing_box (GtkHeaderBar *bar) w = gtk_label_new (NULL); context = gtk_widget_get_style_context (w); gtk_style_context_add_class (context, GTK_STYLE_CLASS_TITLE); - gtk_box_pack_start (GTK_BOX (priv->label_sizing_box), w, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (priv->label_sizing_box), w, FALSE); gtk_label_set_line_wrap (GTK_LABEL (w), FALSE); gtk_label_set_single_line_mode (GTK_LABEL (w), TRUE); gtk_label_set_ellipsize (GTK_LABEL (w), PANGO_ELLIPSIZE_END); @@ -149,7 +149,7 @@ init_sizing_box (GtkHeaderBar *bar) w = gtk_label_new (NULL); context = gtk_widget_get_style_context (w); gtk_style_context_add_class (context, GTK_STYLE_CLASS_SUBTITLE); - gtk_box_pack_start (GTK_BOX (priv->label_sizing_box), w, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (priv->label_sizing_box), w, FALSE); gtk_label_set_line_wrap (GTK_LABEL (w), FALSE); gtk_label_set_single_line_mode (GTK_LABEL (w), TRUE); gtk_label_set_ellipsize (GTK_LABEL (w), PANGO_ELLIPSIZE_END); @@ -177,7 +177,7 @@ create_title_box (const char *title, gtk_label_set_line_wrap (GTK_LABEL (title_label), FALSE); gtk_label_set_single_line_mode (GTK_LABEL (title_label), TRUE); gtk_label_set_ellipsize (GTK_LABEL (title_label), PANGO_ELLIPSIZE_END); - gtk_box_pack_start (GTK_BOX (label_box), title_label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (label_box), title_label, FALSE); gtk_label_set_width_chars (GTK_LABEL (title_label), MIN_TITLE_CHARS); subtitle_label = gtk_label_new (subtitle); @@ -186,7 +186,7 @@ create_title_box (const char *title, gtk_label_set_line_wrap (GTK_LABEL (subtitle_label), FALSE); gtk_label_set_single_line_mode (GTK_LABEL (subtitle_label), TRUE); gtk_label_set_ellipsize (GTK_LABEL (subtitle_label), PANGO_ELLIPSIZE_END); - gtk_box_pack_start (GTK_BOX (label_box), subtitle_label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (label_box), subtitle_label, FALSE); gtk_widget_set_visible (subtitle_label, subtitle && subtitle[0]); if (ret_title_label) @@ -441,7 +441,7 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar) if (button) { - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), button, FALSE); n_children ++; } } @@ -456,7 +456,7 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar) continue; } - gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), separator, FALSE); if (i == 1) gtk_box_reorder_child (GTK_BOX (box), separator, 0); diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c index 62efc95734..97b601c919 100644 --- a/gtk/gtkinfobar.c +++ b/gtk/gtkinfobar.c @@ -519,7 +519,7 @@ gtk_info_bar_add_action_widget (GtkInfoBar *info_bar, g_warning ("Only 'activatable' widgets can be packed into the action area of a GtkInfoBar"); gtk_box_pack_end (GTK_BOX (info_bar->priv->action_area), - child, FALSE, FALSE); + child, FALSE); if (response_id == GTK_RESPONSE_HELP) gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (info_bar->priv->action_area), child, TRUE); diff --git a/gtk/gtkmenusectionbox.c b/gtk/gtkmenusectionbox.c index 4d863673d7..9dda6a9085 100644 --- a/gtk/gtkmenusectionbox.c +++ b/gtk/gtkmenusectionbox.c @@ -134,7 +134,7 @@ gtk_menu_section_box_sync_separators (GtkMenuSectionBox *box, return; if (should_have_separator) - gtk_box_pack_start (GTK_BOX (box), box->separator, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), box->separator, FALSE); else gtk_container_remove (GTK_CONTAINER (box), box->separator); } @@ -326,10 +326,7 @@ gtk_menu_section_box_insert_func (GtkMenuTrackerItem *item, g_object_set_data_full (G_OBJECT (widget), "GtkMenuTrackerItem", g_object_ref (item), g_object_unref); gtk_widget_set_halign (widget, GTK_ALIGN_FILL); - if (box->iconic) - gtk_box_pack_start (GTK_BOX (box->item_box), widget, TRUE, TRUE); - else - gtk_container_add (GTK_CONTAINER (box->item_box), widget); + gtk_container_add (GTK_CONTAINER (box->item_box), widget); gtk_box_reorder_child (GTK_BOX (box->item_box), widget, position); gtk_menu_section_box_schedule_separator_sync (box); @@ -346,7 +343,7 @@ gtk_menu_section_box_init (GtkMenuSectionBox *box) item_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); box->item_box = GTK_BOX (item_box); - gtk_box_pack_end (GTK_BOX (box), item_box, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (box), item_box, FALSE); gtk_widget_set_halign (GTK_WIDGET (item_box), GTK_ALIGN_FILL); gtk_widget_set_halign (GTK_WIDGET (box), GTK_ALIGN_FILL); @@ -454,7 +451,7 @@ gtk_menu_section_box_new_submenu (GtkMenuTrackerItem *item, g_object_set_data (G_OBJECT (button), "focus", focus); g_object_set_data (G_OBJECT (focus), "focus", button); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), button, FALSE); g_signal_connect (focus, "clicked", G_CALLBACK (open_submenu), item); g_signal_connect (button, "clicked", G_CALLBACK (close_submenu), item); @@ -487,6 +484,7 @@ gtk_menu_section_box_new_section (GtkMenuTrackerItem *item, if (hint && g_str_equal (hint, "horizontal-buttons")) { + gtk_box_set_homogeneous (box->item_box, TRUE); gtk_orientable_set_orientation (GTK_ORIENTABLE (box->item_box), GTK_ORIENTATION_HORIZONTAL); gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (box->item_box)), GTK_STYLE_CLASS_LINKED); box->iconic = TRUE; @@ -514,17 +512,17 @@ gtk_menu_section_box_new_section (GtkMenuTrackerItem *item, separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); gtk_widget_set_valign (separator, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (box->separator), separator, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box->separator), separator, TRUE); title = gtk_label_new (label); g_object_bind_property (item, "label", title, "label", G_BINDING_SYNC_CREATE); gtk_style_context_add_class (gtk_widget_get_style_context (title), GTK_STYLE_CLASS_SEPARATOR); gtk_widget_set_halign (title, GTK_ALIGN_START); - gtk_box_pack_start (GTK_BOX (box->separator), title, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box->separator), title, FALSE); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); gtk_widget_set_valign (separator, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (box->separator), separator, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box->separator), separator, TRUE); } else { diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c index 4f498c57a6..05509ff5a9 100644 --- a/gtk/gtkmenutoolbutton.c +++ b/gtk/gtkmenutoolbutton.c @@ -141,7 +141,7 @@ gtk_menu_tool_button_construct_contents (GtkMenuToolButton *button) gtk_container_remove (GTK_CONTAINER (parent), priv->arrow_button); gtk_box_pack_end (GTK_BOX (box), priv->arrow_button, - FALSE, FALSE); + FALSE); g_object_unref (priv->arrow_button); } @@ -286,7 +286,7 @@ gtk_menu_tool_button_init (GtkMenuToolButton *button) arrow_button = gtk_menu_button_new (); gtk_box_pack_end (GTK_BOX (box), arrow_button, - FALSE, FALSE); + FALSE); /* the arrow button is insentive until we set a menu */ gtk_widget_set_sensitive (arrow_button, FALSE); diff --git a/gtk/gtkmodelmenuitem.c b/gtk/gtkmodelmenuitem.c index 7e2d12e38b..888bc8e42e 100644 --- a/gtk/gtkmodelmenuitem.c +++ b/gtk/gtkmodelmenuitem.c @@ -180,7 +180,7 @@ gtk_model_menu_item_set_icon (GtkModelMenuItem *item, /* Reparent the child without destroying it */ g_object_ref (child); gtk_container_remove (GTK_CONTAINER (item), child); - gtk_box_pack_end (GTK_BOX (box), child, TRUE, TRUE); + gtk_box_pack_end (GTK_BOX (box), child, TRUE); g_object_unref (child); gtk_container_add (GTK_CONTAINER (item), box); @@ -200,7 +200,7 @@ gtk_model_menu_item_set_icon (GtkModelMenuItem *item, image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU); gtk_image_set_pixel_size (GTK_IMAGE (image), 16); - gtk_box_pack_start (GTK_BOX (child), image, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (child), image, FALSE); } g_object_notify (G_OBJECT (item), "icon"); diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c index e9cd056d7b..1ddaa1929b 100644 --- a/gtk/gtkmountoperation.c +++ b/gtk/gtkmountoperation.c @@ -547,17 +547,17 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, /* Build contents */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); - gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE); icon = gtk_image_new_from_icon_name ("dialog-password", GTK_ICON_SIZE_DIALOG); gtk_widget_set_halign (icon, GTK_ALIGN_CENTER); gtk_widget_set_valign (icon, GTK_ALIGN_START); - gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE); main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18); - gtk_box_pack_start (GTK_BOX (hbox), main_vbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), main_vbox, TRUE); secondary = strstr (message, "\n"); if (secondary != NULL) @@ -574,7 +574,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (label), - FALSE, TRUE); + TRUE); g_free (primary); attrs = pango_attr_list_new (); pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD)); @@ -588,7 +588,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, gtk_widget_set_valign (label, GTK_ALIGN_CENTER); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (label), - FALSE, FALSE); + FALSE); } grid = gtk_grid_new (); @@ -596,7 +596,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, gtk_grid_set_row_spacing (GTK_GRID (grid), 12); gtk_grid_set_column_spacing (GTK_GRID (grid), 12); gtk_widget_set_margin_bottom (grid, 12); - gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE); can_anonymous = priv->ask_flags & G_ASK_PASSWORD_ANONYMOUS_SUPPORTED; @@ -621,7 +621,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, choice = gtk_radio_button_new_with_mnemonic (NULL, _("_Anonymous")); gtk_box_pack_start (GTK_BOX (anon_box), choice, - FALSE, FALSE); + FALSE); g_signal_connect (choice, "toggled", G_CALLBACK (pw_dialog_anonymous_toggled), operation); priv->anonymous_toggle = choice; @@ -630,7 +630,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, choice = gtk_radio_button_new_with_mnemonic (group, _("Registered U_ser")); gtk_box_pack_start (GTK_BOX (anon_box), choice, - FALSE, FALSE); + FALSE); g_signal_connect (choice, "toggled", G_CALLBACK (pw_dialog_anonymous_toggled), operation); } @@ -678,7 +678,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, GINT_TO_POINTER (G_PASSWORD_SAVE_NEVER)); g_signal_connect (choice, "toggled", G_CALLBACK (remember_button_toggled), operation); - gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE); group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (choice)); choice = gtk_radio_button_new_with_mnemonic (group, _("Remember password until you _logout")); @@ -688,7 +688,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, GINT_TO_POINTER (G_PASSWORD_SAVE_FOR_SESSION)); g_signal_connect (choice, "toggled", G_CALLBACK (remember_button_toggled), operation); - gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE); group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (choice)); choice = gtk_radio_button_new_with_mnemonic (group, _("Remember _forever")); @@ -698,7 +698,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation, GINT_TO_POINTER (G_PASSWORD_SAVE_PERMANENTLY)); g_signal_connect (choice, "toggled", G_CALLBACK (remember_button_toggled), operation); - gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE); } g_signal_connect (G_OBJECT (dialog), "response", @@ -1403,7 +1403,7 @@ create_show_processes_dialog (GtkMountOperation *op, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); - gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE); if (secondary != NULL) s = g_strdup_printf ("<big><b>%s</b></big>\n\n%s", primary, secondary); @@ -1414,7 +1414,7 @@ create_show_processes_dialog (GtkMountOperation *op, label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), s); g_free (s); - gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), label, TRUE); /* First count the items in the list then * add the buttons in reverse order */ @@ -1466,7 +1466,7 @@ create_show_processes_dialog (GtkMountOperation *op, gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN); gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view); - gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE); g_signal_connect (tree_view, "popup-menu", G_CALLBACK (on_popup_menu_for_process_tree_view), diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c index 9843d11110..fe0d22874c 100644 --- a/gtk/gtkpathbar.c +++ b/gtk/gtkpathbar.c @@ -1486,8 +1486,8 @@ make_directory_button (GtkPathBar *path_bar, button_data->image = gtk_image_new (); button_data->label = gtk_label_new (NULL); child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (child), button_data->image, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (child), button_data->label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (child), button_data->image, FALSE); + gtk_box_pack_start (GTK_BOX (child), button_data->label, FALSE); break; case NORMAL_BUTTON: default: diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c index 5440fd6ba9..0c850a0279 100644 --- a/gtk/gtkprintbackend.c +++ b/gtk/gtkprintbackend.c @@ -789,12 +789,12 @@ request_password (GtkPrintBackend *backend, /* Packing */ content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); - gtk_box_pack_start (GTK_BOX (content_area), main_box, TRUE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), main_box, FALSE); - gtk_box_pack_start (GTK_BOX (main_box), icon, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (main_box), vbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (main_box), icon, FALSE); + gtk_box_pack_start (GTK_BOX (main_box), vbox, FALSE); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), label, TRUE); /* Right - 2. */ for (i = 0; i < length; i++) @@ -820,10 +820,10 @@ request_password (GtkPrintBackend *backend, gtk_entry_set_visibility (GTK_ENTRY (entry), ai_visible[i]); gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); - gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), box, TRUE); - gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), label, TRUE); + gtk_box_pack_start (GTK_BOX (box), entry, TRUE); g_signal_connect (entry, "changed", G_CALLBACK (store_entry), &(priv->auth_info[i])); @@ -836,7 +836,7 @@ request_password (GtkPrintBackend *backend, gtk_widget_set_margin_top (chkbtn, 6); gtk_widget_set_margin_bottom (chkbtn, 6); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chkbtn), FALSE); - gtk_box_pack_start (GTK_BOX (vbox), chkbtn, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), chkbtn, FALSE); g_signal_connect (chkbtn, "toggled", G_CALLBACK (store_auth_info_toggled), &(priv->store_auth_info)); diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c index e270dfabe2..b0a502d7e6 100644 --- a/gtk/gtkprinteroptionwidget.c +++ b/gtk/gtkprinteroptionwidget.c @@ -737,7 +737,7 @@ alternative_append (GtkWidget *box, button = gtk_radio_button_new_with_label (group, label); gtk_widget_show (button); gtk_widget_set_valign (button, GTK_ALIGN_BASELINE); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), button, FALSE); g_object_set_data (G_OBJECT (button), "value", (gpointer)value); g_signal_connect (button, "toggled", @@ -768,7 +768,7 @@ construct_widgets (GtkPrinterOptionWidget *widget) gtk_combo_box_set_active (GTK_COMBO_BOX (priv->combo), 0); gtk_widget_set_sensitive (GTK_WIDGET (widget), FALSE); gtk_widget_show (priv->combo); - gtk_box_pack_start (GTK_BOX (widget), priv->combo, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (widget), priv->combo, TRUE); } else switch (source->type) { @@ -776,7 +776,7 @@ construct_widgets (GtkPrinterOptionWidget *widget) priv->check = gtk_check_button_new_with_mnemonic (source->display_text); g_signal_connect (priv->check, "toggled", G_CALLBACK (check_toggled_cb), widget); gtk_widget_show (priv->check); - gtk_box_pack_start (GTK_BOX (widget), priv->check, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (widget), priv->check, TRUE); break; case GTK_PRINTER_OPTION_TYPE_PICKONE: case GTK_PRINTER_OPTION_TYPE_PICKONE_PASSWORD: @@ -808,7 +808,7 @@ construct_widgets (GtkPrinterOptionWidget *widget) source->choices_display[i], source->choices[i]); gtk_widget_show (priv->combo); - gtk_box_pack_start (GTK_BOX (widget), priv->combo, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (widget), priv->combo, TRUE); g_signal_connect (priv->combo, "changed", G_CALLBACK (combo_changed_cb), widget); text = g_strdup_printf ("%s:", source->display_text); @@ -822,7 +822,7 @@ construct_widgets (GtkPrinterOptionWidget *widget) priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); gtk_widget_set_valign (priv->box, GTK_ALIGN_BASELINE); gtk_widget_show (priv->box); - gtk_box_pack_start (GTK_BOX (widget), priv->box, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (widget), priv->box, TRUE); for (i = 0; i < source->num_choices; i++) { group = alternative_append (priv->box, @@ -850,7 +850,7 @@ construct_widgets (GtkPrinterOptionWidget *widget) gtk_entry_set_activates_default (GTK_ENTRY (priv->entry), gtk_printer_option_get_activates_default (source)); gtk_widget_show (priv->entry); - gtk_box_pack_start (GTK_BOX (widget), priv->entry, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (widget), priv->entry, TRUE); g_signal_connect (priv->entry, "changed", G_CALLBACK (entry_changed_cb), widget); text = g_strdup_printf ("%s:", source->display_text); @@ -863,7 +863,7 @@ construct_widgets (GtkPrinterOptionWidget *widget) case GTK_PRINTER_OPTION_TYPE_FILESAVE: priv->button = gtk_button_new (); gtk_widget_show (priv->button); - gtk_box_pack_start (GTK_BOX (widget), priv->button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (widget), priv->button, TRUE); g_signal_connect (priv->button, "clicked", G_CALLBACK (filesave_choose_cb), widget); text = g_strdup_printf ("%s:", source->display_text); @@ -877,7 +877,7 @@ construct_widgets (GtkPrinterOptionWidget *widget) priv->info_label = gtk_label_new (NULL); gtk_label_set_selectable (GTK_LABEL (priv->info_label), TRUE); gtk_widget_show (priv->info_label); - gtk_box_pack_start (GTK_BOX (widget), priv->info_label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (widget), priv->info_label, TRUE); text = g_strdup_printf ("%s:", source->display_text); priv->label = gtk_label_new_with_mnemonic (text); @@ -891,7 +891,7 @@ construct_widgets (GtkPrinterOptionWidget *widget) } priv->image = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_MENU); - gtk_box_pack_start (GTK_BOX (widget), priv->image, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (widget), priv->image, FALSE); } /* diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c index 3618e7b1e9..2c014d4b40 100644 --- a/gtk/gtkprintunixdialog.c +++ b/gtk/gtkprintunixdialog.c @@ -1306,13 +1306,13 @@ wrap_in_frame (const gchar *label, g_free (bold_text); frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); - gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE); gtk_widget_set_margin_start (child, 12); gtk_widget_set_halign (child, GTK_ALIGN_FILL); gtk_widget_set_valign (child, GTK_ALIGN_FILL); - gtk_box_pack_start (GTK_BOX (frame), child, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (frame), child, FALSE); gtk_widget_show (frame); @@ -1357,14 +1357,14 @@ add_option_to_extension_point (GtkPrinterOption *option, hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); gtk_widget_set_valign (hbox, GTK_ALIGN_BASELINE); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE); gtk_widget_show (hbox); - gtk_box_pack_start (GTK_BOX (extension_point), hbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (extension_point), hbox, TRUE); } else - gtk_box_pack_start (GTK_BOX (extension_point), widget, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (extension_point), widget, TRUE); } static gint @@ -1643,7 +1643,7 @@ update_dialog_from_settings (GtkPrintUnixDialog *dialog) gtk_widget_show (frame); gtk_box_pack_start (GTK_BOX (priv->advanced_vbox), - frame, FALSE, FALSE); + frame, FALSE); } } diff --git a/gtk/gtkrecentchooserdialog.c b/gtk/gtkrecentchooserdialog.c index d53c554e4d..2cbcc531e4 100644 --- a/gtk/gtkrecentchooserdialog.c +++ b/gtk/gtkrecentchooserdialog.c @@ -206,7 +206,7 @@ gtk_recent_chooser_dialog_constructed (GObject *object) content_area = gtk_dialog_get_content_area (GTK_DIALOG (object)); gtk_box_pack_start (GTK_BOX (content_area), - priv->chooser, TRUE, TRUE); + priv->chooser, TRUE); _gtk_recent_chooser_set_delegate (GTK_RECENT_CHOOSER (object), GTK_RECENT_CHOOSER (priv->chooser)); diff --git a/gtk/gtkshortcutssection.c b/gtk/gtkshortcutssection.c index ac2abc15f0..b14a76b5fd 100644 --- a/gtk/gtkshortcutssection.c +++ b/gtk/gtkshortcutssection.c @@ -458,7 +458,7 @@ gtk_shortcuts_section_init (GtkShortcutsSection *self) gtk_widget_set_hexpand (GTK_WIDGET (self->switcher), TRUE); gtk_widget_set_halign (GTK_WIDGET (self->switcher), GTK_ALIGN_CENTER); gtk_container_add (GTK_CONTAINER (self->footer), GTK_WIDGET (self->switcher)); - gtk_box_pack_end (GTK_BOX (self->footer), self->show_all, TRUE, TRUE); + gtk_box_pack_end (GTK_BOX (self->footer), self->show_all, TRUE); gtk_widget_set_halign (self->show_all, GTK_ALIGN_END); self->pan_gesture = gtk_gesture_pan_new (GTK_WIDGET (self->stack), GTK_ORIENTATION_HORIZONTAL); diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c index c8f8e4366f..6872f4b554 100644 --- a/gtk/gtktoolbutton.c +++ b/gtk/gtktoolbutton.c @@ -518,8 +518,8 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item) else box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL,0); if (icon) - gtk_box_pack_start (GTK_BOX (box), icon, TRUE, TRUE); - gtk_box_pack_end (GTK_BOX (box), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box), icon, TRUE); + gtk_box_pack_end (GTK_BOX (box), label, TRUE); gtk_container_add (GTK_CONTAINER (button->priv->button), box); gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "image-button"); gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "text-button"); @@ -530,17 +530,17 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item) { box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); if (icon) - gtk_box_pack_start (GTK_BOX (box), icon, label? FALSE : TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), icon, TRUE); if (label) - gtk_box_pack_end (GTK_BOX (box), label, TRUE, TRUE); + gtk_box_pack_end (GTK_BOX (box), label, TRUE); } else { box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); if (icon) - gtk_box_pack_end (GTK_BOX (box), icon, label ? FALSE : TRUE, TRUE); + gtk_box_pack_end (GTK_BOX (box), icon, TRUE); if (label) - gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), label, TRUE); } gtk_container_add (GTK_CONTAINER (button->priv->button), box); gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "image-button"); diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c index 2e2d2a13fd..df023db845 100644 --- a/gtk/gtktreeviewcolumn.c +++ b/gtk/gtktreeviewcolumn.c @@ -849,13 +849,13 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column) if (priv->xalign <= 0.5) { - gtk_box_pack_start (GTK_BOX (hbox), priv->frame, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (hbox), priv->arrow, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), priv->frame, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), priv->arrow, FALSE); } else { - gtk_box_pack_start (GTK_BOX (hbox), priv->arrow, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (hbox), priv->frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), priv->arrow, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), priv->frame, TRUE); } gtk_container_add (GTK_CONTAINER (priv->frame), child); diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c index 6a7bd4e3a0..1f1ac64a46 100644 --- a/gtk/inspector/general.c +++ b/gtk/inspector/general.c @@ -138,13 +138,13 @@ add_check_row (GtkInspectorGeneral *gen, gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), label, FALSE); check = gtk_image_new_from_icon_name ("object-select-symbolic", GTK_ICON_SIZE_MENU); gtk_widget_set_halign (check, GTK_ALIGN_END); gtk_widget_set_valign (check, GTK_ALIGN_BASELINE); gtk_widget_set_opacity (check, value ? 1.0 : 0.0); - gtk_box_pack_start (GTK_BOX (box), check, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), check, TRUE); row = gtk_list_box_row_new (); gtk_container_add (GTK_CONTAINER (row), box); @@ -176,14 +176,14 @@ add_label_row (GtkInspectorGeneral *gen, gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), label, FALSE); label = gtk_label_new (value); gtk_label_set_selectable (GTK_LABEL (label), TRUE); gtk_widget_set_halign (label, GTK_ALIGN_END); gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); gtk_label_set_xalign (GTK_LABEL (label), 1.0); - gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), label, TRUE); row = gtk_list_box_row_new (); gtk_container_add (GTK_CONTAINER (row), box); diff --git a/gtk/inspector/general.ui b/gtk/inspector/general.ui index c434793249..56513ae861 100644 --- a/gtk/inspector/general.ui +++ b/gtk/inspector/general.ui @@ -3,6 +3,7 @@ <template class="GtkInspectorGeneral" parent="GtkScrolledWindow"> <property name="hscrollbar-policy">never</property> <property name="vscrollbar-policy">automatic</property> + <property name="expand">0</property> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -43,10 +44,8 @@ <property name="selectable">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -77,10 +76,8 @@ <property name="selectable">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -125,10 +122,8 @@ <property name="halign">end</property> <property name="valign">baseline</property> <property name="ellipsize">end</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -160,10 +155,8 @@ <property name="halign">end</property> <property name="valign">baseline</property> <property name="ellipsize">end</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -195,10 +188,8 @@ <property name="halign">end</property> <property name="valign">baseline</property> <property name="ellipsize">end</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -230,10 +221,8 @@ <property name="halign">end</property> <property name="valign">baseline</property> <property name="ellipsize">end</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -265,10 +254,8 @@ <property name="halign">end</property> <property name="valign">baseline</property> <property name="ellipsize">end</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -300,10 +287,8 @@ <property name="halign">end</property> <property name="valign">baseline</property> <property name="ellipsize">end</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -335,10 +320,8 @@ <property name="halign">end</property> <property name="valign">baseline</property> <property name="ellipsize">end</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -383,10 +366,8 @@ <property name="halign">end</property> <property name="valign">baseline</property> <property name="ellipsize">end</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -417,10 +398,8 @@ <property name="valign">baseline</property> <property name="icon-name">object-select-symbolic</property> <property name="icon-size">1</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -451,10 +430,8 @@ <property name="valign">baseline</property> <property name="icon-name">object-select-symbolic</property> <property name="icon-size">1</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -499,10 +476,8 @@ <property name="halign">end</property> <property name="valign">baseline</property> <property name="ellipsize">end</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -534,10 +509,8 @@ <property name="halign">end</property> <property name="valign">baseline</property> <property name="ellipsize">end</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> diff --git a/gtk/inspector/misc-info.ui b/gtk/inspector/misc-info.ui index f1f5591b5b..bdc3705c4e 100644 --- a/gtk/inspector/misc-info.ui +++ b/gtk/inspector/misc-info.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <interface domain="gtk40"> <template class="GtkInspectorMiscInfo" parent="GtkScrolledWindow"> + <property name="expand">0</property> <child> <object class="GtkBox"> <property name="visible">true</property> @@ -35,10 +36,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0.0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> <child> <object class="GtkLabel" id="address"> @@ -69,10 +68,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0.0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> <child> <object class="GtkLabel" id="refcount"> @@ -103,10 +100,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0.0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> <child> <object class="GtkLabel" id="state"> @@ -137,10 +132,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0.0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> <child> <object class="GtkLabel" id="buildable_id"> @@ -171,10 +164,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0.0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> <child> <object class="GtkLabel" id="default_widget"> @@ -215,10 +206,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0.0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> <child> <object class="GtkLabel" id="focus_widget"> @@ -260,10 +249,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0.0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> <child> <object class="GtkBox" id="mnemonic_label"> @@ -295,10 +282,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">true</property> - </packing> </child> <child> <object class="GtkLabel" id="request_mode"> @@ -329,10 +314,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">true</property> - </packing> </child> <child> <object class="GtkLabel" id="allocated_size"> @@ -363,10 +346,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">true</property> - </packing> </child> <child> <object class="GtkLabel" id="baseline"> @@ -397,10 +378,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">true</property> - </packing> </child> <child> <object class="GtkLabel" id="clip_area"> @@ -431,10 +410,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0.0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> <child> <object class="GtkLabel" id="frame_clock"> @@ -476,10 +453,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">true</property> - </packing> </child> <child> <object class="GtkImage" id="tick_callback"> @@ -512,10 +487,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">true</property> - </packing> </child> <child> <object class="GtkLabel" id="framecount"> @@ -546,10 +519,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">true</property> - </packing> </child> <child> <object class="GtkLabel" id="framerate"> @@ -580,10 +551,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">true</property> - </packing> </child> <child> <object class="GtkLabel" id="accessible_role"> @@ -614,10 +583,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">true</property> - </packing> </child> <child> <object class="GtkLabel" id="accessible_name"> @@ -650,10 +617,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">true</property> - </packing> </child> <child> <object class="GtkLabel" id="accessible_description"> @@ -686,10 +651,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">true</property> - </packing> </child> <child> <object class="GtkImage" id="mapped"> @@ -722,10 +685,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">true</property> - </packing> </child> <child> <object class="GtkImage" id="realized"> @@ -758,10 +719,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">true</property> - </packing> </child> <child> <object class="GtkImage" id="is_toplevel"> @@ -794,10 +753,8 @@ <property name="halign">start</property> <property name="valign">baseline</property> <property name="xalign">0</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">true</property> - </packing> </child> <child> <object class="GtkImage" id="child_visible"> diff --git a/gtk/inspector/prop-editor.c b/gtk/inspector/prop-editor.c index e1f1452435..72a54ac259 100644 --- a/gtk/inspector/prop-editor.c +++ b/gtk/inspector/prop-editor.c @@ -938,7 +938,7 @@ property_editor (GObject *object, first = b; g_object_set_data (G_OBJECT (b), "index", GINT_TO_POINTER (j)); gtk_widget_show (b); - gtk_box_pack_start (GTK_BOX (box), b, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), b, FALSE); connect_controller (G_OBJECT (b), "toggled", object, spec, G_CALLBACK (enum_modified)); ++j; @@ -980,7 +980,7 @@ property_editor (GObject *object, b = gtk_check_button_new_with_label (fclass->values[j].value_name); g_object_set_data (G_OBJECT (b), "index", GINT_TO_POINTER (j)); gtk_widget_show (b); - gtk_box_pack_start (GTK_BOX (box), b, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), b, FALSE); connect_controller (G_OBJECT (b), "toggled", object, spec, G_CALLBACK (flags_modified)); } @@ -1605,7 +1605,7 @@ add_gtk_settings_info (GtkInspectorPropEditor *editor) gtk_widget_set_halign (button, GTK_ALIGN_END); gtk_widget_show (button); gtk_widget_set_sensitive (button, FALSE); - gtk_box_pack_end (GTK_BOX (row), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (row), button, FALSE); switch (_gtk_settings_get_setting_source (GTK_SETTINGS (object), name)) { diff --git a/gtk/inspector/recorder.c b/gtk/inspector/recorder.c index bc378beb88..be2c016c4b 100644 --- a/gtk/inspector/recorder.c +++ b/gtk/inspector/recorder.c @@ -348,7 +348,7 @@ gtk_inspector_recorder_recordings_list_create_widget (gpointer item, widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); - gtk_box_pack_start (GTK_BOX (widget), hbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (widget), hbox, TRUE); for (i = 0; i < g_list_model_get_n_items (priv->recordings); i++) { @@ -387,17 +387,17 @@ gtk_inspector_recorder_recordings_list_create_widget (gpointer item, label = gtk_label_new (str); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); g_free (str); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); button = gtk_toggle_button_new (); gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE); gtk_button_set_icon_name (GTK_BUTTON (button), "view-more-symbolic"); - gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, TRUE); + gtk_box_pack_end (GTK_BOX (hbox), button, TRUE); label = gtk_label_new (gtk_inspector_render_recording_get_profiler_info (GTK_INSPECTOR_RENDER_RECORDING (recording))); gtk_widget_hide (label); - gtk_box_pack_end (GTK_BOX (widget), label, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (widget), label, FALSE); g_object_bind_property (button, "active", label, "visible", 0); } else diff --git a/gtk/inspector/size-groups.c b/gtk/inspector/size-groups.c index e77dda193b..c69c40987b 100644 --- a/gtk/inspector/size-groups.c +++ b/gtk/inspector/size-groups.c @@ -225,7 +225,7 @@ add_size_group (GtkInspectorSizeGroups *sl, g_object_set (label, "margin", 10, NULL); gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); - gtk_box_pack_start (GTK_BOX (box2), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), label, TRUE); combo = gtk_combo_box_text_new (); g_object_set (combo, "margin", 10, NULL); @@ -238,7 +238,7 @@ add_size_group (GtkInspectorSizeGroups *sl, g_object_bind_property (group, "mode", combo, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); - gtk_box_pack_start (GTK_BOX (box2), combo, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box2), combo, FALSE); listbox = gtk_list_box_new (); gtk_container_add (GTK_CONTAINER (box), listbox); diff --git a/gtk/inspector/strv-editor.c b/gtk/inspector/strv-editor.c index 3add2e36b8..38c89f443f 100644 --- a/gtk/inspector/strv-editor.c +++ b/gtk/inspector/strv-editor.c @@ -68,17 +68,17 @@ add_string (GtkInspectorStrvEditor *editor, entry = gtk_entry_new (); gtk_entry_set_text (GTK_ENTRY (entry), str); gtk_widget_show (entry); - gtk_box_pack_start (GTK_BOX (box), entry, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box), entry, TRUE); g_object_set_data (G_OBJECT (box), "entry", entry); g_signal_connect_swapped (entry, "notify::text", G_CALLBACK (emit_changed), editor); button = gtk_button_new_from_icon_name ("user-trash-symbolic", GTK_ICON_SIZE_MENU); gtk_style_context_add_class (gtk_widget_get_style_context (button), "image-button"); gtk_widget_show (button); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), button, FALSE); g_signal_connect (button, "clicked", G_CALLBACK (remove_string), editor); - gtk_box_pack_start (GTK_BOX (editor->box), box, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (editor->box), box, FALSE); gtk_widget_grab_focus (entry); @@ -107,8 +107,8 @@ gtk_inspector_strv_editor_init (GtkInspectorStrvEditor *editor) gtk_widget_show (editor->button); g_signal_connect (editor->button, "clicked", G_CALLBACK (add_cb), editor); - gtk_box_pack_start (GTK_BOX (editor), editor->box, FALSE, TRUE); - gtk_box_pack_start (GTK_BOX (editor), editor->button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (editor), editor->box, TRUE); + gtk_box_pack_start (GTK_BOX (editor), editor->button, FALSE); } static void diff --git a/gtk/inspector/visual.ui b/gtk/inspector/visual.ui index 359c0a7f77..a6efa3472f 100644 --- a/gtk/inspector/visual.ui +++ b/gtk/inspector/visual.ui @@ -28,6 +28,7 @@ <template class="GtkInspectorVisual" parent="GtkScrolledWindow"> <property name="hscrollbar-policy">never</property> <property name="vscrollbar-policy">automatic</property> + <property name="expand">0</property> <child> <object class="GtkBox"> <property name="visible">True</property> @@ -69,10 +70,8 @@ <property name="visible">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -102,10 +101,8 @@ <property name="visible">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -135,10 +132,8 @@ <property name="visible">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -172,10 +167,8 @@ <property name="width-chars">2</property> <property name="adjustment">cursor_size_adjustment</property> <property name="snap-to-ticks">True</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -205,10 +198,8 @@ <property name="visible">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -238,10 +229,8 @@ <property name="visible">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -272,13 +261,11 @@ <property name="valign">baseline</property> <property name="adjustment">font_scale_adjustment</property> <property name="draw_value">0</property> + <property name="hexpand">1</property> <marks> <mark value="1.0" position="top"/> </marks> </object> - <packing> - <property name="expand">True</property> - </packing> </child> <child> <object class="GtkEntry" id="font_scale_entry"> @@ -317,15 +304,13 @@ <property name="visible">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> <signal name="changed" handler="direction_changed"/> <items> <item translatable="yes" id="ltr">Left-to-Right</item> <item translatable="yes" id="rtl">Right-to-Left</item> </items> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -357,10 +342,8 @@ <property name="valign">baseline</property> <property name="adjustment">scale_adjustment</property> <property name="snap-to-ticks">True</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -390,10 +373,8 @@ <property name="visible">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -425,13 +406,11 @@ <property name="adjustment">slowdown_adjustment</property> <property name="valign">baseline</property> <property name="draw_value">0</property> + <property name="hexpand">1</property> <marks> <mark value="0.0" position="top"/> </marks> </object> - <packing> - <property name="expand">True</property> - </packing> </child> <child> <object class="GtkEntry" id="slowdown_entry"> @@ -482,6 +461,7 @@ <property name="visible">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> <signal name="changed" handler="rendering_mode_changed"/> <items> <item translatable="yes" id="similar">Similar</item> @@ -489,9 +469,6 @@ <item translatable="yes" id="recording">Recording</item> </items> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -521,11 +498,9 @@ <property name="visible">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> <signal name="notify::active" handler="updates_activate"/> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -555,11 +530,9 @@ <property name="visible">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> <signal name="notify::active" handler="baselines_activate"/> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -589,11 +562,9 @@ <property name="visible">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> <signal name="notify::active" handler="layout_activate"/> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -623,11 +594,9 @@ <property name="visible">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> <signal name="notify::active" handler="snapshot_activate"/> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -657,11 +626,9 @@ <property name="visible">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> <signal name="notify::active" handler="widget_resize_activate"/> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -691,10 +658,8 @@ <property name="visible">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -736,15 +701,13 @@ <property name="visible">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> <items> <item translatable="yes" id="maybe">When Needed</item> <item translatable="yes" id="always">Always</item> <item translatable="yes" id="disable">Disabled</item> </items> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -774,11 +737,9 @@ <property name="visible">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> <signal name="notify::active" handler="software_gl_activate"/> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -808,11 +769,9 @@ <property name="visible">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> <signal name="notify::active" handler="software_surface_activate"/> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> @@ -842,11 +801,9 @@ <property name="visible">True</property> <property name="halign">end</property> <property name="valign">baseline</property> + <property name="hexpand">1</property> <signal name="notify::active" handler="texture_rectangle_activate"/> </object> - <packing> - <property name="expand">True</property> - </packing> </child> </object> </child> diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui index 681d89b98b..2f8a33525e 100644 --- a/gtk/ui/gtkaboutdialog.ui +++ b/gtk/ui/gtkaboutdialog.ui @@ -31,6 +31,7 @@ <property name="orientation">vertical</property> <property name="spacing">12</property> <property name="margin">5</property> + <property name="vexpand">1</property> <child> <object class="GtkImage" id="logo_image"> <property name="visible">1</property> @@ -59,6 +60,7 @@ <property name="visible">1</property> <property name="transition-type">over-up-down</property> <property name="transition-duration">600</property> + <property name="vexpand">1</property> <signal name="notify::visible-child" handler="stack_visible_child_notify" swapped="no"/> <child> <object class="GtkBox" id="page_vbox"> @@ -143,6 +145,7 @@ <property name="visible">1</property> <property name="hscrollbar-policy">never</property> <property name="shadow-type">in</property> + <property name="vexpand">1</property> <child> <object class="GtkViewport" id="viewport1"> <property name="visible">1</property> @@ -163,9 +166,6 @@ </object> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> </object> <packing> @@ -183,6 +183,7 @@ <property name="visible">1</property> <property name="hscrollbar-policy">never</property> <property name="shadow-type">in</property> + <property name="vexpand">1</property> <child> <object class="GtkTextView" id="license_view"> <property name="visible">1</property> @@ -196,9 +197,6 @@ </object> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> </object> <packing> @@ -216,6 +214,7 @@ <property name="visible">1</property> <property name="hscrollbar-policy">never</property> <property name="shadow-type">in</property> + <property name="vexpand">1</property> <child> <object class="GtkTextView" id="system_view"> <property name="visible">1</property> @@ -229,9 +228,6 @@ </object> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> </object> <packing> @@ -241,13 +237,11 @@ </child> </object> <packing> - <property name="expand">1</property> <property name="position">2</property> </packing> </child> </object> <packing> - <property name="expand">1</property> <property name="position">1</property> </packing> </child> diff --git a/gtk/ui/gtkappchooserdialog.ui b/gtk/ui/gtkappchooserdialog.ui index 9acf41663f..736694465e 100644 --- a/gtk/ui/gtkappchooserdialog.ui +++ b/gtk/ui/gtkappchooserdialog.ui @@ -41,14 +41,11 @@ <property name="valign">center</property> <property name="label">label</property> <property name="wrap">1</property> + <property name="vexpand">1</property> </object> - <packing> - <property name="expand">1</property> - </packing> </child> </object> <packing> - <property name="expand">1</property> <property name="position">2</property> </packing> </child> diff --git a/gtk/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui index 719fa69f6f..d8c4df761b 100644 --- a/gtk/ui/gtkassistant.ui +++ b/gtk/ui/gtkassistant.ui @@ -26,18 +26,17 @@ <object class="GtkBox" id="content_box"> <property name="visible">1</property> <property name="orientation">vertical</property> + <property name="hexpand">1</property> <child> <object class="GtkNotebook" id="content"> <property name="visible">1</property> <property name="can-focus">1</property> <property name="show-tabs">0</property> <property name="show-border">0</property> + <property name="vexpand">1</property> <signal name="remove" handler="assistant_remove_page_cb" swapped="no"/> <child type="tab"/> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkBox" id="action_area"> @@ -163,7 +162,6 @@ </child> </object> <packing> - <property name="expand">1</property> <property name="position">1</property> </packing> </child> diff --git a/gtk/ui/gtkcolorchooserdialog.ui b/gtk/ui/gtkcolorchooserdialog.ui index 436a2653fc..bca006e28a 100644 --- a/gtk/ui/gtkcolorchooserdialog.ui +++ b/gtk/ui/gtkcolorchooserdialog.ui @@ -16,12 +16,12 @@ <property name="orientation">vertical</property> <property name="margin">5</property> <property name="rgba">rgb(255,255,255)</property> + <property name="expand">1</property> <signal name="color-activated" handler="color_activated_cb" swapped="no"/> <signal name="notify::rgba" handler="propagate_notify" swapped="no"/> <signal name="notify::show-editor" handler="propagate_notify" swapped="no"/> </object> <packing> - <property name="expand">1</property> <property name="position">1</property> </packing> </child> diff --git a/gtk/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui index aa2f03a871..1ecd5f6491 100644 --- a/gtk/ui/gtkcoloreditor.ui +++ b/gtk/ui/gtkcoloreditor.ui @@ -120,7 +120,6 @@ </child> </object> <packing> - <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> diff --git a/gtk/ui/gtkcombobox.ui b/gtk/ui/gtkcombobox.ui index 09f7e4ea62..e6a25d2428 100644 --- a/gtk/ui/gtkcombobox.ui +++ b/gtk/ui/gtkcombobox.ui @@ -2,6 +2,7 @@ <interface domain="gtk30"> <!-- interface-requires gtk+ 3.10 --> <template class="GtkComboBox" parent="GtkBin"> + <property name="expand">0</property> <child> <object class="GtkBox" id="box"> <style> diff --git a/gtk/ui/gtkfilechooserdialog.ui b/gtk/ui/gtkfilechooserdialog.ui index 5c59f4822d..7418e9379c 100644 --- a/gtk/ui/gtkfilechooserdialog.ui +++ b/gtk/ui/gtkfilechooserdialog.ui @@ -20,13 +20,13 @@ </child> <child> <object class="GtkFileChooserWidget" id="widget"> + <property name="expand">1</property> <signal name="default-size-changed" handler="file_chooser_widget_default_size_changed" swapped="no"/> <signal name="file-activated" handler="file_chooser_widget_file_activated" swapped="no"/> <signal name="response-requested" handler="file_chooser_widget_response_requested" swapped="no"/> <signal name="selection-changed" handler="file_chooser_widget_selection_changed" swapped="no"/> </object> <packing> - <property name="expand">1</property> <property name="position">1</property> </packing> </child> diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui index 8f2936e036..2083711147 100644 --- a/gtk/ui/gtkfilechooserwidget.ui +++ b/gtk/ui/gtkfilechooserwidget.ui @@ -9,8 +9,10 @@ <child> <object class="GtkBox" id="browse_widgets_box"> <property name="orientation">vertical</property> + <property name="vexpand">1</property> <child> <object class="GtkPaned" id="browse_widgets_hpaned"> + <property name="vexpand">1</property> <child> <object class="GtkPlacesSidebar" id="places_sidebar"> <property name="hscrollbar-policy">never</property> @@ -51,11 +53,9 @@ <property name="margin">6</property> <child> <object class="GtkPathBar" id="browse_path_bar"> + <property name="hexpand">1</property> <signal name="path-clicked" handler="path_bar_clicked" after="yes" swapped="no"/> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkMenuButton" id="browse_new_folder_button"> @@ -125,9 +125,11 @@ <child> <object class="GtkBox" id="list_and_preview_box"> <property name="spacing">12</property> + <property name="vexpand">1</property> <child> <object class="GtkStack" id="browse_files_stack"> <property name="transition-type">crossfade</property> + <property name="expand">1</property> <style> <class name="view"/> </style> @@ -137,6 +139,7 @@ <child> <object class="GtkScrolledWindow" id="browse_files_swin"> <property name="hscrollbar-policy">never</property> + <property name="vexpand">1</property> <child> <object class="GtkTreeView" id="browse_files_tree_view"> <property name="has-tooltip">1</property> @@ -227,9 +230,6 @@ </object> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkActionBar" id="remote_warning_bar"> @@ -311,9 +311,6 @@ </packing> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkBox" id="preview_box"> @@ -328,7 +325,6 @@ </child> </object> <packing> - <property name="expand">1</property> <property name="position">2</property> </packing> </child> @@ -339,14 +335,10 @@ </child> </object> <packing> - <property name="expand">1</property> <property name="position">1</property> </packing> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkActionBar" id="extra_and_filters"> diff --git a/gtk/ui/gtkfontchooserdialog.ui b/gtk/ui/gtkfontchooserdialog.ui index 2b505d07a0..66bfb3cf04 100644 --- a/gtk/ui/gtkfontchooserdialog.ui +++ b/gtk/ui/gtkfontchooserdialog.ui @@ -12,10 +12,10 @@ <child> <object class="GtkFontChooserWidget" id="fontchooser"> <property name="visible">1</property> + <property name="vexpand">1</property> <signal name="font-activated" handler="font_activated_cb" swapped="no"/> </object> <packing> - <property name="expand">1</property> <property name="position">1</property> </packing> </child> diff --git a/gtk/ui/gtkinfobar.ui b/gtk/ui/gtkinfobar.ui index 1644442092..0fad0430c0 100644 --- a/gtk/ui/gtkinfobar.ui +++ b/gtk/ui/gtkinfobar.ui @@ -16,9 +16,6 @@ <property name="margin">8</property> <property name="hexpand">1</property> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkButtonBox" id="action_area"> diff --git a/gtk/ui/gtkmessagedialog.ui b/gtk/ui/gtkmessagedialog.ui index e0b311cef0..5e350b4824 100644 --- a/gtk/ui/gtkmessagedialog.ui +++ b/gtk/ui/gtkmessagedialog.ui @@ -26,6 +26,7 @@ <property name="visible">1</property> <property name="orientation">vertical</property> <property name="spacing">10</property> + <property name="hexpand">1</property> <child> <object class="GtkLabel" id="label"> <property name="visible">1</property> @@ -44,17 +45,16 @@ <property name="margin-bottom">2</property> <property name="halign">center</property> <property name="valign">start</property> + <property name="vexpand">1</property> <property name="wrap">1</property> <property name="max-width-chars">60</property> </object> <packing> - <property name="expand">1</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">1</property> <property name="position">1</property> </packing> </child> diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui index e273f64259..71b2deab18 100644 --- a/gtk/ui/gtkpagesetupunixdialog.ui +++ b/gtk/ui/gtkpagesetupunixdialog.ui @@ -39,6 +39,7 @@ <property name="row-spacing">6</property> <property name="column-spacing">12</property> <property name="margin">5</property> + <property name="vexpand">1</property> <child> <object class="GtkLabel" id="printer_combo_label"> <property name="visible">1</property> @@ -271,9 +272,6 @@ </packing> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> </object> </child> diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui index 5d95890466..f7e89322a3 100644 --- a/gtk/ui/gtkplacesview.ui +++ b/gtk/ui/gtkplacesview.ui @@ -381,7 +381,6 @@ </child> </object> <packing> - <property name="expand">False</property> <property name="fill">True</property> <property name="position">0</property> </packing> @@ -460,7 +459,6 @@ </child> </object> <packing> - <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui index 95247d0b82..cf3fefaeb5 100644 --- a/gtk/ui/gtkprintunixdialog.ui +++ b/gtk/ui/gtkprintunixdialog.ui @@ -63,6 +63,7 @@ <object class="GtkBox" id="box1"> <property name="visible">1</property> <property name="orientation">vertical</property> + <property name="vexpand">1</property> <child> <object class="GtkNotebook" id="notebook"> <property name="visible">1</property> @@ -84,6 +85,7 @@ <property name="visible">1</property> <property name="can-focus">1</property> <property name="shadow-type">in</property> + <property name="vexpand">1</property> <child> <object class="GtkTreeView" id="printer_treeview"> <property name="visible">1</property> @@ -144,9 +146,6 @@ </object> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkBox" id="extension_point"> @@ -159,9 +158,6 @@ </packing> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkBox" id="box3"> @@ -172,6 +168,7 @@ <property name="visible">1</property> <property name="orientation">vertical</property> <property name="spacing">6</property> + <property name="hexpand">1</property> <child> <object class="GtkLabel" id="label_widget1"> <property name="visible">1</property> @@ -292,15 +289,13 @@ </packing> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkBox" id="frame_template2"> <property name="visible">1</property> <property name="orientation">vertical</property> <property name="spacing">6</property> + <property name="hexpand">1</property> <child> <object class="GtkLabel" id="label_widget2"> <property name="visible">1</property> @@ -404,7 +399,6 @@ </child> </object> <packing> - <property name="expand">1</property> <property name="position">1</property> </packing> </child> @@ -440,6 +434,7 @@ <property name="visible">1</property> <property name="orientation">vertical</property> <property name="spacing">6</property> + <property name="hexpand">1</property> <child> <object class="GtkLabel" id="label_widget3"> <property name="visible">1</property> @@ -627,15 +622,13 @@ </packing> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkBox" id="frame_template4"> <property name="visible">1</property> <property name="orientation">vertical</property> <property name="spacing">6</property> + <property name="hexpand">1</property> <child> <object class="GtkLabel" id="label_widget4"> <property name="visible">1</property> @@ -808,7 +801,6 @@ </child> </object> <packing> - <property name="expand">1</property> <property name="position">1</property> </packing> </child> @@ -825,14 +817,11 @@ <property name="content-width">320</property> <property name="content-height">160</property> <property name="visible">1</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">1</property> - </packing> </child> </object> <packing> - <property name="expand">1</property> <property name="position">1</property> </packing> </child> @@ -1180,6 +1169,7 @@ <object class="GtkScrolledWindow" id="image_quality_page"> <property name="can-focus">1</property> <property name="hscrollbar-policy">never</property> + <property name="hexpand">1</property> <child> <object class="GtkViewport" id="viewport1"> <property name="visible">1</property> @@ -1309,9 +1299,6 @@ </packing> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkActionBar" id="conflicts_widget"> @@ -1336,9 +1323,6 @@ </packing> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> </object> </child> diff --git a/gtk/ui/gtkrecentchooserdefault.ui b/gtk/ui/gtkrecentchooserdefault.ui index ef94199559..c50b50330d 100644 --- a/gtk/ui/gtkrecentchooserdefault.ui +++ b/gtk/ui/gtkrecentchooserdefault.ui @@ -15,6 +15,7 @@ <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">6</property> + <property name="expand">0</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow"> <property name="visible">1</property> @@ -28,6 +29,7 @@ <property name="can-focus">1</property> <property name="has-tooltip">1</property> <property name="headers-visible">0</property> + <property name="expand">1</property> <signal name="button-press-event" handler="recent_view_button_press_cb" swapped="no"/> <signal name="drag-begin" handler="recent_view_drag_begin_cb" swapped="no"/> <signal name="drag-data-get" handler="recent_view_drag_data_get_cb" swapped="no"/> @@ -64,7 +66,6 @@ </child> </object> <packing> - <property name="expand">True</property> <property name="fill">True</property> <property name="position">0</property> </packing> @@ -88,7 +89,6 @@ </child> </object> <packing> - <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> diff --git a/gtk/ui/gtksearchbar.ui b/gtk/ui/gtksearchbar.ui index 7624ae2d73..d3a1538012 100644 --- a/gtk/ui/gtksearchbar.ui +++ b/gtk/ui/gtksearchbar.ui @@ -15,9 +15,6 @@ <property name="hexpand">1</property> <property name="orientation">vertical</property> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkBox" id="box_center"> @@ -49,9 +46,6 @@ </object> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> </object> <packing> diff --git a/gtk/ui/gtkstatusbar.ui b/gtk/ui/gtkstatusbar.ui index 025ebe3e24..bfa354b880 100644 --- a/gtk/ui/gtkstatusbar.ui +++ b/gtk/ui/gtkstatusbar.ui @@ -3,9 +3,11 @@ <!-- interface-requires gtk+ 3.10 --> <template class="GtkStatusbar" parent="GtkBox"> <property name="spacing">2</property> + <property name="hexpand">0</property> <child> <object class="GtkFrame" id="frame"> <property name="shadow-type">none</property> + <property name="hexpand">1</property> <child> <object class="GtkBox" id="message_area"> <property name="spacing">4</property> @@ -22,9 +24,6 @@ </child> <child type="label_item"/> </object> - <packing> - <property name="expand">1</property> - </packing> </child> </template> </interface> |