From 5729ea7744c2a41ae8fb833db6690a6aa5ad7a84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timm=20B=C3=A4der?= Date: Fri, 21 Apr 2017 18:59:59 +0200 Subject: [PATCH] box: Remove expand child property GtkWidget already has hexpand/vexpand properties. --- demos/gtk-demo/assistant.c | 6 +- demos/gtk-demo/button_box.c | 28 +- demos/gtk-demo/changedisplay.c | 12 +- demos/gtk-demo/clipboard.c | 20 +- demos/gtk-demo/colorsel.c | 4 +- demos/gtk-demo/combobox.c | 8 +- demos/gtk-demo/cursors.c | 4 +- demos/gtk-demo/demo.ui | 7 +- demos/gtk-demo/dialog.c | 20 +- demos/gtk-demo/drawingarea.c | 8 +- demos/gtk-demo/editable_cells.c | 10 +- demos/gtk-demo/entry_buffer.c | 6 +- demos/gtk-demo/entry_completion.c | 4 +- demos/gtk-demo/expander.c | 6 +- demos/gtk-demo/iconview.c | 5 +- demos/gtk-demo/images.c | 18 +- demos/gtk-demo/infobar.c | 26 +- demos/gtk-demo/list_store.c | 4 +- demos/gtk-demo/listbox.c | 5 +- demos/gtk-demo/main.ui | 2 +- demos/gtk-demo/menus.c | 8 +- demos/gtk-demo/overlay.c | 4 +- demos/gtk-demo/panes.c | 6 +- demos/gtk-demo/search_entry.c | 8 +- demos/gtk-demo/search_entry2.c | 20 +- demos/gtk-demo/sidebar.c | 6 +- demos/gtk-demo/sizegroup.c | 6 +- demos/gtk-demo/spinner.c | 2 +- demos/gtk-demo/textscroll.c | 2 +- demos/gtk-demo/toolpalette.c | 9 +- demos/gtk-demo/tree_store.c | 4 +- demos/widget-factory/widget-factory.c | 10 +- demos/widget-factory/widget-factory.ui | 72 +-- docs/tools/widgets.c | 138 +++-- examples/search-bar.c | 8 +- gtk/gtkactionbar.c | 4 +- gtk/gtkappchooserdialog.c | 8 +- gtk/gtkassistant.c | 8 +- gtk/gtkbbox.c | 2 +- gtk/gtkbox.c | 86 +-- gtk/gtkbox.h | 4 - gtk/gtkcolorchooserwidget.c | 4 +- gtk/gtkcombobox.c | 3 +- gtk/gtkcustompaperunixdialog.c | 24 +- gtk/gtkentrycompletion.c | 7 +- gtk/gtkfilechooserwidget.c | 10 +- gtk/gtkheaderbar.c | 12 +- gtk/gtkinfobar.c | 2 +- gtk/gtkmenusectionbox.c | 18 +- gtk/gtkmenutoolbutton.c | 4 +- gtk/gtkmodelmenuitem.c | 4 +- gtk/gtkmountoperation.c | 28 +- gtk/gtkpathbar.c | 4 +- gtk/gtkprintbackend.c | 16 +- gtk/gtkprinteroptionwidget.c | 18 +- gtk/gtkprintunixdialog.c | 14 +- gtk/gtkrecentchooserdialog.c | 2 +- gtk/gtkshortcutssection.c | 2 +- gtk/gtktoolbutton.c | 12 +- gtk/gtktreeviewcolumn.c | 8 +- gtk/inspector/general.c | 8 +- gtk/inspector/general.ui | 57 +- gtk/inspector/misc-info.ui | 89 +--- gtk/inspector/prop-editor.c | 6 +- gtk/inspector/recorder.c | 8 +- gtk/inspector/size-groups.c | 4 +- gtk/inspector/strv-editor.c | 10 +- gtk/inspector/visual.ui | 89 +--- gtk/ui/gtkaboutdialog.ui | 16 +- gtk/ui/gtkappchooserdialog.ui | 5 +- gtk/ui/gtkassistant.ui | 6 +- gtk/ui/gtkcolorchooserdialog.ui | 2 +- gtk/ui/gtkcoloreditor.ui | 1 - gtk/ui/gtkcombobox.ui | 1 + gtk/ui/gtkfilechooserdialog.ui | 2 +- gtk/ui/gtkfilechooserwidget.ui | 20 +- gtk/ui/gtkfontchooserdialog.ui | 2 +- gtk/ui/gtkinfobar.ui | 3 - gtk/ui/gtkmessagedialog.ui | 4 +- gtk/ui/gtkpagesetupunixdialog.ui | 4 +- gtk/ui/gtkplacesview.ui | 2 - gtk/ui/gtkprintunixdialog.ui | 32 +- gtk/ui/gtkrecentchooserdefault.ui | 4 +- gtk/ui/gtksearchbar.ui | 6 - gtk/ui/gtkstatusbar.ui | 5 +- tests/flicker.c | 42 +- tests/gdkgears.c | 10 +- tests/motion-compression.c | 7 +- tests/overlayscroll.c | 2 +- tests/print-editor.c | 6 +- tests/syncscroll.c | 6 +- tests/testaccel.c | 3 +- tests/testactionbar.c | 4 +- tests/testadjustsize.c | 4 +- tests/testanimation.c | 8 +- tests/testappchooserbutton.c | 10 +- tests/testassistant.c | 7 +- tests/testbaseline.c | 14 +- tests/testbbox.c | 12 +- tests/testbox.c | 44 +- tests/testboxcss.c | 17 +- tests/testcalendar.c | 64 +-- tests/testcellarea.c | 72 ++- tests/testcellrenderertext.c | 10 +- tests/testclipboard.c | 4 +- tests/testcombo.c | 26 +- tests/testcombochange.c | 25 +- tests/testellipsise.c | 7 +- tests/testentrycompletion.c | 4 +- tests/testexpand.c | 20 +- tests/testexpander.c | 4 +- tests/testfilechooserbutton.c | 28 +- tests/testflowbox.c | 49 +- tests/testframe.c | 5 +- tests/testgiconpixbuf.c | 12 +- tests/testgrid.c | 10 +- tests/testgtk.c | 705 +++++++++++++------------ tests/testheaderbar.c | 9 +- tests/testheightforwidth.c | 2 +- tests/testiconview.c | 23 +- tests/testinput.c | 5 +- tests/testlist3.c | 3 +- tests/testmultidisplay.c | 4 +- tests/testorientable.c | 12 +- tests/testoverlay.c | 4 +- tests/testpixbuf-scale.c | 12 +- tests/testrecentchoosermenu.c | 6 +- tests/testscale.c | 16 +- tests/testscrolledwindow.c | 116 ++-- tests/testselection.c | 7 +- tests/testsensitive.c | 8 +- tests/testspinbutton.c | 2 +- tests/teststack.c | 7 +- tests/testswitch.c | 20 +- tests/testtoolbar.c | 20 +- tests/testtooltips.c | 22 +- tests/testtoplevelembed.c | 5 +- tests/testtreecolumns.c | 30 +- tests/testtreecolumnsizing.c | 7 +- tests/testtreeedit.c | 13 +- tests/testtreeflow.c | 9 +- tests/testtreefocus.c | 10 +- tests/testtreesort.c | 19 +- tests/testwindowsize.c | 3 +- tests/treestoretest.c | 31 +- testsuite/a11y/placeholder-text.ui | 3 - testsuite/gtk/builder.c | 6 - testsuite/gtk/ui/container1.ui | 2 +- testsuite/gtk/ui/container8.ui | 2 +- 149 files changed, 1291 insertions(+), 1584 deletions(-) diff --git a/demos/gtk-demo/assistant.c b/demos/gtk-demo/assistant.c index cdceb4cd05..4dd76da430 100644 --- a/demos/gtk-demo/assistant.c +++ b/demos/gtk-demo/assistant.c @@ -96,12 +96,12 @@ create_page1 (GtkWidget *assistant) box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); label = gtk_label_new ("You must fill out this entry to continue:"); - gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), label, FALSE); entry = gtk_entry_new (); gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); gtk_widget_set_valign (entry, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), entry, TRUE); g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (on_entry_changed), assistant); @@ -119,7 +119,7 @@ create_page2 (GtkWidget *assistant) checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue " "even if you do not check this"); - gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE); gtk_assistant_append_page (GTK_ASSISTANT (assistant), box); gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE); diff --git a/demos/gtk-demo/button_box.c b/demos/gtk-demo/button_box.c index a5d22571da..b9a17ec1fa 100644 --- a/demos/gtk-demo/button_box.c +++ b/demos/gtk-demo/button_box.c @@ -70,7 +70,7 @@ do_button_box (GtkWidget *do_widget) frame_horz = gtk_frame_new ("Horizontal Button Boxes"); gtk_widget_set_margin_top (frame_horz, 10); gtk_widget_set_margin_bottom (frame_horz, 10); - gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); g_object_set (vbox, "margin", 10, NULL); @@ -78,30 +78,30 @@ do_button_box (GtkWidget *do_widget) gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Spread", 40, GTK_BUTTONBOX_SPREAD), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Center", 40, GTK_BUTTONBOX_CENTER), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Expand", 0, GTK_BUTTONBOX_EXPAND), - TRUE, TRUE); + TRUE); frame_vert = gtk_frame_new ("Vertical Button Boxes"); - gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); g_object_set (hbox, "margin", 10, NULL); @@ -109,25 +109,25 @@ do_button_box (GtkWidget *do_widget) gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Spread", 10, GTK_BUTTONBOX_SPREAD), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Edge", 10, GTK_BUTTONBOX_EDGE), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Start", 10, GTK_BUTTONBOX_START), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "End", 10, GTK_BUTTONBOX_END), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Center", 10, GTK_BUTTONBOX_CENTER), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Expand", 0, GTK_BUTTONBOX_EXPAND), - TRUE, TRUE); + TRUE); } if (!gtk_widget_get_visible (window)) diff --git a/demos/gtk-demo/changedisplay.c b/demos/gtk-demo/changedisplay.c index 8f7d16446d..3694eb07d0 100644 --- a/demos/gtk-demo/changedisplay.c +++ b/demos/gtk-demo/changedisplay.c @@ -312,7 +312,7 @@ create_frame (ChangeDisplayInfo *info, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwin), GTK_SHADOW_IN); - gtk_box_pack_start (GTK_BOX (hbox), scrollwin, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), scrollwin, TRUE); *tree_view = gtk_tree_view_new (); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (*tree_view), FALSE); @@ -322,7 +322,7 @@ create_frame (ChangeDisplayInfo *info, gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); *button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); - gtk_box_pack_start (GTK_BOX (hbox), *button_vbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), *button_vbox, FALSE); if (!info->size_group) info->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); @@ -362,11 +362,11 @@ create_display_frame (ChangeDisplayInfo *info) button = left_align_button_new ("_Open..."); g_signal_connect (button, "clicked", G_CALLBACK (open_display_cb), info); - gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE); button = left_align_button_new ("_Close"); g_signal_connect (button, "clicked", G_CALLBACK (close_display_cb), info); - gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE); info->display_model = (GtkTreeModel *)gtk_list_store_new (DISPLAY_NUM_COLUMNS, G_TYPE_STRING, @@ -539,10 +539,10 @@ do_changedisplay (GtkWidget *do_widget) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); g_object_set (vbox, "margin", 8, NULL); - gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE); frame = create_display_frame (info); - gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE); initialize_displays (info); diff --git a/demos/gtk-demo/clipboard.c b/demos/gtk-demo/clipboard.c index 444ac89271..8c6f8c3c0d 100644 --- a/demos/gtk-demo/clipboard.c +++ b/demos/gtk-demo/clipboard.c @@ -225,45 +225,45 @@ do_clipboard (GtkWidget *do_widget) label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); g_object_set (hbox, "margin", 8, NULL); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); /* Create the first entry */ entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE); /* Create the button */ button = gtk_button_new_with_mnemonic (_("_Copy")); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE); g_signal_connect (button, "clicked", G_CALLBACK (copy_button_clicked), entry); label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); g_object_set (hbox, "margin", 8, NULL); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); /* Create the second entry */ entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE); /* Create the button */ button = gtk_button_new_with_mnemonic (_("_Paste")); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE); g_signal_connect (button, "clicked", G_CALLBACK (paste_button_clicked), entry); label = gtk_label_new ("Images can be transferred via the clipboard, too"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); g_object_set (hbox, "margin", 8, NULL); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); /* Create the first image */ image = gtk_image_new_from_icon_name ("dialog-warning", diff --git a/demos/gtk-demo/colorsel.c b/demos/gtk-demo/colorsel.c index 7f85c4e38e..8f6a1c5974 100644 --- a/demos/gtk-demo/colorsel.c +++ b/demos/gtk-demo/colorsel.c @@ -87,7 +87,7 @@ do_colorsel (GtkWidget *do_widget) frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); - gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE); da = gtk_drawing_area_new (); gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 200); @@ -100,7 +100,7 @@ do_colorsel (GtkWidget *do_widget) gtk_widget_set_halign (button, GTK_ALIGN_END); gtk_widget_set_valign (button, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); g_signal_connect (button, "clicked", G_CALLBACK (change_color_callback), NULL); diff --git a/demos/gtk-demo/combobox.c b/demos/gtk-demo/combobox.c index 0607866833..cbff3b17f2 100644 --- a/demos/gtk-demo/combobox.c +++ b/demos/gtk-demo/combobox.c @@ -326,7 +326,7 @@ do_combobox (GtkWidget *do_widget) * insensitive rows */ frame = gtk_frame_new ("Items with icons"); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); g_object_set (box, "margin", 5, NULL); @@ -367,7 +367,7 @@ do_combobox (GtkWidget *do_widget) /* A combobox demonstrating trees. */ frame = gtk_frame_new ("Where are we ?"); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); g_object_set (box, "margin", 5, NULL); @@ -395,7 +395,7 @@ do_combobox (GtkWidget *do_widget) /* A GtkComboBoxEntry with validation */ frame = gtk_frame_new ("Editable"); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); g_object_set (box, "margin", 5, NULL); @@ -413,7 +413,7 @@ do_combobox (GtkWidget *do_widget) /* A combobox with string IDs */ frame = gtk_frame_new ("String IDs"); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); g_object_set (box, "margin", 5, NULL); diff --git a/demos/gtk-demo/cursors.c b/demos/gtk-demo/cursors.c index 580342e73e..019cd63d0b 100644 --- a/demos/gtk-demo/cursors.c +++ b/demos/gtk-demo/cursors.c @@ -27,13 +27,13 @@ add_section (GtkWidget *box, gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_widget_set_margin_top (label, 10); gtk_widget_set_margin_bottom (label, 10); - gtk_box_pack_start (GTK_BOX (box), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box), label, TRUE); section = gtk_flow_box_new (); gtk_widget_set_halign (section, GTK_ALIGN_START); gtk_flow_box_set_selection_mode (GTK_FLOW_BOX (section), GTK_SELECTION_NONE); gtk_flow_box_set_min_children_per_line (GTK_FLOW_BOX (section), 2); gtk_flow_box_set_max_children_per_line (GTK_FLOW_BOX (section), 20); - gtk_box_pack_start (GTK_BOX (box), section, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box), section, TRUE); return section; } diff --git a/demos/gtk-demo/demo.ui b/demos/gtk-demo/demo.ui index cfd06509a5..fd08164af4 100644 --- a/demos/gtk-demo/demo.ui +++ b/demos/gtk-demo/demo.ui @@ -159,9 +159,6 @@ - - 0 - @@ -227,7 +224,6 @@ - 0 1 @@ -235,6 +231,7 @@ in 1 + 1 1 @@ -286,7 +283,6 @@ 2 - 1 @@ -295,7 +291,6 @@ 3 - 0 diff --git a/demos/gtk-demo/dialog.c b/demos/gtk-demo/dialog.c index 983e455099..5b982f5f3d 100644 --- a/demos/gtk-demo/dialog.c +++ b/demos/gtk-demo/dialog.c @@ -56,15 +56,15 @@ interactive_dialog_clicked (GtkButton *button, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); - gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE); image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG); - gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), image, FALSE); table = gtk_grid_new (); gtk_grid_set_row_spacing (GTK_GRID (table), 4); gtk_grid_set_column_spacing (GTK_GRID (table), 4); - gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), table, TRUE); label = gtk_label_new_with_mnemonic ("_Entry 1"); gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1); local_entry1 = gtk_entry_new (); @@ -122,30 +122,30 @@ do_dialog (GtkWidget *do_widget) /* Standard message dialog */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); button = gtk_button_new_with_mnemonic ("_Message Dialog"); g_signal_connect (button, "clicked", G_CALLBACK (message_dialog_clicked), NULL); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), - FALSE, FALSE); + FALSE); /* Interactive dialog*/ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); button = gtk_button_new_with_mnemonic ("_Interactive Dialog"); g_signal_connect (button, "clicked", G_CALLBACK (interactive_dialog_clicked), NULL); - gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE); table = gtk_grid_new (); gtk_grid_set_row_spacing (GTK_GRID (table), 4); gtk_grid_set_column_spacing (GTK_GRID (table), 4); - gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), table, FALSE); label = gtk_label_new_with_mnemonic ("_Entry 1"); gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1); diff --git a/demos/gtk-demo/drawingarea.c b/demos/gtk-demo/drawingarea.c index 6908a84449..b613e3e3b6 100644 --- a/demos/gtk-demo/drawingarea.c +++ b/demos/gtk-demo/drawingarea.c @@ -221,11 +221,11 @@ do_drawingarea (GtkWidget *do_widget) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "Checkerboard pattern"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); - gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE); da = gtk_drawing_area_new (); gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100); @@ -240,11 +240,11 @@ do_drawingarea (GtkWidget *do_widget) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "Scribble area"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); - gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE); da = gtk_drawing_area_new (); gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100); diff --git a/demos/gtk-demo/editable_cells.c b/demos/gtk-demo/editable_cells.c index c890e6438b..63ee41613e 100644 --- a/demos/gtk-demo/editable_cells.c +++ b/demos/gtk-demo/editable_cells.c @@ -358,7 +358,7 @@ do_editable_cells (GtkWidget *do_widget) gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Shopping list (you can edit the cells!)"), - FALSE, FALSE); + FALSE); sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), @@ -366,7 +366,7 @@ do_editable_cells (GtkWidget *do_widget) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE); /* create models */ items_model = create_items_model (); @@ -387,17 +387,17 @@ do_editable_cells (GtkWidget *do_widget) /* some buttons */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); button = gtk_button_new_with_label ("Add item"); g_signal_connect (button, "clicked", G_CALLBACK (add_item), treeview); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); button = gtk_button_new_with_label ("Remove item"); g_signal_connect (button, "clicked", G_CALLBACK (remove_item), treeview); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); gtk_window_set_default_size (GTK_WINDOW (window), 320, 200); } diff --git a/demos/gtk-demo/entry_buffer.c b/demos/gtk-demo/entry_buffer.c index 5bae1a6df4..ad9cb80637 100644 --- a/demos/gtk-demo/entry_buffer.c +++ b/demos/gtk-demo/entry_buffer.c @@ -34,19 +34,19 @@ do_entry_buffer (GtkWidget *do_widget) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "Entries share a buffer. Typing in one is reflected in the other."); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); /* Create a buffer */ buffer = gtk_entry_buffer_new (NULL, 0); /* Create our first entry */ entry = gtk_entry_new_with_buffer (buffer); - gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE); /* Create the second entry */ entry = gtk_entry_new_with_buffer (buffer); gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE); - gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE); g_object_unref (buffer); } diff --git a/demos/gtk-demo/entry_completion.c b/demos/gtk-demo/entry_completion.c index 306d590bb4..7c078cd567 100644 --- a/demos/gtk-demo/entry_completion.c +++ b/demos/gtk-demo/entry_completion.c @@ -60,11 +60,11 @@ do_entry_completion (GtkWidget *do_widget) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing total or gnome for example."); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); /* Create our entry */ entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE); /* Create the completion object */ completion = gtk_entry_completion_new (); diff --git a/demos/gtk-demo/expander.c b/demos/gtk-demo/expander.c index d4f18586b4..a4523eb79c 100644 --- a/demos/gtk-demo/expander.c +++ b/demos/gtk-demo/expander.c @@ -29,7 +29,7 @@ static void do_not_expand (GtkWidget *child, gpointer data) { gtk_container_child_set (GTK_CONTAINER (gtk_widget_get_parent (child)), child, - "expand", FALSE, "fill", FALSE, NULL); + "fill", FALSE, NULL); } GtkWidget * @@ -59,7 +59,7 @@ do_expander (GtkWidget *do_widget) area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (window)); box = gtk_widget_get_parent (area); gtk_container_child_set (GTK_CONTAINER (gtk_widget_get_parent (box)), box, - "expand", TRUE, "fill", TRUE, NULL); + "fill", TRUE, NULL); gtk_container_foreach (GTK_CONTAINER (area), do_not_expand, NULL); expander = gtk_expander_new ("Details:"); @@ -85,7 +85,7 @@ do_expander (GtkWidget *do_widget) "resize the window. Do it already !", -1); gtk_container_add (GTK_CONTAINER (sw), tv); gtk_container_add (GTK_CONTAINER (expander), sw); - gtk_box_pack_end (GTK_BOX (area), expander, TRUE, TRUE); + gtk_box_pack_end (GTK_BOX (area), expander, TRUE); g_signal_connect (expander, "notify::expanded", G_CALLBACK (expander_cb), window); diff --git a/demos/gtk-demo/iconview.c b/demos/gtk-demo/iconview.c index bf65f4ed5b..30537ebf1e 100644 --- a/demos/gtk-demo/iconview.c +++ b/demos/gtk-demo/iconview.c @@ -266,7 +266,7 @@ do_iconview (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (window), vbox); tool_bar = gtk_toolbar_new (); - gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE); up_button = gtk_tool_button_new (NULL, NULL); gtk_tool_button_set_label (GTK_TOOL_BUTTON (up_button), _("_Up")); @@ -290,8 +290,9 @@ do_iconview (GtkWidget *do_widget) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_widget_set_vexpand (sw, TRUE); - gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE); /* Create the store and fill it with the contents of '/' */ parent = g_strdup ("/"); diff --git a/demos/gtk-demo/images.c b/demos/gtk-demo/images.c index 1b2c166a99..12a312d64e 100644 --- a/demos/gtk-demo/images.c +++ b/demos/gtk-demo/images.c @@ -354,13 +354,13 @@ do_images (GtkWidget *do_widget) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "Image loaded from a file"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_widget_set_halign (frame, GTK_ALIGN_CENTER); gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); image = gtk_image_new_from_icon_name ("gtk3-demo", GTK_ICON_SIZE_DIALOG); @@ -372,13 +372,13 @@ do_images (GtkWidget *do_widget) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "Animation loaded from a file"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_widget_set_halign (frame, GTK_ALIGN_CENTER); gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); image = gtk_image_new_from_resource ("/images/floppybuddy.gif"); @@ -389,13 +389,13 @@ do_images (GtkWidget *do_widget) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "Symbolic themed icon"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_widget_set_halign (frame, GTK_ALIGN_CENTER); gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic"); image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG); @@ -408,13 +408,13 @@ do_images (GtkWidget *do_widget) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "Progressive image loading"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_widget_set_halign (frame, GTK_ALIGN_CENTER); gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); /* Create an empty image for now; the progressive loader * will create the pixbuf and fill it in. @@ -426,7 +426,7 @@ do_images (GtkWidget *do_widget) /* Sensitivity control */ button = gtk_toggle_button_new_with_mnemonic ("_Insensitive"); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); g_signal_connect (button, "toggled", G_CALLBACK (toggle_sensitivity_callback), diff --git a/demos/gtk-demo/infobar.c b/demos/gtk-demo/infobar.c index 9b71794d44..d261bd6116 100644 --- a/demos/gtk-demo/infobar.c +++ b/demos/gtk-demo/infobar.c @@ -65,24 +65,24 @@ do_infobar (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (window), vbox); bar = gtk_info_bar_new (); - gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE); gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_INFO); label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_INFO"); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE); button = gtk_toggle_button_new_with_label ("Message"); g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); gtk_container_add (GTK_CONTAINER (actions), button); bar = gtk_info_bar_new (); - gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE); gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_WARNING); label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_WARNING"); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE); button = gtk_toggle_button_new_with_label ("Warning"); g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); @@ -91,24 +91,24 @@ do_infobar (GtkWidget *do_widget) bar = gtk_info_bar_new_with_buttons (_("_OK"), GTK_RESPONSE_OK, NULL); gtk_info_bar_set_show_close_button (GTK_INFO_BAR (bar), TRUE); g_signal_connect (bar, "response", G_CALLBACK (on_bar_response), window); - gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE); gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_QUESTION); label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_QUESTION"); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE); button = gtk_toggle_button_new_with_label ("Question"); g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); gtk_container_add (GTK_CONTAINER (actions), button); bar = gtk_info_bar_new (); - gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE); gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_ERROR); label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_ERROR"); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE); button = gtk_toggle_button_new_with_label ("Error"); g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); @@ -116,12 +116,12 @@ do_infobar (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (actions), button); bar = gtk_info_bar_new (); - gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE); gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_OTHER); label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_OTHER"); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE); button = gtk_toggle_button_new_with_label ("Other"); g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); @@ -130,7 +130,7 @@ do_infobar (GtkWidget *do_widget) frame = gtk_frame_new ("Info bars"); gtk_widget_set_margin_top (frame, 8); gtk_widget_set_margin_bottom (frame, 8); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); g_object_set (vbox2, "margin", 8, NULL); @@ -138,9 +138,9 @@ do_infobar (GtkWidget *do_widget) /* Standard message dialog */ label = gtk_label_new ("An example of different info bars"); - gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE); - gtk_box_pack_start (GTK_BOX (vbox2), actions, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), actions, FALSE); } if (!gtk_widget_get_visible (window)) diff --git a/demos/gtk-demo/list_store.c b/demos/gtk-demo/list_store.c index c0c37ae29d..b7e70b7270 100644 --- a/demos/gtk-demo/list_store.c +++ b/demos/gtk-demo/list_store.c @@ -268,7 +268,7 @@ do_list_store (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (window), vbox); label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though)."); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), @@ -276,7 +276,7 @@ do_list_store (GtkWidget *do_widget) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE); /* create tree model */ model = create_model (); diff --git a/demos/gtk-demo/listbox.c b/demos/gtk-demo/listbox.c index 24b679c63a..3d95bca156 100644 --- a/demos/gtk-demo/listbox.c +++ b/demos/gtk-demo/listbox.c @@ -359,10 +359,11 @@ do_listbox (GtkWidget *do_widget) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_container_add (GTK_CONTAINER (window), vbox); label = gtk_label_new ("Messages from Gtk+ and friends"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE); + gtk_widget_set_vexpand (scrolled, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE); listbox = gtk_list_box_new (); gtk_container_add (GTK_CONTAINER (scrolled), listbox); diff --git a/demos/gtk-demo/main.ui b/demos/gtk-demo/main.ui index d3f10e1ffe..99b49572a2 100644 --- a/demos/gtk-demo/main.ui +++ b/demos/gtk-demo/main.ui @@ -97,6 +97,7 @@ 1 1 0 + 1 1 @@ -166,7 +167,6 @@ - 1 1 diff --git a/demos/gtk-demo/menus.c b/demos/gtk-demo/menus.c index 9fdd35350c..107a6db3eb 100644 --- a/demos/gtk-demo/menus.c +++ b/demos/gtk-demo/menus.c @@ -115,7 +115,7 @@ do_menus (GtkWidget *do_widget) menubar = gtk_menu_bar_new (); gtk_widget_set_hexpand (menubar, TRUE); - gtk_box_pack_start (GTK_BOX (box1), menubar, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), menubar, TRUE); gtk_widget_show (menubar); menu = create_menu (2); @@ -136,19 +136,19 @@ do_menus (GtkWidget *do_widget) gtk_widget_show (menuitem); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); - gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), box2, TRUE); gtk_widget_show (box2); button = gtk_button_new_with_label ("Flip"); g_signal_connect (button, "clicked", G_CALLBACK (change_orientation), menubar); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); gtk_widget_show (button); button = gtk_button_new_with_label ("Close"); g_signal_connect_swapped (button, "clicked", G_CALLBACK(gtk_widget_destroy), window); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); gtk_widget_set_can_default (button, TRUE); gtk_widget_grab_default (button); gtk_widget_show (button); diff --git a/demos/gtk-demo/overlay.c b/demos/gtk-demo/overlay.c index f3b836d6be..c6d7e90656 100644 --- a/demos/gtk-demo/overlay.c +++ b/demos/gtk-demo/overlay.c @@ -65,12 +65,12 @@ do_overlay (GtkWidget *do_widget) gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_widget_set_margin_top (label, 8); gtk_widget_set_margin_bottom (label, 8); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); gtk_entry_set_placeholder_text (GTK_ENTRY (entry), "Your Lucky Number"); gtk_widget_set_margin_top (entry, 8); gtk_widget_set_margin_bottom (entry, 8); - gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE); gtk_container_add (GTK_CONTAINER (window), overlay); diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c index cdfb5a9063..40c67f053b 100644 --- a/demos/gtk-demo/panes.c +++ b/demos/gtk-demo/panes.c @@ -148,7 +148,7 @@ do_panes (GtkWidget *do_widget) vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL); g_object_set (vpaned, "margin", 5, NULL); - gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE); hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); gtk_paned_add1 (GTK_PANED (vpaned), hpaned); @@ -178,14 +178,14 @@ do_panes (GtkWidget *do_widget) "Horizontal", "Left", "Right"), - FALSE, FALSE); + FALSE); gtk_box_pack_start (GTK_BOX (vbox), create_pane_options (GTK_PANED (vpaned), "Vertical", "Top", "Bottom"), - FALSE, FALSE); + FALSE); } if (!gtk_widget_get_visible (window)) diff --git a/demos/gtk-demo/search_entry.c b/demos/gtk-demo/search_entry.c index 62045edf81..5655108dff 100644 --- a/demos/gtk-demo/search_entry.c +++ b/demos/gtk-demo/search_entry.c @@ -241,20 +241,20 @@ do_search_entry (GtkWidget *do_widget) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "Search entry demo"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); /* Create our entry */ entry = gtk_search_entry_new (); - gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE); /* Create the find and cancel buttons */ notebook = gtk_notebook_new (); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE); gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE); - gtk_box_pack_start (GTK_BOX (hbox), notebook, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), notebook, FALSE); find_button = gtk_button_new_with_label ("Find"); g_signal_connect (find_button, "clicked", diff --git a/demos/gtk-demo/search_entry2.c b/demos/gtk-demo/search_entry2.c index 376c34e663..650c25633d 100644 --- a/demos/gtk-demo/search_entry2.c +++ b/demos/gtk-demo/search_entry2.c @@ -91,12 +91,12 @@ do_search_entry2 (GtkWidget *do_widget) entry = gtk_search_entry_new (); container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); gtk_widget_set_halign (container, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (container), entry, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (container), entry, FALSE); searchbar = gtk_search_bar_new (); gtk_search_bar_connect_entry (GTK_SEARCH_BAR (searchbar), GTK_ENTRY (entry)); gtk_search_bar_set_show_close_button (GTK_SEARCH_BAR (searchbar), FALSE); gtk_container_add (GTK_CONTAINER (searchbar), container); - gtk_box_pack_start (GTK_BOX (vbox), searchbar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), searchbar, FALSE); /* Hook the search bar to key presses */ g_signal_connect (window, "key-press-event", @@ -104,26 +104,26 @@ do_search_entry2 (GtkWidget *do_widget) /* Help */ label = gtk_label_new ("Start Typing to search"); - gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), label, TRUE); /* Toggle button */ button = gtk_toggle_button_new_with_label ("Search"); g_object_bind_property (button, "active", searchbar, "search-mode-enabled", G_BINDING_BIDIRECTIONAL); - gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), button, TRUE); /* Result */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); label = gtk_label_new ("Result:"); gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_widget_set_margin_start (label, 6); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); label = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); g_signal_connect (entry, "search-changed", G_CALLBACK (search_changed_cb), label); @@ -131,15 +131,15 @@ do_search_entry2 (GtkWidget *do_widget) G_CALLBACK (changed_cb), label); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); label = gtk_label_new ("Signal:"); gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_widget_set_margin_start (label, 6); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); label = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); g_signal_connect (entry, "search-changed", G_CALLBACK (search_changed), label); diff --git a/demos/gtk-demo/sidebar.c b/demos/gtk-demo/sidebar.c index 14b5851236..4d6e9ab067 100644 --- a/demos/gtk-demo/sidebar.c +++ b/demos/gtk-demo/sidebar.c @@ -49,7 +49,7 @@ do_sidebar (GtkWidget *do_widget) box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); sidebar = gtk_stack_sidebar_new (); - gtk_box_pack_start (GTK_BOX (box), sidebar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), sidebar, FALSE); stack = gtk_stack_new (); gtk_stack_set_transition_type (GTK_STACK (stack), GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN); @@ -57,9 +57,9 @@ do_sidebar (GtkWidget *do_widget) /* Separator between sidebar and stack */ widget = gtk_separator_new (GTK_ORIENTATION_VERTICAL); - gtk_box_pack_start (GTK_BOX(box), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX(box), widget, FALSE); - gtk_box_pack_start (GTK_BOX (box), stack, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), stack, TRUE); for (i=0; (c = *(pages+i)) != NULL; i++ ) { diff --git a/demos/gtk-demo/sizegroup.c b/demos/gtk-demo/sizegroup.c index c32fcb942f..4fd1cf6cfb 100644 --- a/demos/gtk-demo/sizegroup.c +++ b/demos/gtk-demo/sizegroup.c @@ -116,7 +116,7 @@ do_sizegroup (GtkWidget *do_widget) /* Create one frame holding color options */ frame = gtk_frame_new ("Color Options"); - gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE); table = gtk_grid_new (); g_object_set (table, "margin", 5, NULL); @@ -129,7 +129,7 @@ do_sizegroup (GtkWidget *do_widget) /* And another frame holding line style options */ frame = gtk_frame_new ("Line Options"); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); table = gtk_grid_new (); g_object_set (table, "margin", 5, NULL); @@ -142,7 +142,7 @@ do_sizegroup (GtkWidget *do_widget) /* And a check button to turn grouping on and off */ check_button = gtk_check_button_new_with_mnemonic ("_Enable grouping"); - gtk_box_pack_start (GTK_BOX (vbox), check_button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), check_button, FALSE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE); g_signal_connect (check_button, "toggled", diff --git a/demos/gtk-demo/spinner.c b/demos/gtk-demo/spinner.c index e9232e8cc2..d1beb5a62e 100644 --- a/demos/gtk-demo/spinner.c +++ b/demos/gtk-demo/spinner.c @@ -53,7 +53,7 @@ do_spinner (GtkWidget *do_widget) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); g_object_set (vbox, "margin", 5, NULL); - gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE); /* Sensitive */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); diff --git a/demos/gtk-demo/textscroll.c b/demos/gtk-demo/textscroll.c index 07d33b810d..0a1b27e060 100644 --- a/demos/gtk-demo/textscroll.c +++ b/demos/gtk-demo/textscroll.c @@ -157,7 +157,7 @@ create_text_view (GtkWidget *hbox, guint timeout; swindow = gtk_scrolled_window_new (NULL, NULL); - gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE); textview = gtk_text_view_new (); gtk_container_add (GTK_CONTAINER (swindow), textview); diff --git a/demos/gtk-demo/toolpalette.c b/demos/gtk-demo/toolpalette.c index 4dfacd393b..6a5cfedb8f 100644 --- a/demos/gtk-demo/toolpalette.c +++ b/demos/gtk-demo/toolpalette.c @@ -473,7 +473,7 @@ do_toolpalette (GtkWidget *do_widget) "text", 0, NULL); gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_orientation), &iter); - gtk_box_pack_start (GTK_BOX (box), combo_orientation, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), combo_orientation, FALSE); /* Style combo box: */ style_model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT); @@ -512,11 +512,11 @@ do_toolpalette (GtkWidget *do_widget) "text", 0, NULL); gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_style), &iter); - gtk_box_pack_start (GTK_BOX (box), combo_style, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), combo_style, FALSE); /* Add hbox */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); - gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), hbox, TRUE); /* Add and fill the ToolPalette: */ palette = gtk_tool_palette_new (); @@ -526,6 +526,7 @@ do_toolpalette (GtkWidget *do_widget) load_special_items (GTK_TOOL_PALETTE (palette)); palette_scroller = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_set_vexpand (palette_scroller, TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (palette_scroller), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); @@ -548,7 +549,7 @@ do_toolpalette (GtkWidget *do_widget) notebook = gtk_notebook_new (); g_object_set (notebook, "margin", 6, NULL); - gtk_box_pack_end (GTK_BOX(hbox), notebook, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX(hbox), notebook, FALSE); /* ===== DnD for tool items ===== */ diff --git a/demos/gtk-demo/tree_store.c b/demos/gtk-demo/tree_store.c index 70c69686ce..d4737b8110 100644 --- a/demos/gtk-demo/tree_store.c +++ b/demos/gtk-demo/tree_store.c @@ -403,7 +403,7 @@ do_tree_store (GtkWidget *do_widget) gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Jonathan's Holiday Card Planning Sheet"), - FALSE, FALSE); + FALSE); sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), @@ -411,7 +411,7 @@ do_tree_store (GtkWidget *do_widget) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE); /* create model */ model = create_model (); diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c index 1f2ab2e78e..76c9cc991c 100644 --- a/demos/widget-factory/widget-factory.c +++ b/demos/widget-factory/widget-factory.c @@ -800,10 +800,11 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget) "use-markup", TRUE, "halign", GTK_ALIGN_START, "valign", GTK_ALIGN_CENTER, + "hexpand", TRUE, "margin", 6, "xalign", 0.0, NULL); - gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (row), label, TRUE); gdk_rgba_parse (&rgba, color); swatch = g_object_new (g_type_from_name ("GtkColorSwatch"), "rgba", &rgba, @@ -815,7 +816,7 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget) NULL); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (box), swatch); - gtk_box_pack_start (GTK_BOX (row), box, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (row), box, FALSE); gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1); row = gtk_widget_get_parent (row); gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE); @@ -911,9 +912,10 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser) "halign", GTK_ALIGN_START, "valign", GTK_ALIGN_CENTER, "margin", 6, + "hexpand", TRUE, "xalign", 0.0, NULL); - gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (row), label, TRUE); gdk_rgba_parse (&rgba, colors[i].color); swatch = g_object_new (g_type_from_name ("GtkColorSwatch"), "rgba", &rgba, @@ -925,7 +927,7 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser) NULL); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (box), swatch); - gtk_box_pack_start (GTK_BOX (row), box, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (row), box, FALSE); gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1); row = gtk_widget_get_parent (row); gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE); diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui index ec0a394db6..9d11516b2b 100644 --- a/demos/widget-factory/widget-factory.ui +++ b/demos/widget-factory/widget-factory.ui @@ -497,6 +497,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. + 0 @@ -505,10 +506,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus. 1 • entry + 1 - - 1 - @@ -527,6 +526,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. + 0 @@ -534,6 +534,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. lrmodel 0 + 1 @@ -541,14 +542,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - - 1 - lrmodel 1 + 1 @@ -556,14 +555,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - - 1 - lrmodel 2 + 1 @@ -571,9 +568,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - - 1 - @@ -986,8 +980,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus. vertical 6 + 1 - + vertical 6 @@ -1076,9 +1071,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - - 1 - @@ -1176,7 +1168,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - 1 3 @@ -1198,6 +1189,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus. vertical 1 6 + 1 in @@ -1208,9 +1200,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - - 1 - @@ -1223,7 +1212,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - 1 1 @@ -1237,7 +1225,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - 1 2 @@ -1252,13 +1239,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - 1 3 - 1 6 @@ -1274,12 +1259,14 @@ Suspendisse feugiat quam quis dolor accumsan cursus. vertical 6 + 1 150 1 always in + 1 1 @@ -1350,14 +1337,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - - 1 - 1 in + 1 1 @@ -1370,13 +1355,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - 1 1 - 1 8 @@ -1618,7 +1601,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. - 1 4 @@ -1831,9 +1813,6 @@ microphone-sensitivity-medium-symbolic center 6 - - 1 - @@ -1861,9 +1840,6 @@ microphone-sensitivity-medium-symbolic center 6 - - 1 - @@ -1893,9 +1869,6 @@ microphone-sensitivity-medium-symbolic center 6 - - 1 - @@ -1925,9 +1898,6 @@ microphone-sensitivity-medium-symbolic center 6 - - 1 - @@ -1958,9 +1928,6 @@ microphone-sensitivity-medium-symbolic center 6 - - 1 - @@ -1989,9 +1956,6 @@ microphone-sensitivity-medium-symbolic center 6 - - 1 - @@ -2416,9 +2380,6 @@ microphone-sensitivity-medium-symbolic - - 1 - @@ -2632,6 +2593,7 @@ microphone-sensitivity-medium-symbolic multiple 0 + 0 @@ -2951,6 +2913,7 @@ microphone-sensitivity-medium-symbolic + 0 vertical @@ -2980,14 +2943,12 @@ microphone-sensitivity-medium-symbolic + 1 - - 1 - @@ -3025,9 +2986,6 @@ microphone-sensitivity-medium-symbolic end edit-delete-symbolic - - 1 - diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c index 8ec4e2d51c..dbc8296f35 100644 --- a/docs/tools/widgets.c +++ b/docs/tools/widgets.c @@ -86,9 +86,9 @@ create_switch (void) widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); sw = gtk_switch_new (); gtk_switch_set_active (GTK_SWITCH (sw), TRUE); - gtk_box_pack_start (GTK_BOX (widget), sw, TRUE, TRUE); + gtk_container_add (GTK_CONTAINER (widget), sw); sw = gtk_switch_new (); - gtk_box_pack_start (GTK_BOX (widget), sw, TRUE, TRUE); + gtk_container_add (GTK_CONTAINER (widget), sw); gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); @@ -150,11 +150,11 @@ create_menu_button (void) gtk_menu_button_set_popup (GTK_MENU_BUTTON (widget), menu); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_container_add (GTK_CONTAINER (vbox), widget); gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Menu Button"), TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Menu Button"), TRUE); return new_widget_info ("menu-button", vbox, SMALL); } @@ -203,10 +203,10 @@ create_lockbutton (void) widget = gtk_lock_button_new (g_object_new (G_TYPE_TEST_PERMISSION, NULL)); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Lock Button"), - FALSE, FALSE); + FALSE); gtk_widget_set_halign (vbox, GTK_ALIGN_CENTER); gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER); @@ -248,11 +248,11 @@ create_radio (void) widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); radio = gtk_radio_button_new_with_mnemonic (NULL, "Radio Button _One"); - gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (widget), radio, FALSE); radio = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (radio), "Radio Button _Two"); - gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (widget), radio, FALSE); radio = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (radio), "Radio Button T_hree"); - gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (widget), radio, FALSE); gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); @@ -404,8 +404,7 @@ create_search_bar (void) gtk_container_add (GTK_CONTAINER (box), widget); view = gtk_text_view_new (); - gtk_widget_show (view); - gtk_box_pack_start (GTK_BOX (box), view, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), view, TRUE); info = new_widget_info ("search-bar", box, SMALL); @@ -423,8 +422,7 @@ create_action_bar (void) box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); view = gtk_text_view_new (); - gtk_widget_show (view); - gtk_box_pack_start (GTK_BOX (box), view, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), view, TRUE); widget = gtk_action_bar_new (); @@ -554,10 +552,10 @@ create_icon_view (void) gtk_container_add (GTK_CONTAINER (widget), icon_view); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Icon View"), - FALSE, FALSE); + FALSE); info = new_widget_info ("icon-view", vbox, MEDIUM); info->no_focus = FALSE; @@ -579,10 +577,10 @@ create_color_button (void) picker = gtk_color_button_new_with_rgba (&color); gtk_widget_set_halign (picker, GTK_ALIGN_CENTER); gtk_widget_set_valign (picker, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Color Button"), - FALSE, FALSE); + FALSE); return new_widget_info ("color-button", vbox, SMALL); } @@ -597,10 +595,10 @@ create_font_button (void) picker = gtk_font_button_new_with_font ("Sans Serif 10"); gtk_widget_set_halign (picker, GTK_ALIGN_CENTER); gtk_widget_set_valign (picker, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Font Button"), - FALSE, FALSE); + FALSE); return new_widget_info ("font-button", vbox, SMALL); } @@ -620,16 +618,16 @@ create_file_button (void) gtk_widget_set_size_request (picker, 150, -1); gtk_widget_set_halign (picker, GTK_ALIGN_CENTER); gtk_widget_set_valign (picker, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox2), picker, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), picker, FALSE); gtk_box_pack_start (GTK_BOX (vbox2), gtk_label_new ("File Button (Files)"), - FALSE, FALSE); + FALSE); gtk_box_pack_start (GTK_BOX (vbox), - vbox2, TRUE, TRUE); + vbox2, TRUE); gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), - FALSE, FALSE); + FALSE); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); picker = gtk_file_chooser_button_new ("File Chooser Button", @@ -640,12 +638,12 @@ create_file_button (void) g_free (path); gtk_widget_set_halign (picker, GTK_ALIGN_CENTER); gtk_widget_set_valign (picker, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox2), picker, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), picker, FALSE); gtk_box_pack_start (GTK_BOX (vbox2), gtk_label_new ("File Button (Select Folder)"), - FALSE, FALSE); + FALSE); gtk_box_pack_start (GTK_BOX (vbox), - vbox2, TRUE, TRUE); + vbox2, TRUE); return new_widget_info ("file-button", vbox, MEDIUM); } @@ -661,17 +659,17 @@ create_separator (void) gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE); gtk_box_pack_start (GTK_BOX (hbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (hbox), gtk_separator_new (GTK_ORIENTATION_VERTICAL), - TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE); + TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); gtk_box_pack_start (GTK_BOX (vbox), g_object_new (GTK_TYPE_LABEL, "label", "Horizontal and Vertical\nSeparators", "justify", GTK_JUSTIFY_CENTER, NULL), - FALSE, FALSE); + FALSE); return new_widget_info ("separator", vbox, MEDIUM); } @@ -698,7 +696,7 @@ create_panes (void) FALSE, FALSE); gtk_box_pack_start (GTK_BOX (hbox), pane, - TRUE, TRUE); + TRUE); pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL); gtk_paned_pack1 (GTK_PANED (pane), g_object_new (GTK_TYPE_FRAME, @@ -712,14 +710,14 @@ create_panes (void) FALSE, FALSE); gtk_box_pack_start (GTK_BOX (hbox), pane, - TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE); + TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); gtk_box_pack_start (GTK_BOX (vbox), g_object_new (GTK_TYPE_LABEL, "label", "Horizontal and Vertical\nPanes", "justify", GTK_JUSTIFY_CENTER, NULL), - FALSE, FALSE); + FALSE); return new_widget_info ("panes", vbox, MEDIUM); } @@ -881,10 +879,10 @@ create_menubar (void) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); gtk_widget_set_halign (widget, GTK_ALIGN_FILL); gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Menu Bar"), - FALSE, FALSE); + FALSE); return new_widget_info ("menubar", vbox, SMALL); } @@ -960,10 +958,10 @@ create_progressbar (void) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); gtk_widget_set_halign (widget, GTK_ALIGN_FILL); gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Progress Bar"), - FALSE, FALSE); + FALSE); return new_widget_info ("progressbar", vbox, SMALL); } @@ -978,10 +976,10 @@ create_level_bar (void) gtk_level_bar_set_value (GTK_LEVEL_BAR (widget), 0.333); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Level Bar"), - FALSE, FALSE); + FALSE); return new_widget_info ("levelbar", vbox, SMALL); } @@ -1013,10 +1011,10 @@ create_scrollbar (void) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); gtk_widget_set_halign (widget, GTK_ALIGN_FILL); gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Scrollbar"), - FALSE, FALSE); + FALSE); return new_widget_info ("scrollbar", vbox, SMALL); } @@ -1032,10 +1030,10 @@ create_spinbutton (void) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); gtk_widget_set_halign (widget, GTK_ALIGN_FILL); gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Spin Button"), - FALSE, FALSE); + FALSE); return new_widget_info ("spinbutton", vbox, SMALL); } @@ -1050,12 +1048,12 @@ create_statusbar (void) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Status Bar"), - FALSE, FALSE); + FALSE); widget = gtk_statusbar_new (); gtk_widget_set_halign (widget, GTK_ALIGN_FILL); gtk_statusbar_push (GTK_STATUSBAR (widget), 0, "Hold on..."); - gtk_box_pack_end (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), widget, FALSE); info = new_widget_info ("statusbar", vbox, SMALL); @@ -1074,18 +1072,18 @@ create_scales (void) gtk_box_pack_start (GTK_BOX (hbox), gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0.0, 100.0, 1.0), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (hbox), gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL, 0.0, 100.0, 1.0), - TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE); + TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); gtk_box_pack_start (GTK_BOX (vbox), g_object_new (GTK_TYPE_LABEL, "label", "Horizontal and Vertical\nScales", "justify", GTK_JUSTIFY_CENTER, NULL), - FALSE, FALSE); + FALSE); return new_widget_info ("scales", vbox, MEDIUM);} static WidgetInfo * @@ -1100,10 +1098,10 @@ create_image (void) gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); - gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Image"), - FALSE, FALSE); + FALSE); return new_widget_info ("image", vbox, SMALL); } @@ -1121,10 +1119,10 @@ create_spinner (void) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3); gtk_widget_set_halign (widget, GTK_ALIGN_CENTER); gtk_widget_set_valign (widget, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Spinner"), - FALSE, FALSE); + FALSE); return new_widget_info ("spinner", vbox, SMALL); } @@ -1143,7 +1141,7 @@ create_volume_button (void) gtk_container_add (GTK_CONTAINER (widget), box); button = gtk_volume_button_new (); - gtk_box_pack_end (GTK_BOX (box), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (box), button, FALSE); gtk_scale_button_set_value (GTK_SCALE_BUTTON (button), 33); popup = gtk_scale_button_get_popup (GTK_SCALE_BUTTON (button)); @@ -1192,10 +1190,10 @@ create_appchooserbutton (void) picker = gtk_app_chooser_button_new ("text/plain"); gtk_widget_set_halign (picker, GTK_ALIGN_CENTER); gtk_widget_set_valign (picker, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Application Button"), - FALSE, FALSE); + FALSE); return new_widget_info ("appchooserbutton", vbox, SMALL); } @@ -1278,10 +1276,10 @@ create_placessidebar (void) gtk_widget_set_halign (bar, GTK_ALIGN_CENTER); gtk_widget_set_valign (bar, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Places Sidebar"), - FALSE, FALSE); + FALSE); return new_widget_info ("placessidebar", vbox, ASIS); } @@ -1311,11 +1309,11 @@ create_stack (void) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_box_pack_start (GTK_BOX (vbox), switcher, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (vbox), stack, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), switcher, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), stack, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Stack"), - FALSE, FALSE); + FALSE); return new_widget_info ("stack", vbox, ASIS); } @@ -1345,11 +1343,11 @@ create_stack_switcher (void) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_box_pack_start (GTK_BOX (vbox), switcher, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (vbox), stack, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), switcher, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), stack, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Stack Switcher"), - FALSE, FALSE); + FALSE); return new_widget_info ("stackswitcher", vbox, ASIS); } @@ -1381,9 +1379,9 @@ create_sidebar (void) frame = gtk_frame_new (NULL); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (hbox), sidebar, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (hbox), gtk_separator_new (GTK_ORIENTATION_VERTICAL), FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (hbox), stack, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), sidebar, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), gtk_separator_new (GTK_ORIENTATION_VERTICAL), FALSE); + gtk_box_pack_start (GTK_BOX (hbox), stack, TRUE); gtk_container_add (GTK_CONTAINER (frame), hbox); return new_widget_info ("sidebar", frame, ASIS); @@ -1475,9 +1473,9 @@ create_flow_box (void) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Flow Box"), - FALSE, FALSE); + FALSE); info = new_widget_info ("flow-box", vbox, ASIS); info->no_focus = FALSE; diff --git a/examples/search-bar.c b/examples/search-bar.c index 8617ed657a..3d3a1adf71 100644 --- a/examples/search-bar.c +++ b/examples/search-bar.c @@ -27,15 +27,13 @@ activate_cb (GtkApplication *app, box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_container_add (GTK_CONTAINER (search_bar), box); - gtk_widget_show (box); entry = gtk_search_entry_new (); - gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE); - gtk_widget_show (entry); + gtk_widget_set_hexpand (entry, TRUE); + gtk_box_pack_start (GTK_BOX (box), entry, TRUE); menu_button = gtk_menu_button_new (); - gtk_box_pack_start (GTK_BOX (box), menu_button, FALSE, FALSE); - gtk_widget_show (menu_button); + gtk_box_pack_start (GTK_BOX (box), menu_button, FALSE); gtk_search_bar_connect_entry (GTK_SEARCH_BAR (search_bar), GTK_ENTRY (entry)); 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; }; @@ -275,25 +270,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: * @@ -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 ("%s\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 @@