diff options
| author | Timm Bäder <mail@baedert.org> | 2017-04-21 18:59:59 +0200 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2017-04-25 20:30:37 +0200 |
| commit | 5729ea7744c2a41ae8fb833db6690a6aa5ad7a84 (patch) | |
| tree | ddda46f8b6c07a999ee9b844ec3a9c863b55a850 /tests | |
| parent | 8f4c0bea6558dc98a2abd7e63436b1ce4caf689e (diff) | |
| download | gtk+-5729ea7744c2a41ae8fb833db6690a6aa5ad7a84.tar.gz | |
box: Remove expand child property
GtkWidget already has hexpand/vexpand properties.
Diffstat (limited to 'tests')
60 files changed, 830 insertions, 836 deletions
diff --git a/tests/flicker.c b/tests/flicker.c index 85890f938e..8cb1e197e5 100644 --- a/tests/flicker.c +++ b/tests/flicker.c @@ -75,12 +75,12 @@ create_flicker (void) spinbutton7_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton7 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton7_adj), 1, 0); gtk_widget_show (spinbutton7); - gtk_box_pack_start (GTK_BOX (hbox2), spinbutton7, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox2), spinbutton7, TRUE); spinbutton8_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton8 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton8_adj), 1, 0); gtk_widget_show (spinbutton8); - gtk_box_pack_start (GTK_BOX (hbox2), spinbutton8, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox2), spinbutton8, TRUE); vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show (vbox1); @@ -89,42 +89,42 @@ create_flicker (void) spinbutton9_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton9 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton9_adj), 1, 0); gtk_widget_show (spinbutton9); - gtk_box_pack_start (GTK_BOX (vbox1), spinbutton9, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox1), spinbutton9, FALSE); spinbutton10_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton10 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton10_adj), 1, 0); gtk_widget_show (spinbutton10); - gtk_box_pack_start (GTK_BOX (vbox1), spinbutton10, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox1), spinbutton10, FALSE); spinbutton11_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton11 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton11_adj), 1, 0); gtk_widget_show (spinbutton11); - gtk_box_pack_start (GTK_BOX (vbox1), spinbutton11, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox1), spinbutton11, FALSE); spinbutton12_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton12 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton12_adj), 1, 0); gtk_widget_show (spinbutton12); - gtk_box_pack_start (GTK_BOX (vbox1), spinbutton12, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox1), spinbutton12, FALSE); spinbutton13_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton13 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton13_adj), 1, 0); gtk_widget_show (spinbutton13); - gtk_box_pack_start (GTK_BOX (vbox1), spinbutton13, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox1), spinbutton13, FALSE); spinbutton14_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton14 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton14_adj), 1, 0); gtk_widget_show (spinbutton14); - gtk_box_pack_start (GTK_BOX (vbox1), spinbutton14, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox1), spinbutton14, FALSE); spinbutton15_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton15 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton15_adj), 1, 0); gtk_widget_show (spinbutton15); - gtk_box_pack_start (GTK_BOX (vbox1), spinbutton15, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox1), spinbutton15, FALSE); spinbutton16_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton16 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton16_adj), 1, 0); gtk_widget_show (spinbutton16); - gtk_box_pack_start (GTK_BOX (vbox1), spinbutton16, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox1), spinbutton16, FALSE); vpaned1 = gtk_paned_new (GTK_ORIENTATION_VERTICAL); gtk_widget_show (vpaned1); @@ -138,17 +138,17 @@ create_flicker (void) spinbutton17_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton17 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton17_adj), 1, 0); gtk_widget_show (spinbutton17); - gtk_box_pack_start (GTK_BOX (hbox1), spinbutton17, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox1), spinbutton17, TRUE); spinbutton18_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton18 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton18_adj), 1, 0); gtk_widget_show (spinbutton18); - gtk_box_pack_start (GTK_BOX (hbox1), spinbutton18, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox1), spinbutton18, TRUE); spinbutton19_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton19 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton19_adj), 1, 0); gtk_widget_show (spinbutton19); - gtk_box_pack_start (GTK_BOX (hbox1), spinbutton19, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox1), spinbutton19, TRUE); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_widget_show (vbox2); @@ -157,42 +157,42 @@ create_flicker (void) spinbutton20_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton20 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton20_adj), 1, 0); gtk_widget_show (spinbutton20); - gtk_box_pack_start (GTK_BOX (vbox2), spinbutton20, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), spinbutton20, FALSE); spinbutton21_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton21 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton21_adj), 1, 0); gtk_widget_show (spinbutton21); - gtk_box_pack_start (GTK_BOX (vbox2), spinbutton21, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), spinbutton21, FALSE); spinbutton22_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton22 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton22_adj), 1, 0); gtk_widget_show (spinbutton22); - gtk_box_pack_start (GTK_BOX (vbox2), spinbutton22, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), spinbutton22, FALSE); spinbutton23_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton23 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton23_adj), 1, 0); gtk_widget_show (spinbutton23); - gtk_box_pack_start (GTK_BOX (vbox2), spinbutton23, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), spinbutton23, FALSE); spinbutton24_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton24 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton24_adj), 1, 0); gtk_widget_show (spinbutton24); - gtk_box_pack_start (GTK_BOX (vbox2), spinbutton24, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), spinbutton24, FALSE); spinbutton25_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton25 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton25_adj), 1, 0); gtk_widget_show (spinbutton25); - gtk_box_pack_start (GTK_BOX (vbox2), spinbutton25, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), spinbutton25, FALSE); spinbutton26_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton26 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton26_adj), 1, 0); gtk_widget_show (spinbutton26); - gtk_box_pack_start (GTK_BOX (vbox2), spinbutton26, TRUE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), spinbutton26, FALSE); spinbutton27_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10); spinbutton27 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton27_adj), 1, 0); gtk_widget_show (spinbutton27); - gtk_box_pack_end (GTK_BOX (vbox2), spinbutton27, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox2), spinbutton27, FALSE); return window1; } diff --git a/tests/gdkgears.c b/tests/gdkgears.c index 19f8068f42..7ee6458fc9 100644 --- a/tests/gdkgears.c +++ b/tests/gdkgears.c @@ -175,26 +175,26 @@ main (int argc, char *argv[]) gtk_gears_set_fps_label (GTK_GEARS (gears), GTK_LABEL (fps_label)); spinner = gtk_spinner_new (); - gtk_box_pack_end (GTK_BOX (hbox), spinner, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (hbox), spinner, FALSE); gtk_widget_show (spinner); gtk_spinner_start (GTK_SPINNER (spinner)); check = gtk_check_button_new_with_label ("Animate spinner"); - gtk_box_pack_end (GTK_BOX (hbox), check, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (hbox), check, FALSE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE); gtk_widget_show (check); g_signal_connect (check, "toggled", G_CALLBACK (toggle_spin), spinner); check = gtk_check_button_new_with_label ("Alpha"); - gtk_box_pack_end (GTK_BOX (hbox), check, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (hbox), check, FALSE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE); gtk_widget_show (check); g_signal_connect (check, "toggled", G_CALLBACK (toggle_alpha), gears); check = gtk_check_button_new_with_label ("Overlay"); - gtk_box_pack_end (GTK_BOX (hbox), check, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (hbox), check, FALSE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE); gtk_widget_show (check); g_signal_connect (check, "toggled", @@ -207,7 +207,7 @@ main (int argc, char *argv[]) gtk_container_add (GTK_CONTAINER (popover), label); gtk_menu_button_set_popover (GTK_MENU_BUTTON (button), popover); gtk_widget_show (button); - gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (hbox), button, FALSE); scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), diff --git a/tests/motion-compression.c b/tests/motion-compression.c index 8521dd92e1..5cd7bf5f89 100644 --- a/tests/motion-compression.c +++ b/tests/motion-compression.c @@ -54,15 +54,16 @@ main (int argc, char **argv) adjustment = gtk_adjustment_new (20, 0, 200, 1, 10, 0); scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adjustment); - gtk_box_pack_end (GTK_BOX (vbox), scale, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), scale, FALSE); label = gtk_label_new ("Event processing time (ms):"); gtk_widget_set_halign (label, GTK_ALIGN_CENTER); - gtk_box_pack_end (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), label, FALSE); da = gtk_drawing_area_new (); gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), on_draw, NULL, NULL); - gtk_box_pack_end (GTK_BOX (vbox), da, TRUE, TRUE); + gtk_widget_set_vexpand (da, TRUE); + gtk_box_pack_end (GTK_BOX (vbox), da, TRUE); g_signal_connect (window, "motion-notify-event", G_CALLBACK (on_motion_notify), NULL); diff --git a/tests/overlayscroll.c b/tests/overlayscroll.c index 2e7d3bfd13..b6c8179645 100644 --- a/tests/overlayscroll.c +++ b/tests/overlayscroll.c @@ -65,7 +65,7 @@ main (int argc, char *argv[]) GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), sw, TRUE); content = get_content (); diff --git a/tests/print-editor.c b/tests/print-editor.c index c55978969a..c111b2d1b5 100644 --- a/tests/print-editor.c +++ b/tests/print-editor.c @@ -321,15 +321,15 @@ create_custom_widget (GtkPrintOperation *operation, vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); 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); gtk_widget_show (hbox); label = gtk_label_new ("Font:"); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE); gtk_widget_show (label); font = gtk_font_button_new_with_font (data->font); - gtk_box_pack_start (GTK_BOX (hbox), font, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), font, FALSE); gtk_widget_show (font); data->font_button = font; diff --git a/tests/syncscroll.c b/tests/syncscroll.c index 7062efa8fb..39556f357a 100644 --- a/tests/syncscroll.c +++ b/tests/syncscroll.c @@ -32,7 +32,7 @@ main (int argc, char *argv[]) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_EXTERNAL); - gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), sw, TRUE); tv = gtk_text_view_new (); fill_text_view (tv, "Left"); gtk_container_add (GTK_CONTAINER (sw), tv); @@ -43,7 +43,7 @@ main (int argc, char *argv[]) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_EXTERNAL); - gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), sw, TRUE); tv = gtk_text_view_new (); fill_text_view (tv, "Middle"); gtk_container_add (GTK_CONTAINER (sw), tv); @@ -52,7 +52,7 @@ main (int argc, char *argv[]) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_EXTERNAL); - gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), sw, TRUE); tv = gtk_text_view_new (); fill_text_view (tv, "Right"); gtk_container_add (GTK_CONTAINER (sw), tv); diff --git a/tests/testaccel.c b/tests/testaccel.c index 712d3eca54..262d2e2fef 100644 --- a/tests/testaccel.c +++ b/tests/testaccel.c @@ -71,10 +71,11 @@ key_test (void) gtk_window_set_default_size (GTK_WINDOW (window), 400, 400); sw = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_set_hexpand (sw, TRUE); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); gtk_widget_show (box); gtk_container_add (GTK_CONTAINER (window), box); - gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), sw, TRUE); store = gtk_list_store_new (3, G_TYPE_INT, G_TYPE_UINT, G_TYPE_UINT); tv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store)); diff --git a/tests/testactionbar.c b/tests/testactionbar.c index 6b1eb6046a..1c69204108 100644 --- a/tests/testactionbar.c +++ b/tests/testactionbar.c @@ -113,7 +113,7 @@ activate (GApplication *gapp) "row-spacing", 12, "column-spacing", 12, NULL); - gtk_box_pack_start (GTK_BOX (box), grid, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), grid, FALSE); label = gtk_label_new ("Start"); gtk_widget_set_halign (label, GTK_ALIGN_END); @@ -147,7 +147,7 @@ activate (GApplication *gapp) gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1); gtk_grid_attach (GTK_GRID (grid), check, 1, 3, 1, 1); - gtk_box_pack_end (GTK_BOX (box), bar, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (box), bar, FALSE); gtk_container_add (GTK_CONTAINER (window), box); gtk_widget_show (window); } diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c index 160d6a5ee6..8673c610d2 100644 --- a/tests/testadjustsize.c +++ b/tests/testadjustsize.c @@ -337,7 +337,7 @@ open_valigned_label_window (void) label = gtk_label_new ("Both labels expand"); gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), label, TRUE); label = gtk_label_new ("Some wrapping text with width-chars = 15 and max-width-chars = 35"); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); @@ -353,7 +353,7 @@ open_valigned_label_window (void) gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); gtk_widget_set_halign (frame, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), frame, TRUE); gtk_window_present (GTK_WINDOW (window)); } diff --git a/tests/testanimation.c b/tests/testanimation.c index a42d856c16..5cbfa204f9 100644 --- a/tests/testanimation.c +++ b/tests/testanimation.c @@ -330,13 +330,13 @@ do_image (const char *filename) g_free (escaped); g_free (str); - 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_pixbuf (NULL); gtk_container_add (GTK_CONTAINER (frame), image); @@ -384,13 +384,13 @@ do_nonprogressive (const gchar *filename) g_free (escaped); g_free (str); - 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_file (filename); gtk_container_add (GTK_CONTAINER (frame), image); diff --git a/tests/testappchooserbutton.c b/tests/testappchooserbutton.c index 7d3ed69166..c96dc11f77 100644 --- a/tests/testappchooserbutton.c +++ b/tests/testappchooserbutton.c @@ -76,22 +76,22 @@ main (int argc, gtk_container_add (GTK_CONTAINER (toplevel), box); combobox = gtk_app_chooser_button_new ("image/jpeg"); - gtk_box_pack_start (GTK_BOX (box), combobox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), combobox, TRUE); g_signal_connect (combobox, "changed", G_CALLBACK (combo_changed_cb), NULL); w = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (w), "<b>Selected app info</b>"); - gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), w, TRUE); w = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); - gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), w, TRUE); sel_image = gtk_image_new (); - gtk_box_pack_start (GTK_BOX (w), sel_image, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (w), sel_image, TRUE); sel_name = gtk_label_new (NULL); - gtk_box_pack_start (GTK_BOX (w), sel_name, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (w), sel_name, TRUE); gtk_app_chooser_button_set_heading (GTK_APP_CHOOSER_BUTTON (combobox), "Choose one, <i>not</i> two"); gtk_app_chooser_button_append_separator (GTK_APP_CHOOSER_BUTTON (combobox)); diff --git a/tests/testassistant.c b/tests/testassistant.c index fa966d892f..28774f863b 100644 --- a/tests/testassistant.c +++ b/tests/testassistant.c @@ -377,13 +377,13 @@ create_nonlinear_assistant (GtkWidget *widget) page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); button = gtk_radio_button_new_with_label (NULL, "branch A"); - gtk_box_pack_start (GTK_BOX (page), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (page), button, FALSE); g_signal_connect (G_OBJECT (button), "toggled", G_CALLBACK (select_branch), GINT_TO_POINTER ('A')); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); button = gtk_radio_button_new_with_label (gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)), "branch B"); - gtk_box_pack_start (GTK_BOX (page), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (page), button, FALSE); g_signal_connect (G_OBJECT (button), "toggled", G_CALLBACK (select_branch), GINT_TO_POINTER ('B')); gtk_assistant_append_page (GTK_ASSISTANT (assistant), page); @@ -650,7 +650,6 @@ create_page_flipping_assistant (GtkWidget *widget) page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_pack_start (GTK_BOX (page), get_test_page ("Page 2"), - TRUE, TRUE); gtk_assistant_append_page (GTK_ASSISTANT (assistant), page); gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Page 2"); @@ -722,7 +721,7 @@ main (int argc, gchar *argv[]) g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (buttons[i].func), NULL); - gtk_box_pack_start (GTK_BOX (box), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), button, TRUE); } gtk_widget_show (window); diff --git a/tests/testbaseline.c b/tests/testbaseline.c index a6e1d7eafc..98c2866910 100644 --- a/tests/testbaseline.c +++ b/tests/testbaseline.c @@ -100,7 +100,7 @@ main (int argc, for (j = 0; j < 2; j++) { hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); char *aligns_names[] = { "FILL", "BASELINE" }; GtkAlign aligns[] = { GTK_ALIGN_FILL, GTK_ALIGN_BASELINE}; @@ -136,7 +136,7 @@ main (int argc, } grid_hbox = 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); combo = gtk_combo_box_text_new (); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), baseline_pos_str[0]); @@ -148,7 +148,7 @@ main (int argc, for (j = 0; j < 2; j++) { 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); g_signal_connect (G_OBJECT (combo), "changed", G_CALLBACK (baseline_position_changed), hbox); @@ -227,7 +227,7 @@ main (int argc, vbox, gtk_label_new ("grid")); grid_hbox = 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 ("Align me:"); gtk_widget_set_valign (label, GTK_ALIGN_BASELINE); @@ -295,7 +295,7 @@ main (int argc, gtk_container_add (GTK_CONTAINER (hbox), grid); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); adjustment = gtk_adjustment_new (0.0, -1.0, 5.0, 1.0, 1.0, 0.0); spin = gtk_spin_button_new (adjustment, 1.0, 0); @@ -320,7 +320,7 @@ main (int argc, vbox, gtk_label_new ("button box")); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); adjustment = gtk_adjustment_new (34.0, 1.0, 64.0, 1.0, 1.0, 0.0); spin = gtk_spin_button_new (adjustment, 1.0, 0); @@ -333,7 +333,7 @@ main (int argc, for (j = 0; j < 3; j++) { hbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); gtk_box_set_baseline_position (GTK_BOX (hbox), j); diff --git a/tests/testbbox.c b/tests/testbbox.c index 5fc76db7bb..754bf92d3f 100644 --- a/tests/testbbox.c +++ b/tests/testbbox.c @@ -129,7 +129,7 @@ main (int argc, /* GtkHButtonBox */ hbbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (vbox), hbbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbbox, TRUE); for (i = 0; i < N_BUTTONS; i++) { buttons[i] = gtk_button_new_with_label (strings[i]); @@ -142,27 +142,27 @@ main (int argc, /* GtkVButtonBox */ vbbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL); - gtk_box_pack_start (GTK_BOX (vbox), vbbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), vbbox, TRUE); /* Options */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); combo_types = gtk_combo_box_text_new (); populate_combo_with (GTK_COMBO_BOX_TEXT (combo_types), types); g_signal_connect (G_OBJECT (combo_types), "changed", G_CALLBACK (combo_types_changed_cb), buttons); - gtk_box_pack_start (GTK_BOX (hbox), combo_types, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), combo_types, TRUE); combo_styles = gtk_combo_box_text_new (); populate_combo_with (GTK_COMBO_BOX_TEXT (combo_styles), styles); g_signal_connect (G_OBJECT (combo_styles), "changed", G_CALLBACK (combo_changed_cb), NULL); - gtk_box_pack_start (GTK_BOX (hbox), combo_styles, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), combo_styles, TRUE); option = gtk_check_button_new_with_label ("Help is secondary"); g_signal_connect (G_OBJECT (option), "toggled", G_CALLBACK (option_cb), buttons[N_BUTTONS - 1]); - gtk_box_pack_start (GTK_BOX (hbox), option, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), option, FALSE); gtk_widget_show (window); gtk_widget_hide (vbbox); diff --git a/tests/testbox.c b/tests/testbox.c index 0a1b391bb7..1125f70e64 100644 --- a/tests/testbox.c +++ b/tests/testbox.c @@ -1,19 +1,6 @@ #include <gtk/gtk.h> static void -expand_toggled (GtkToggleButton *b, GtkWidget *w) -{ - gboolean active; - GtkWidget *parent; - - active = gtk_toggle_button_get_active (b); - parent = gtk_widget_get_parent (w); - gtk_container_child_set (GTK_CONTAINER (parent), w, - "expand", active, - NULL); -} - -static void fill_toggled (GtkToggleButton *b, GtkWidget *w) { gboolean active; @@ -34,7 +21,7 @@ edit_widget (GtkWidget *button) GtkWidget *label; GtkWidget *entry; GtkWidget *check; - gboolean expand, fill; + gboolean fill; dialog = GTK_WIDGET (g_object_get_data (G_OBJECT (button), "dialog")); @@ -71,22 +58,11 @@ edit_widget (GtkWidget *button) gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1); gtk_grid_attach (GTK_GRID (grid), check, 1, 1, 1, 1); - label = gtk_label_new ("Expand:"); - gtk_widget_set_halign (label, GTK_ALIGN_END); - check = gtk_check_button_new (); - gtk_box_query_child_packing (GTK_BOX (gtk_widget_get_parent (button)), - button, &expand, NULL, NULL); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), expand); - g_signal_connect (check, "toggled", - G_CALLBACK (expand_toggled), button); - gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1); - gtk_grid_attach (GTK_GRID (grid), check, 1, 2, 1, 1); - label = gtk_label_new ("Fill:"); gtk_widget_set_halign (label, GTK_ALIGN_END); check = gtk_check_button_new (); gtk_box_query_child_packing (GTK_BOX (gtk_widget_get_parent (button)), - button, NULL, &fill, NULL); + button, &fill, NULL); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), fill); g_signal_connect (check, "toggled", G_CALLBACK (fill_toggled), button); @@ -138,12 +114,12 @@ main (int argc, char *argv[]) gtk_container_add (GTK_CONTAINER (window), vbox); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (box), test_widget ("1"), FALSE, TRUE); - gtk_box_pack_start (GTK_BOX (box), test_widget ("2"), FALSE, TRUE); - gtk_box_pack_start (GTK_BOX (box), test_widget ("3"), FALSE, TRUE); - gtk_box_pack_start (GTK_BOX (box), test_widget ("4"), FALSE, TRUE); - gtk_box_pack_end (GTK_BOX (box), test_widget ("5"), FALSE, TRUE); - gtk_box_pack_end (GTK_BOX (box), test_widget ("6"), FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box), test_widget ("1"), TRUE); + gtk_box_pack_start (GTK_BOX (box), test_widget ("2"), TRUE); + gtk_box_pack_start (GTK_BOX (box), test_widget ("3"), TRUE); + gtk_box_pack_start (GTK_BOX (box), test_widget ("4"), TRUE); + gtk_box_pack_end (GTK_BOX (box), test_widget ("5"), TRUE); + gtk_box_pack_end (GTK_BOX (box), test_widget ("6"), TRUE); gtk_box_set_center_widget (GTK_BOX (box), test_widget ("center")); gtk_container_add (GTK_CONTAINER (vbox), box); @@ -162,14 +138,14 @@ main (int argc, char *argv[]) gtk_widget_set_halign (b, GTK_ALIGN_CENTER); label = gtk_label_new ("Spacing:"); gtk_widget_set_halign (label, GTK_ALIGN_END); - gtk_box_pack_start (GTK_BOX (b), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (b), label, TRUE); spin = gtk_spin_button_new_with_range (0, 10, 1); gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE); gtk_widget_set_halign (spin, GTK_ALIGN_START); g_signal_connect (spin, "value-changed", G_CALLBACK (spacing_changed), box); - gtk_box_pack_start (GTK_BOX (b), spin, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (b), spin, TRUE); gtk_container_add (GTK_CONTAINER (vbox), b); gtk_widget_show (window); diff --git a/tests/testboxcss.c b/tests/testboxcss.c index a5c57a72ad..013eea309a 100644 --- a/tests/testboxcss.c +++ b/tests/testboxcss.c @@ -172,15 +172,16 @@ main (gint argc, gchar **argv) toolbar = gtk_toolbar_new (); gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_TEXT); - gtk_box_pack_start (GTK_BOX (main_box), toolbar, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (main_box), toolbar, TRUE); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (main_box), box, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (main_box), box, TRUE); container = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_min_content_width (GTK_SCROLLED_WINDOW (container), 200); gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (container), 200); - gtk_box_pack_start (GTK_BOX (main_box), container, TRUE, TRUE); + gtk_widget_set_vexpand (container, TRUE); + gtk_container_add (GTK_CONTAINER (main_box), container); child = gtk_text_view_new_with_buffer (css); gtk_container_add (GTK_CONTAINER (container), child); g_signal_connect (css, @@ -196,28 +197,28 @@ main (gint argc, gchar **argv) gtk_text_view_get_buffer (GTK_TEXT_VIEW (child))); container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (main_box), container, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (main_box), container, TRUE); child = gtk_switch_new (); gtk_switch_set_active (GTK_SWITCH (child), gtk_widget_get_default_direction () == GTK_TEXT_DIR_LTR); g_signal_connect (child, "notify::active", G_CALLBACK (set_orientation), NULL); - gtk_box_pack_start (GTK_BOX (container), child, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (container), child, FALSE); child = gtk_label_new ("left-to-right"); - gtk_box_pack_start (GTK_BOX (container), child, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (container), child, FALSE); child = gtk_button_new_with_label ("Add button"); g_signal_connect_swapped (child, "clicked", G_CALLBACK (add_button), box); - gtk_box_pack_end (GTK_BOX (container), child, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (container), child, FALSE); child = gtk_button_new_with_label ("Add toolbutton"); g_signal_connect_swapped (child, "clicked", G_CALLBACK (add_toolbutton), toolbar); - gtk_box_pack_end (GTK_BOX (container), child, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (container), child, FALSE); add_toolbutton (GTK_TOOLBAR (toolbar)); add_toolbutton (GTK_TOOLBAR (toolbar)); diff --git a/tests/testcalendar.c b/tests/testcalendar.c index 886e711c8a..4cd6c74291 100644 --- a/tests/testcalendar.c +++ b/tests/testcalendar.c @@ -495,7 +495,7 @@ create_calendar(void) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, DEF_PAD_SMALL); frame = create_frame ("<b>Options</b>", vbox, GTK_ALIGN_FILL, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (rpane), frame, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (rpane), frame, TRUE); size = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); context = gtk_widget_get_style_context (calendar); @@ -517,9 +517,9 @@ create_calendar(void) gtk_size_group_add_widget (size, label); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); /* Build the width entry */ @@ -538,9 +538,9 @@ create_calendar(void) gtk_size_group_add_widget (size, label); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); /* Build the height entry */ @@ -559,15 +559,15 @@ create_calendar(void) gtk_size_group_add_widget (size, label); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); /* Build the right details frame */ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, DEF_PAD_SMALL); frame = create_frame ("<b>Details</b>", vbox, GTK_ALIGN_FILL, GTK_ALIGN_FILL); - gtk_box_pack_start (GTK_BOX (rpane), frame, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (rpane), frame, TRUE); details = gtk_text_view_new(); calendar_data.details_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (details)); @@ -585,12 +585,12 @@ create_calendar(void) GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox), scroller, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), scroller, TRUE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL); gtk_widget_set_halign (hbox, GTK_ALIGN_START); gtk_widget_set_valign (hbox, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); button = gtk_button_new_with_mnemonic ("Demonstrate _Details"); @@ -599,7 +599,7 @@ create_calendar(void) G_CALLBACK (demonstrate_details), &calendar_data); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); button = gtk_button_new_with_mnemonic ("_Reset Details"); @@ -608,24 +608,24 @@ create_calendar(void) G_CALLBACK (reset_details), &calendar_data); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); toggle = gtk_check_button_new_with_mnemonic ("_Use Details"); g_signal_connect (toggle, "toggled", G_CALLBACK(calendar_toggle_details), &calendar_data); - gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), toggle, TRUE); /* Build the Right frame with the flags in */ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); frame = create_expander ("<b>Flags</b>", vbox, GTK_ALIGN_FILL, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (rpane), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (rpane), frame, TRUE); for (i = 0; i < G_N_ELEMENTS (calendar_data.settings); i++) { toggle = gtk_check_button_new_with_mnemonic(flags[i].label); - gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), toggle, TRUE); calendar_data.flag_checkboxes[i] = toggle; g_signal_connect (toggle, "toggled", @@ -644,25 +644,25 @@ create_calendar(void) frame = create_frame ("<b>Signal Events</b>", vbox, GTK_ALIGN_FILL, GTK_ALIGN_CENTER); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); label = gtk_label_new ("Signal:"); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); calendar_data.last_sig = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (hbox), calendar_data.last_sig, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), calendar_data.last_sig, TRUE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); label = gtk_label_new ("Previous signal:"); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); calendar_data.prev_sig = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev_sig, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev_sig, TRUE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); label = gtk_label_new ("Second previous signal:"); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); calendar_data.prev2_sig = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev2_sig, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev2_sig, TRUE); /* * Glue everything together @@ -678,15 +678,15 @@ create_calendar(void) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, DEF_PAD_SMALL); gtk_box_pack_start (GTK_BOX (vbox), hpaned, - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), - FALSE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (vbox), frame, - FALSE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), - FALSE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (vbox), bbox, - FALSE, TRUE); + TRUE); gtk_container_add (GTK_CONTAINER (window), vbox); diff --git a/tests/testcellarea.c b/tests/testcellarea.c index eae9f02c3f..099e7c0b27 100644 --- a/tests/testcellarea.c +++ b/tests/testcellarea.c @@ -188,27 +188,27 @@ simple_cell_area (void) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); frame = gtk_frame_new (NULL); - gtk_widget_show (hbox); - gtk_widget_show (frame); + gtk_widget_set_hexpand (frame, TRUE); gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); gtk_widget_set_halign (frame, GTK_ALIGN_FILL); gtk_container_add (GTK_CONTAINER (frame), iconview); - gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE, TRUE); + + gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE); /* Now add some controls */ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4); gtk_widget_show (vbox); - gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE); widget = gtk_combo_box_text_new (); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Horizontal"); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Vertical"); gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (orientation_changed), iconview); @@ -216,7 +216,7 @@ simple_cell_area (void) widget = gtk_check_button_new_with_label ("Align 2nd Cell"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE); g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (align_cell_2_toggled), iconview); @@ -224,7 +224,7 @@ simple_cell_area (void) widget = gtk_check_button_new_with_label ("Align 3rd Cell"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE); g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (align_cell_3_toggled), iconview); @@ -233,7 +233,7 @@ simple_cell_area (void) widget = gtk_check_button_new_with_label ("Expand 1st Cell"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE); g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (expand_cell_1_toggled), iconview); @@ -241,7 +241,7 @@ simple_cell_area (void) widget = gtk_check_button_new_with_label ("Expand 2nd Cell"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE); g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (expand_cell_2_toggled), iconview); @@ -249,7 +249,7 @@ simple_cell_area (void) widget = gtk_check_button_new_with_label ("Expand 3rd Cell"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE); g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (expand_cell_3_toggled), iconview); @@ -434,26 +434,26 @@ focus_cell_area (void) iconview = focus_iconview (FALSE, &focus_renderer, &sibling_renderer); frame = gtk_frame_new (NULL); - gtk_widget_show (frame); + gtk_widget_set_hexpand (frame, TRUE); gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); gtk_widget_set_halign (frame, GTK_ALIGN_FILL); gtk_container_add (GTK_CONTAINER (frame), iconview); - gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE, TRUE); + gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE); /* Now add some controls */ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4); gtk_widget_show (vbox); - gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE); widget = gtk_combo_box_text_new (); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Horizontal"); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Vertical"); gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (orientation_changed), iconview); @@ -461,7 +461,7 @@ focus_cell_area (void) widget = gtk_check_button_new_with_label ("Focus Sibling"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE); gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE); g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (focus_sibling_toggled), iconview); @@ -531,45 +531,43 @@ background_area (void) gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_width_chars (GTK_LABEL (label), 40); gtk_widget_show (label); - gtk_box_pack_start (GTK_BOX (main_vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (main_vbox), label, FALSE); iconview = focus_iconview (TRUE, NULL, NULL); frame = gtk_frame_new (NULL); - gtk_widget_show (frame); + gtk_widget_set_hexpand (frame, TRUE); gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); gtk_widget_set_halign (frame, GTK_ALIGN_FILL); gtk_container_add (GTK_CONTAINER (frame), iconview); - gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE, TRUE); + gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE); /* Now add some controls */ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4); gtk_widget_show (vbox); - gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE); + gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE); widget = gtk_combo_box_text_new (); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Horizontal"); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Vertical"); gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (orientation_changed), iconview); widget = gtk_spin_button_new_with_range (0, 10, 1); label = gtk_label_new ("Cell spacing"); + gtk_widget_set_hexpand (label, TRUE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); - gtk_widget_show (hbox); - gtk_widget_show (label); - gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); g_signal_connect (G_OBJECT (widget), "value-changed", G_CALLBACK (cell_spacing_changed), iconview); @@ -578,27 +576,23 @@ background_area (void) widget = gtk_spin_button_new_with_range (0, 10, 1); gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), gtk_icon_view_get_row_spacing (GTK_ICON_VIEW (iconview))); label = gtk_label_new ("Row spacing"); + gtk_widget_set_hexpand (label, TRUE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); - gtk_widget_show (hbox); - gtk_widget_show (label); - gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); g_signal_connect (G_OBJECT (widget), "value-changed", G_CALLBACK (row_spacing_changed), iconview); widget = gtk_spin_button_new_with_range (0, 30, 1); label = gtk_label_new ("Item padding"); + gtk_widget_set_hexpand (label, TRUE); gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), gtk_icon_view_get_item_padding (GTK_ICON_VIEW (iconview))); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); - gtk_widget_show (hbox); - gtk_widget_show (label); - gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); g_signal_connect (G_OBJECT (widget), "value-changed", G_CALLBACK (item_padding_changed), iconview); diff --git a/tests/testcellrenderertext.c b/tests/testcellrenderertext.c index 9d295241ad..4a5f3f4e0f 100644 --- a/tests/testcellrenderertext.c +++ b/tests/testcellrenderertext.c @@ -266,18 +266,20 @@ main (int argc, char **argv) /* LTR */ label = gtk_label_new ("Left to right"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); tree = create_tree (FALSE); - gtk_box_pack_start (GTK_BOX (vbox), tree, TRUE, TRUE); + gtk_widget_set_vexpand (tree, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), tree, TRUE); /* RTL */ label = gtk_label_new ("Right to left"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); tree = create_tree (TRUE); - gtk_box_pack_start (GTK_BOX (vbox), tree, TRUE, TRUE); + gtk_widget_set_vexpand (tree, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), tree, TRUE); gtk_widget_show (window); gtk_main (); diff --git a/tests/testclipboard.c b/tests/testclipboard.c index 29cc5b9be9..6e25bbd029 100644 --- a/tests/testclipboard.c +++ b/tests/testclipboard.c @@ -120,9 +120,9 @@ main (int argc, char **argv) NULL); image = gtk_image_new (); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), image, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), image, FALSE); label = gtk_label_new ("No data found"); - gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), label, FALSE); g_signal_connect (window, "response", G_CALLBACK (on_response), NULL); diff --git a/tests/testcombo.c b/tests/testcombo.c index f7befc3cdb..64d86a7c48 100644 --- a/tests/testcombo.c +++ b/tests/testcombo.c @@ -1071,7 +1071,7 @@ main (int argc, char **argv) /* GtkCellView */ tmp = gtk_frame_new ("GtkCellView"); - gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE); boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (tmp), boom); @@ -1092,7 +1092,7 @@ main (int argc, char **argv) /* GtkComboBox list */ tmp = gtk_frame_new ("GtkComboBox (list)"); - gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE); boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (tmp), boom); @@ -1132,7 +1132,7 @@ main (int argc, char **argv) /* GtkComboBox dynamic list */ tmp = gtk_frame_new ("GtkComboBox (dynamic list)"); - gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE); boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (tmp), boom); @@ -1175,7 +1175,7 @@ main (int argc, char **argv) /* GtkComboBox custom entry */ tmp = gtk_frame_new ("GtkComboBox (custom)"); - gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE); boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (tmp), boom); @@ -1229,7 +1229,7 @@ main (int argc, char **argv) /* GtkComboBox tree */ tmp = gtk_frame_new ("GtkComboBox (tree)"); - gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE); boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (tmp), boom); @@ -1272,18 +1272,18 @@ main (int argc, char **argv) /* GtkComboBox (grid mode) */ tmp = gtk_frame_new ("GtkComboBox (grid mode)"); - gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE); boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (tmp), boom); comboboxgrid = create_combo_box_grid_demo (); - gtk_box_pack_start (GTK_BOX (boom), comboboxgrid, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (boom), comboboxgrid, FALSE); /* GtkComboBoxEntry */ tmp = gtk_frame_new ("GtkComboBox with entry"); - gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE); boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (tmp), boom); @@ -1295,7 +1295,7 @@ main (int argc, char **argv) /* Phylogenetic tree */ tmp = gtk_frame_new ("What are you ?"); - gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE); boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (tmp), boom); @@ -1317,7 +1317,7 @@ main (int argc, char **argv) /* Capitals */ tmp = gtk_frame_new ("Where are you ?"); - gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE); boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (tmp), boom); @@ -1348,7 +1348,7 @@ main (int argc, char **argv) /* Aligned Food */ tmp = gtk_frame_new ("Hungry ?"); - gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE); boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (tmp), boom); @@ -1382,7 +1382,7 @@ main (int argc, char **argv) /* Ellipsizing growing combos */ tmp = gtk_frame_new ("Unconstrained Menu"); - gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE); boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (tmp), boom); @@ -1401,7 +1401,7 @@ main (int argc, char **argv) gtk_combo_box_set_popup_fixed_width (GTK_COMBO_BOX (combobox), FALSE); tmp = gtk_frame_new ("Looong"); - gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE); combobox = gtk_combo_box_text_new (); for (i = 0; i < 200; i++) { diff --git a/tests/testcombochange.c b/tests/testcombochange.c index fb4656af22..730d74ccf0 100644 --- a/tests/testcombochange.c +++ b/tests/testcombochange.c @@ -247,29 +247,30 @@ main (int argc, char **argv) content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); 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); combo_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_box_pack_start (GTK_BOX (hbox), combo_vbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), combo_vbox, FALSE); label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "<b>Menu mode</b>"); - gtk_box_pack_start (GTK_BOX (combo_vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (combo_vbox), label, FALSE); menu_combo = create_combo ("menu-combo", FALSE); gtk_widget_set_margin_start (menu_combo, 12); - gtk_box_pack_start (GTK_BOX (combo_vbox), menu_combo, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (combo_vbox), menu_combo, FALSE); label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "<b>List mode</b>"); - gtk_box_pack_start (GTK_BOX (combo_vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (combo_vbox), label, FALSE); list_combo = create_combo ("list-combo", TRUE); gtk_widget_set_margin_start (list_combo, 12); - gtk_box_pack_start (GTK_BOX (combo_vbox), list_combo, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (combo_vbox), list_combo, FALSE); scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_box_pack_start (GTK_BOX (hbox), scrolled_window, TRUE, TRUE); + gtk_widget_set_hexpand (scrolled_window, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), scrolled_window, TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -280,24 +281,24 @@ main (int argc, char **argv) gtk_container_add (GTK_CONTAINER (scrolled_window), text_view); button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_box_pack_start (GTK_BOX (hbox), button_vbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), button_vbox, FALSE); gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 300); button = gtk_button_new_with_label ("Insert"); - gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE); g_signal_connect (button, "clicked", G_CALLBACK (on_insert), NULL); button = gtk_button_new_with_label ("Delete"); - gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE); g_signal_connect (button, "clicked", G_CALLBACK (on_delete), NULL); button = gtk_button_new_with_label ("Reorder"); - gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE); g_signal_connect (button, "clicked", G_CALLBACK (on_reorder), NULL); button = gtk_button_new_with_label ("Animate"); - gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE); g_signal_connect (button, "clicked", G_CALLBACK (on_animate), NULL); gtk_widget_show (dialog); diff --git a/tests/testellipsise.c b/tests/testellipsise.c index b2a9e8147d..273d3f65a9 100644 --- a/tests/testellipsise.c +++ b/tests/testellipsise.c @@ -155,11 +155,12 @@ main (int argc, char *argv[]) overlay = gtk_overlay_new (); gtk_container_add (GTK_CONTAINER (overlay), da); + gtk_widget_set_vexpand (overlay, TRUE); gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label); - gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, TRUE); - gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, TRUE); - gtk_box_pack_start (GTK_BOX (vbox), overlay, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), combo, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), scale, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), overlay, TRUE); g_object_set_data (G_OBJECT (label), "combo", combo); diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c index 0ce5bf7220..c48d2c7d13 100644 --- a/tests/testentrycompletion.c +++ b/tests/testentrycompletion.c @@ -307,7 +307,7 @@ main (int argc, char *argv[]) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for example."); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); /* Create our first entry */ entry = gtk_entry_new (); @@ -392,7 +392,7 @@ main (int argc, char *argv[]) gdk_threads_add_timeout (1000, (GSourceFunc) animation_timer, completion); /* Fourth entry */ - gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Model-less entry completion"), FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Model-less entry completion"), FALSE); entry = gtk_entry_new (); diff --git a/tests/testexpand.c b/tests/testexpand.c index 88483d28c6..f8a54e783f 100644 --- a/tests/testexpand.c +++ b/tests/testexpand.c @@ -55,30 +55,30 @@ create_box_window (void) gtk_box_pack_start (GTK_BOX (box1), gtk_label_new ("VBox 1 Top"), - FALSE, FALSE); + FALSE); gtk_box_pack_start (GTK_BOX (box1), box2, - FALSE, TRUE); + TRUE); gtk_box_pack_end (GTK_BOX (box1), gtk_label_new ("VBox 1 Bottom"), - FALSE, FALSE); + FALSE); gtk_box_pack_start (GTK_BOX (box2), gtk_label_new ("HBox 2 Left"), - FALSE, FALSE); + FALSE); gtk_box_pack_start (GTK_BOX (box2), box3, - FALSE, TRUE); + TRUE); gtk_box_pack_end (GTK_BOX (box2), gtk_label_new ("HBox 2 Right"), - FALSE, FALSE); + FALSE); gtk_box_pack_start (GTK_BOX (box3), gtk_label_new ("VBox 3 Top"), - FALSE, FALSE); + FALSE); gtk_box_pack_end (GTK_BOX (box3), gtk_label_new ("VBox 3 Bottom"), - FALSE, FALSE); + FALSE); colorbox = gtk_frame_new (NULL); @@ -90,7 +90,7 @@ create_box_window (void) G_CALLBACK (on_toggle_hexpand), NULL); gtk_container_add (GTK_CONTAINER (colorbox), toggle); - gtk_box_pack_start (GTK_BOX (box3), colorbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box3), colorbox, TRUE); colorbox = gtk_frame_new (NULL); @@ -101,7 +101,7 @@ create_box_window (void) g_signal_connect (G_OBJECT (toggle), "toggled", G_CALLBACK (on_toggle_vexpand), NULL); gtk_container_add (GTK_CONTAINER (colorbox), toggle); - gtk_box_pack_start (GTK_BOX (box3), colorbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box3), colorbox, TRUE); gtk_container_add (GTK_CONTAINER (window), box1); gtk_widget_show (window); diff --git a/tests/testexpander.c b/tests/testexpander.c index 6852b2975c..d7e1126525 100644 --- a/tests/testexpander.c +++ b/tests/testexpander.c @@ -72,7 +72,9 @@ main (int argc, char *argv[]) "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_widget_set_hexpand (expander, TRUE); + gtk_widget_set_vexpand (expander, TRUE); + gtk_box_pack_end (GTK_BOX (area), expander, TRUE); g_signal_connect (expander, "notify::expanded", G_CALLBACK (expander_cb), dialog); diff --git a/tests/testfilechooserbutton.c b/tests/testfilechooserbutton.c index 4bc2185190..cdb6c97d5c 100644 --- a/tests/testfilechooserbutton.c +++ b/tests/testfilechooserbutton.c @@ -134,25 +134,25 @@ tests_button_clicked_cb (GtkButton *real_button, button = gtk_button_new_with_label ("Print Selected Path"); g_signal_connect (button, "clicked", G_CALLBACK (print_selected_path_clicked_cb), user_data); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), button, FALSE); gtk_widget_show (button); button = gtk_button_new_with_label ("Add $PWD's Parent as Shortcut"); g_signal_connect (button, "clicked", G_CALLBACK (add_pwds_parent_as_shortcut_clicked_cb), user_data); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), button, FALSE); gtk_widget_show (button); button = gtk_button_new_with_label ("Remove $PWD's Parent as Shortcut"); g_signal_connect (button, "clicked", G_CALLBACK (del_pwds_parent_as_shortcut_clicked_cb), user_data); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), button, FALSE); gtk_widget_show (button); button = gtk_button_new_with_label ("Unselect all"); g_signal_connect (button, "clicked", G_CALLBACK (unselect_all_clicked_cb), user_data); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), button, FALSE); gtk_widget_show (button); g_signal_connect (tests, "delete-event", G_CALLBACK (delete_event_cb), NULL); @@ -254,7 +254,7 @@ main (int argc, frame = gtk_frame_new ("<b>GtkFileChooserButton</b>"); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE); gtk_label_set_use_markup (GTK_LABEL (gtk_frame_get_label_widget (GTK_FRAME (frame))), TRUE); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); gtk_widget_set_halign (frame, GTK_ALIGN_FILL); gtk_widget_set_valign (frame, GTK_ALIGN_FILL); @@ -267,15 +267,16 @@ main (int argc, /* OPEN */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); - gtk_box_pack_start (GTK_BOX (group_box), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (group_box), hbox, FALSE); label = gtk_label_new_with_mnemonic ("_Open:"); gtk_size_group_add_widget (GTK_SIZE_GROUP (label_group), label); gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE); chooser = gtk_file_chooser_button_new ("Select A File - testfilechooserbutton", GTK_FILE_CHOOSER_ACTION_OPEN); + gtk_widget_set_hexpand (chooser, TRUE); gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (chooser), gtk_src_dir, NULL); gtk_file_chooser_remove_shortcut_folder (GTK_FILE_CHOOSER (chooser), gtk_src_dir, NULL); gtk_label_set_mnemonic_widget (GTK_LABEL (label), chooser); @@ -284,23 +285,24 @@ main (int argc, g_signal_connect (chooser, "selection-changed", G_CALLBACK (chooser_selection_changed_cb), NULL); g_signal_connect (chooser, "file-activated", G_CALLBACK (chooser_file_activated_cb), NULL); g_signal_connect (chooser, "update-preview", G_CALLBACK (chooser_update_preview_cb), NULL); - gtk_box_pack_start (GTK_BOX (hbox), chooser, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), chooser, TRUE); button = gtk_button_new_with_label ("Tests"); g_signal_connect (button, "clicked", G_CALLBACK (tests_button_clicked_cb), chooser); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE); /* SELECT_FOLDER */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); - gtk_box_pack_start (GTK_BOX (group_box), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (group_box), hbox, FALSE); label = gtk_label_new_with_mnemonic ("Select _Folder:"); gtk_size_group_add_widget (GTK_SIZE_GROUP (label_group), label); gtk_label_set_xalign (GTK_LABEL (label), 0.0); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE); chooser = gtk_file_chooser_button_new ("Select A Folder - testfilechooserbutton", GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); + gtk_widget_set_hexpand (chooser, TRUE); gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (chooser), gtk_src_dir, NULL); gtk_file_chooser_remove_shortcut_folder (GTK_FILE_CHOOSER (chooser), gtk_src_dir, NULL); gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (chooser), gtk_src_dir, NULL); @@ -310,11 +312,11 @@ main (int argc, g_signal_connect (chooser, "selection-changed", G_CALLBACK (chooser_selection_changed_cb), NULL); g_signal_connect (chooser, "file-activated", G_CALLBACK (chooser_file_activated_cb), NULL); g_signal_connect (chooser, "update-preview", G_CALLBACK (chooser_update_preview_cb), NULL); - gtk_box_pack_start (GTK_BOX (hbox), chooser, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), chooser, TRUE); button = gtk_button_new_with_label ("Tests"); g_signal_connect (button, "clicked", G_CALLBACK (tests_button_clicked_cb), chooser); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE); g_object_unref (label_group); diff --git a/tests/testflowbox.c b/tests/testflowbox.c index 070eea37e4..621af02120 100644 --- a/tests/testflowbox.c +++ b/tests/testflowbox.c @@ -403,14 +403,15 @@ create_window (void) gtk_widget_show (vbox); gtk_widget_show (hbox); gtk_container_add (GTK_CONTAINER (window), hbox); - gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE); swindow = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_set_hexpand (swindow, TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_widget_show (swindow); - gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE); flowbox = gtk_flow_box_new (); gtk_widget_set_halign (flowbox, GTK_ALIGN_END); @@ -439,14 +440,14 @@ create_window (void) gtk_widget_show (flowbox_cntl); gtk_widget_show (expander); gtk_container_add (GTK_CONTAINER (expander), flowbox_cntl); - gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE); widget = gtk_check_button_new_with_label ("Homogeneous"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE); gtk_widget_show (widget); gtk_widget_set_tooltip_text (widget, "Set whether the items should be displayed at the same size"); - gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE); g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (homogeneous_toggled), flowbox); @@ -457,7 +458,7 @@ create_window (void) flowbox, "activate-on-single-click", G_BINDING_SYNC_CREATE); gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE); /* Add alignment controls */ widget = gtk_combo_box_text_new (); @@ -469,7 +470,7 @@ create_window (void) gtk_widget_show (widget); gtk_widget_set_tooltip_text (widget, "Set the horizontal alignment policy"); - gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (horizontal_alignment_changed), flowbox); @@ -483,7 +484,7 @@ create_window (void) gtk_widget_show (widget); gtk_widget_set_tooltip_text (widget, "Set the vertical alignment policy"); - gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (vertical_alignment_changed), flowbox); @@ -496,7 +497,7 @@ create_window (void) gtk_widget_show (widget); gtk_widget_set_tooltip_text (widget, "Set the flowbox orientation"); - gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (orientation_changed), flowbox); @@ -511,7 +512,7 @@ create_window (void) gtk_widget_show (widget); gtk_widget_set_tooltip_text (widget, "Set the selection mode"); - gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (selection_mode_changed), flowbox); @@ -522,7 +523,7 @@ create_window (void) gtk_widget_show (widget); gtk_widget_set_tooltip_text (widget, "Set the minimum amount of items per line before wrapping"); - gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (line_length_changed), flowbox); @@ -535,7 +536,7 @@ create_window (void) gtk_widget_show (widget); gtk_widget_set_tooltip_text (widget, "Set the natural amount of items per line "); - gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (max_line_length_changed), flowbox); @@ -547,43 +548,43 @@ create_window (void) gtk_widget_show (hbox); widget = gtk_label_new ("H Spacing"); - gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); widget = gtk_spin_button_new_with_range (0, 30, 1); gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), INITIAL_CSPACING); gtk_widget_show (widget); gtk_widget_set_tooltip_text (widget, "Set the horizontal spacing between children"); - gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (spacing_changed), GINT_TO_POINTER (GTK_ORIENTATION_HORIZONTAL)); g_signal_connect (G_OBJECT (widget), "value-changed", G_CALLBACK (spacing_changed), GINT_TO_POINTER (GTK_ORIENTATION_HORIZONTAL)); - gtk_box_pack_start (GTK_BOX (flowbox_cntl), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (flowbox_cntl), hbox, FALSE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); gtk_widget_show (hbox); widget = gtk_label_new ("V Spacing"); - gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); widget = gtk_spin_button_new_with_range (0, 30, 1); gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), INITIAL_RSPACING); gtk_widget_show (widget); gtk_widget_set_tooltip_text (widget, "Set the vertical spacing between children"); - gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (spacing_changed), GINT_TO_POINTER (GTK_ORIENTATION_VERTICAL)); g_signal_connect (G_OBJECT (widget), "value-changed", G_CALLBACK (spacing_changed), GINT_TO_POINTER (GTK_ORIENTATION_VERTICAL)); - gtk_box_pack_start (GTK_BOX (flowbox_cntl), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (flowbox_cntl), hbox, FALSE); /* filtering and sorting */ @@ -592,7 +593,7 @@ create_window (void) gtk_widget_show (widget); gtk_widget_set_tooltip_text (widget, "Set whether some items should be filtered out"); - gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE); g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (filter_toggled), flowbox); @@ -602,7 +603,7 @@ create_window (void) gtk_widget_show (widget); gtk_widget_set_tooltip_text (widget, "Set whether items should be sorted"); - gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE); g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (sort_toggled), flowbox); @@ -615,7 +616,7 @@ create_window (void) gtk_widget_show (items_cntl); gtk_widget_show (expander); gtk_container_add (GTK_CONTAINER (expander), items_cntl); - gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE); /* Add Items control */ widget = gtk_combo_box_text_new (); @@ -628,7 +629,7 @@ create_window (void) gtk_widget_show (widget); gtk_widget_set_tooltip_text (widget, "Set the item set to use"); - gtk_box_pack_start (GTK_BOX (items_cntl), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (items_cntl), widget, FALSE); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (items_changed), flowbox); @@ -642,7 +643,7 @@ create_window (void) gtk_widget_show (widget); gtk_widget_set_tooltip_text (widget, "Set the item's text orientation"); - gtk_box_pack_start (GTK_BOX (items_cntl), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (items_cntl), widget, FALSE); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (text_orientation_changed), flowbox); diff --git a/tests/testframe.c b/tests/testframe.c index 83290b4dd1..208f2be114 100644 --- a/tests/testframe.c +++ b/tests/testframe.c @@ -160,7 +160,8 @@ int main (int argc, char **argv) gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (vbox)); frame = GTK_FRAME (gtk_frame_new ("Test GtkFrame")); - gtk_box_pack_start (vbox, GTK_WIDGET (frame), TRUE, TRUE); + gtk_widget_set_vexpand (frame, TRUE); + gtk_box_pack_start (vbox, GTK_WIDGET (frame), TRUE); widget = gtk_button_new_with_label ("Hello!"); gtk_container_add (GTK_CONTAINER (frame), widget); @@ -168,7 +169,7 @@ int main (int argc, char **argv) grid = GTK_GRID (gtk_grid_new ()); gtk_grid_set_row_spacing (grid, 12); gtk_grid_set_column_spacing (grid, 6); - gtk_box_pack_start (vbox, GTK_WIDGET (grid), FALSE, FALSE); + gtk_box_pack_start (vbox, GTK_WIDGET (grid), FALSE); gtk_frame_get_label_align (frame, &xalign, &yalign); diff --git a/tests/testgiconpixbuf.c b/tests/testgiconpixbuf.c index 9deb53300e..1d0b835805 100644 --- a/tests/testgiconpixbuf.c +++ b/tests/testgiconpixbuf.c @@ -36,30 +36,30 @@ main (int argc, gtk_container_add (GTK_CONTAINER (toplevel), hbox); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); - gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE); image = gtk_image_new_from_gicon (G_ICON (pixbuf), GTK_ICON_SIZE_DIALOG); - gtk_box_pack_start (GTK_BOX (vbox), image, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), image, FALSE); label = gtk_label_new (NULL); str = g_strdup_printf ("Normal icon, hash %u", g_icon_hash (G_ICON (pixbuf))); gtk_label_set_label (GTK_LABEL (label), str); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); otherpix = gdk_pixbuf_new_from_file ("gnome-textfile.png", NULL); emblem = g_emblem_new (G_ICON (otherpix)); emblemed = g_emblemed_icon_new (G_ICON (pixbuf), emblem); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); - gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE); image2 = gtk_image_new_from_gicon (emblemed, GTK_ICON_SIZE_DIALOG); - gtk_box_pack_start (GTK_BOX (vbox), image2, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), image2, FALSE); label = gtk_label_new (NULL); str = g_strdup_printf ("Emblemed icon, hash %u", g_icon_hash (emblemed)); gtk_label_set_label (GTK_LABEL (label), str); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); gtk_widget_show (toplevel); diff --git a/tests/testgrid.c b/tests/testgrid.c index 78ded8663f..78da435275 100644 --- a/tests/testgrid.c +++ b/tests/testgrid.c @@ -144,21 +144,21 @@ box_comparison (void) box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (vbox), box); - gtk_box_pack_start (GTK_BOX (box), test_widget ("1", "white"), FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), test_widget ("1", "white"), FALSE); label = gtk_label_new ("Some ellipsizing text"); gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); gtk_label_set_width_chars (GTK_LABEL (label), 10); - gtk_box_pack_start (GTK_BOX (box), label, TRUE, FALSE); + gtk_box_pack_start (GTK_BOX (box), label, FALSE); - gtk_box_pack_start (GTK_BOX (box), test_widget ("2", "green"), FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), test_widget ("2", "green"), FALSE); label = gtk_label_new ("Some text that may wrap if needed"); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_width_chars (GTK_LABEL (label), 10); - gtk_box_pack_start (GTK_BOX (box), label, TRUE, FALSE); + gtk_box_pack_start (GTK_BOX (box), label, FALSE); - gtk_box_pack_start (GTK_BOX (box), test_widget ("3", "red"), FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), test_widget ("3", "red"), FALSE); grid = gtk_grid_new (); gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_VERTICAL); diff --git a/tests/testgtk.c b/tests/testgtk.c index d22225e772..3c38d7a763 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -214,9 +214,10 @@ build_alpha_widgets (void) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "<i>Entry: </i>"); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE); entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE); + gtk_widget_set_hexpand (entry, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE); gtk_widget_set_hexpand (hbox, TRUE); gtk_grid_attach (GTK_GRID (grid), hbox, 0, 3, 2, 1); @@ -263,18 +264,18 @@ create_alpha_window (GtkWidget *widget) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); gtk_box_pack_start (GTK_BOX (content_area), vbox, - TRUE, TRUE); + TRUE); label = gtk_label_new (NULL); - gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), label, TRUE); label = gtk_label_new (NULL); - gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), label, TRUE); display = gtk_widget_get_display (window); on_composited_changed (display, NULL, GTK_LABEL (label)); g_signal_connect (display, "notify::composited", G_CALLBACK (on_composited_changed), label); - gtk_box_pack_start (GTK_BOX (vbox), build_alpha_widgets (), TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), build_alpha_widgets (), TRUE); g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), @@ -336,7 +337,7 @@ create_buttons (GtkWidget *widget) grid = gtk_grid_new (); gtk_grid_set_row_spacing (GTK_GRID (grid), 5); gtk_grid_set_column_spacing (GTK_GRID (grid), 5); - gtk_box_pack_start (GTK_BOX (box1), grid, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), grid, TRUE); button[0] = gtk_button_new_with_label ("button1"); button[1] = gtk_button_new_with_mnemonic ("_button2"); @@ -361,16 +362,16 @@ create_buttons (GtkWidget *widget) } separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), separator, TRUE); 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); button[9] = gtk_button_new_with_label ("close"); g_signal_connect_swapped (button[9], "clicked", G_CALLBACK (gtk_widget_destroy), window); - gtk_box_pack_start (GTK_BOX (box2), button[9], TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button[9], TRUE); gtk_widget_set_can_default (button[9], TRUE); gtk_widget_grab_default (button[9]); } @@ -410,28 +411,28 @@ create_toggle_buttons (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (window), box1); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); - gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), box2, TRUE); button = gtk_toggle_button_new_with_label ("button1"); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); button = gtk_toggle_button_new_with_label ("button2"); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); button = gtk_toggle_button_new_with_label ("button3"); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), separator, TRUE); 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); 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); } @@ -530,26 +531,26 @@ create_check_buttons (GtkWidget *widget) box1 = gtk_dialog_get_content_area (GTK_DIALOG (window)); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); - gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), box2, TRUE); button = gtk_check_button_new_with_mnemonic ("_button1"); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); button = gtk_check_button_new_with_label ("button2"); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); button = gtk_check_button_new_with_label ("button3"); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); button = gtk_check_button_new_with_label ("inconsistent"); gtk_check_button_set_inconsistent (GTK_CHECK_BUTTON (button), TRUE); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), separator, TRUE); table = create_widget_grid (GTK_TYPE_CHECK_BUTTON); - gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), table, TRUE); } if (!gtk_widget_get_visible (window)) @@ -593,56 +594,56 @@ create_radio_buttons (GtkWidget *widget) box1 = gtk_dialog_get_content_area (GTK_DIALOG (window)); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); - gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), box2, TRUE); button = gtk_radio_button_new_with_label (NULL, "button1"); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); button = gtk_radio_button_new_with_label ( gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)), "button2"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); button = gtk_radio_button_new_with_label ( gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)), "button3"); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); button = gtk_radio_button_new_with_label ( gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)), "inconsistent"); gtk_check_button_set_inconsistent (GTK_CHECK_BUTTON (button), TRUE); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), separator, TRUE); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); - gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), box2, TRUE); button = gtk_radio_button_new_with_label (NULL, "button4"); gtk_check_button_set_draw_indicator (GTK_CHECK_BUTTON (button), FALSE); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); button = gtk_radio_button_new_with_label ( gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)), "button5"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); gtk_check_button_set_draw_indicator (GTK_CHECK_BUTTON (button), FALSE); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); button = gtk_radio_button_new_with_label ( gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)), "button6"); gtk_check_button_set_draw_indicator (GTK_CHECK_BUTTON (button), FALSE); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), separator, TRUE); table = create_widget_grid (GTK_TYPE_RADIO_BUTTON); - gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), table, TRUE); } if (!gtk_widget_get_visible (window)) @@ -717,58 +718,58 @@ create_button_box (GtkWidget *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, 0); gtk_container_add (GTK_CONTAINER (frame_horz), vbox); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Spread", 40, 85, 20, GTK_BUTTONBOX_SPREAD), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Edge", 40, 85, 20, GTK_BUTTONBOX_EDGE), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Start", 40, 85, 20, GTK_BUTTONBOX_START), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "End", 40, 85, 20, GTK_BUTTONBOX_END), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Center", 40, 85, 20, GTK_BUTTONBOX_CENTER), - TRUE, TRUE); + TRUE); frame_vert = gtk_frame_new ("Vertical Button Boxes"); gtk_widget_set_margin_top (frame_vert, 10); gtk_widget_set_margin_bottom (frame_vert, 10); - 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, 0); gtk_container_add (GTK_CONTAINER (frame_vert), hbox); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Spread", 30, 85, 20, GTK_BUTTONBOX_SPREAD), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Edge", 30, 85, 20, GTK_BUTTONBOX_EDGE), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Start", 30, 85, 20, GTK_BUTTONBOX_START), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "End", 30, 85, 20, GTK_BUTTONBOX_END), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Center", 30, 85, 20, GTK_BUTTONBOX_CENTER), - TRUE, TRUE); + TRUE); } if (!gtk_widget_get_visible (window)) @@ -911,10 +912,10 @@ create_statusbar (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (window), box1); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); - gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), box2, TRUE); statusbar = gtk_statusbar_new (); - gtk_box_pack_end (GTK_BOX (box1), statusbar, TRUE, TRUE); + gtk_box_pack_end (GTK_BOX (box1), statusbar, TRUE); g_signal_connect (statusbar, "text_popped", G_CALLBACK (statusbar_popped), @@ -962,16 +963,16 @@ create_statusbar (GtkWidget *widget) NULL); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), separator, TRUE); 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); 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); } @@ -1022,64 +1023,64 @@ create_alpha_widgets (GtkWidget *widget) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_box_pack_start (GTK_BOX (main_hbox), vbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (main_hbox), vbox, FALSE); /* Plain button (no gdkwindows */ label = gtk_label_new ("non-window widget"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); alpha1 = button = gtk_button_new_with_label ("A Button"); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); /* windowed container with both windowed and normal button */ label = gtk_label_new ("\nwindow widget"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); alpha2 = event_box = gtk_event_box_new (); - gtk_box_pack_start (GTK_BOX (vbox), event_box, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), event_box, FALSE); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (event_box), vbox2); button = gtk_button_new_with_label ("A Button"); - gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE); event_box = gtk_event_box_new (); button = gtk_button_new_with_label ("A Button (in window)"); gtk_container_add (GTK_CONTAINER (event_box), button); - gtk_box_pack_start (GTK_BOX (vbox2), event_box, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), event_box, FALSE); /* non-windowed container with both windowed and normal button */ label = gtk_label_new ("\nnon-window widget with widget child"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); alpha3 = vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE); button = gtk_button_new_with_label ("A Button"); - gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE); event_box = gtk_event_box_new (); button = gtk_button_new_with_label ("A Button (in window)"); gtk_container_add (GTK_CONTAINER (event_box), button); - gtk_box_pack_start (GTK_BOX (vbox2), event_box, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), event_box, FALSE); scale = gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL, 0, 100, 1); - gtk_box_pack_start (GTK_BOX (main_hbox), scale, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (main_hbox), scale, FALSE); g_signal_connect (scale, "value_changed", G_CALLBACK (alpha_changed), alpha1); gtk_range_set_value (GTK_RANGE (scale), 50); scale = gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL, 0, 100, 1); - gtk_box_pack_start (GTK_BOX (main_hbox), scale, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (main_hbox), scale, FALSE); g_signal_connect (scale, "value_changed", G_CALLBACK (alpha_changed), alpha2); gtk_range_set_value (GTK_RANGE (scale), 50); scale = gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL, 0, 100, 1); - gtk_box_pack_start (GTK_BOX (main_hbox), scale, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (main_hbox), scale, FALSE); g_signal_connect (scale, "value_changed", G_CALLBACK (alpha_changed), alpha3); gtk_range_set_value (GTK_RANGE (scale), 50); @@ -1243,45 +1244,45 @@ void create_labels (GtkWidget *widget) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); gtk_container_add (GTK_CONTAINER (window), vbox); - gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE); button = create_sensitivity_control (hbox); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); button = create_selectable_control (hbox); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); - gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE); frame = gtk_frame_new ("Normal Label"); label = gtk_label_new ("This is a Normal label"); gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_START); gtk_container_add (GTK_CONTAINER (frame), label); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); frame = gtk_frame_new ("Multi-line Label"); label = gtk_label_new ("This is a Multi-line label.\nSecond line\nThird line"); gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); gtk_container_add (GTK_CONTAINER (frame), label); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); frame = gtk_frame_new ("Left Justified Label"); label = gtk_label_new ("This is a Left-Justified\nMulti-line label.\nThird line"); gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_MIDDLE); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); gtk_container_add (GTK_CONTAINER (frame), label); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); frame = gtk_frame_new ("Right Justified Label"); gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_START); label = gtk_label_new ("This is a Right-Justified\nMulti-line label.\nFourth line, (j/k)"); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT); gtk_container_add (GTK_CONTAINER (frame), label); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); frame = gtk_frame_new ("Internationalized Label"); label = gtk_label_new (NULL); @@ -1294,13 +1295,13 @@ void create_labels (GtkWidget *widget) "Japanese <span lang=\"ja\">\345\205\203\346\260\227 \351\226\213\347\231\272</span>"); gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); gtk_container_add (GTK_CONTAINER (frame), label); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); frame = gtk_frame_new ("Bidirection Label"); label = gtk_label_new ("\342\200\217Arabic \330\247\331\204\330\263\331\204\330\247\331\205 \330\271\331\204\331\212\331\203\331\205\n" "\342\200\217Hebrew \327\251\327\234\327\225\327\235"); gtk_container_add (GTK_CONTAINER (frame), label); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); frame = gtk_frame_new ("Links in a label"); label = gtk_label_new ("Some <a href=\"http://en.wikipedia.org/wiki/Text\" title=\"plain text\">text</a> may be marked up\n" @@ -1308,11 +1309,11 @@ void create_labels (GtkWidget *widget) "or activated via <a href=\"keynav\">keynav</a>"); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_container_add (GTK_CONTAINER (frame), label); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); g_signal_connect (label, "activate-link", G_CALLBACK (activate_link), NULL); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); - gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE); frame = gtk_frame_new ("Line wrapped label"); label = gtk_label_new ("This is an example of a line-wrapped label. It should not be taking "\ "up the entire "/* big space to test spacing */\ @@ -1324,7 +1325,7 @@ void create_labels (GtkWidget *widget) gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_container_add (GTK_CONTAINER (frame), label); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); frame = gtk_frame_new ("Filled, wrapped label"); label = gtk_label_new ("This is an example of a line-wrapped, filled label. It should be taking "\ @@ -1337,7 +1338,7 @@ void create_labels (GtkWidget *widget) gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_FILL); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_container_add (GTK_CONTAINER (frame), label); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); frame = gtk_frame_new ("Underlined label"); label = gtk_label_new ("This label is underlined!\n" @@ -1345,7 +1346,7 @@ void create_labels (GtkWidget *widget) gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT); gtk_label_set_pattern (GTK_LABEL (label), "_________________________ _ _________ _ _____ _ __ __ ___ ____ _____"); gtk_container_add (GTK_CONTAINER (frame), label); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); frame = gtk_frame_new ("Markup label"); label = gtk_label_new (NULL); @@ -1372,7 +1373,7 @@ void create_labels (GtkWidget *widget) g_assert (gtk_label_get_mnemonic_keyval (GTK_LABEL (label)) == GDK_KEY_s); gtk_container_add (GTK_CONTAINER (frame), label); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); } if (!gtk_widget_get_visible (window)) @@ -1419,18 +1420,18 @@ create_rotated_label (GtkWidget *widget) content_area = gtk_dialog_get_content_area (GTK_DIALOG (window)); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); - gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE); label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "Hello World\n<i>Rotate</i> <span underline='single' foreground='blue'>me</span>"); - gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), label, TRUE); scale_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (vbox), scale_hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), scale_hbox, FALSE); scale_label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (scale_label), "<i>Angle: </i>"); - gtk_box_pack_start (GTK_BOX (scale_hbox), scale_label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (scale_hbox), scale_label, FALSE); hscale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 360, 5); @@ -1439,7 +1440,7 @@ create_rotated_label (GtkWidget *widget) gtk_range_set_value (GTK_RANGE (hscale), 45); gtk_widget_set_size_request (hscale, 200, -1); - gtk_box_pack_start (GTK_BOX (scale_hbox), hscale, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (scale_hbox), hscale, TRUE); } if (!gtk_widget_get_visible (window)) @@ -1551,7 +1552,7 @@ create_rotated_text (GtkWidget *widget) content_area = gtk_dialog_get_content_area (GTK_DIALOG (window)); drawing_area = gtk_drawing_area_new (); - gtk_box_pack_start (GTK_BOX (content_area), drawing_area, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), drawing_area, TRUE); tile_pixbuf = gdk_pixbuf_new_from_file ("marble.xpm", NULL); @@ -1638,22 +1639,22 @@ create_reparent (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (window), box1); box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); - gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), box2, TRUE); label = gtk_label_new ("Hello World"); frame = gtk_frame_new ("Frame 1"); - gtk_box_pack_start (GTK_BOX (box2), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), frame, TRUE); box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); gtk_container_add (GTK_CONTAINER (frame), box3); button = gtk_button_new_with_label ("switch"); g_object_set_data (G_OBJECT (button), "user_data", label); - gtk_box_pack_start (GTK_BOX (box3), button, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box3), button, TRUE); event_box = gtk_event_box_new (); - gtk_box_pack_start (GTK_BOX (box3), event_box, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box3), event_box, TRUE); gtk_container_add (GTK_CONTAINER (event_box), label); g_signal_connect (button, "clicked", @@ -1665,32 +1666,32 @@ create_reparent (GtkWidget *widget) GINT_TO_POINTER (42)); frame = gtk_frame_new ("Frame 2"); - gtk_box_pack_start (GTK_BOX (box2), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), frame, TRUE); box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); gtk_container_add (GTK_CONTAINER (frame), box3); button = gtk_button_new_with_label ("switch"); g_object_set_data (G_OBJECT (button), "user_data", label); - gtk_box_pack_start (GTK_BOX (box3), button, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box3), button, TRUE); event_box = gtk_event_box_new (); - gtk_box_pack_start (GTK_BOX (box3), event_box, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box3), event_box, TRUE); g_signal_connect (button, "clicked", G_CALLBACK (reparent_label), event_box); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), separator, TRUE); 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); 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); } @@ -1791,43 +1792,43 @@ create_saved_position (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (vbox), button); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); label = gtk_label_new ("X Origin : "); gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); x_label = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (hbox), x_label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), x_label, TRUE); g_object_set_data (G_OBJECT (window), "x", x_label); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); label = gtk_label_new ("Y Origin : "); gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); y_label = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (hbox), y_label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), y_label, TRUE); g_object_set_data (G_OBJECT (window), "y", y_label); any = g_object_new (gtk_separator_get_type (), "GtkWidget::visible", TRUE, NULL); - gtk_box_pack_start (GTK_BOX (main_vbox), any, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (main_vbox), any, TRUE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (main_vbox), hbox, TRUE); 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 (hbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); gtk_widget_set_can_default (button, TRUE); gtk_widget_grab_default (button); @@ -1872,10 +1873,10 @@ create_pixbuf (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (window), box1); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); - gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), box2, TRUE); button = gtk_button_new (); - gtk_box_pack_start (GTK_BOX (box2), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box2), button, FALSE); gdk_window = gtk_widget_get_window (window); @@ -1888,7 +1889,7 @@ create_pixbuf (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (button), box3); button = gtk_button_new (); - gtk_box_pack_start (GTK_BOX (box2), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box2), button, FALSE); pixbufwid = new_pixbuf ("test.xpm", gdk_window); @@ -1901,16 +1902,16 @@ create_pixbuf (GtkWidget *widget) gtk_widget_set_sensitive (button, FALSE); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), separator, TRUE); 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); 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); } @@ -1949,15 +1950,15 @@ create_tooltips (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (window), box1); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); - gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), box2, TRUE); button = gtk_toggle_button_new_with_label ("button1"); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); gtk_widget_set_tooltip_text (button, "This is button 1"); button = gtk_toggle_button_new_with_label ("button2"); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); gtk_widget_set_tooltip_text (button, "This is button 2. This is also a really long tooltip which probably " @@ -1965,7 +1966,7 @@ create_tooltips (GtkWidget *widget) "Hopefully the wrapping will work correctly."); toggle = gtk_toggle_button_new_with_label ("Override TipsQuery Label"); - gtk_box_pack_start (GTK_BOX (box2), toggle, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), toggle, TRUE); gtk_widget_set_tooltip_text (toggle, "Toggle TipsQuery view."); @@ -1983,7 +1984,7 @@ create_tooltips (GtkWidget *widget) "visible", TRUE, "parent", box3, NULL); - gtk_box_set_child_packing (GTK_BOX (box3), button, FALSE, FALSE, GTK_PACK_START); + gtk_box_set_child_packing (GTK_BOX (box3), button, FALSE, GTK_PACK_START); gtk_widget_set_tooltip_text (button, "Start the Tooltips Inspector"); frame = g_object_new (gtk_frame_get_type (), @@ -1993,19 +1994,19 @@ create_tooltips (GtkWidget *widget) "parent", box2, NULL); gtk_container_add (GTK_CONTAINER (frame), box3); - gtk_box_set_child_packing (GTK_BOX (box2), frame, TRUE, TRUE, GTK_PACK_START); + gtk_box_set_child_packing (GTK_BOX (box2), frame, TRUE, GTK_PACK_START); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), separator, TRUE); 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); 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); @@ -2029,11 +2030,11 @@ pack_image (GtkWidget *box, { gtk_box_pack_start (GTK_BOX (box), gtk_label_new (text), - FALSE, FALSE); + FALSE); gtk_box_pack_start (GTK_BOX (box), image, - TRUE, TRUE); + TRUE); } static void @@ -2547,7 +2548,7 @@ create_menus (GtkWidget *widget) gtk_widget_show (box1); menubar = gtk_menu_bar_new (); - 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 (screen, 2, 50); @@ -2585,7 +2586,7 @@ create_menus (GtkWidget *widget) gtk_widget_show (menuitem); menubar = gtk_menu_bar_new (); - 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 (screen, 2, 10); @@ -2596,7 +2597,7 @@ create_menus (GtkWidget *widget) gtk_widget_show (menuitem); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); - gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), box2, TRUE); gtk_widget_show (box2); menu = create_menu (screen, 1, 5); @@ -2638,22 +2639,22 @@ create_menus (GtkWidget *widget) optionmenu = gtk_combo_box_text_new (); gtk_combo_box_set_active (GTK_COMBO_BOX (optionmenu), 3); - gtk_box_pack_start (GTK_BOX (box2), optionmenu, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), optionmenu, TRUE); gtk_widget_show (optionmenu); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), separator, TRUE); gtk_widget_show (separator); 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 ("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); @@ -2720,33 +2721,33 @@ create_key_lookup (GtkWidget *widget) content_area = gtk_dialog_get_content_area (GTK_DIALOG (window)); button = gtk_button_new_with_mnemonic ("Button 1 (_a)"); - gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), button, FALSE); button = gtk_button_new_with_mnemonic ("Button 2 (_A)"); - gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), button, FALSE); button = gtk_button_new_with_mnemonic ("Button 3 (_\321\204)"); - gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), button, FALSE); button = gtk_button_new_with_mnemonic ("Button 4 (_\320\244)"); - gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), button, FALSE); button = gtk_button_new_with_mnemonic ("Button 6 (_b)"); - gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), button, FALSE); button = accel_button_new (accel_group, "Button 7", "<Alt><Shift>b"); - gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), button, FALSE); button = accel_button_new (accel_group, "Button 8", "<Alt>d"); - gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), button, FALSE); button = accel_button_new (accel_group, "Button 9", "<Alt>Cyrillic_ve"); - gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), button, FALSE); button = gtk_button_new_with_mnemonic ("Button 10 (_1)"); - gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), button, FALSE); button = gtk_button_new_with_mnemonic ("Button 11 (_!)"); - gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), button, FALSE); button = accel_button_new (accel_group, "Button 12", "<Super>a"); - gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), button, FALSE); button = accel_button_new (accel_group, "Button 13", "<Hyper>a"); - gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), button, FALSE); button = accel_button_new (accel_group, "Button 14", "<Meta>a"); - gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), button, FALSE); button = accel_button_new (accel_group, "Button 15", "<Shift><Mod4>b"); - gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), button, FALSE); window_ptr = &window; g_object_add_weak_pointer (G_OBJECT (window), window_ptr); @@ -2846,12 +2847,12 @@ create_modal_window (GtkWidget *widget) /* Pack widgets */ gtk_container_add (GTK_CONTAINER (window), box1); - gtk_box_pack_start (GTK_BOX (box1), frame1, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), frame1, TRUE); gtk_container_add (GTK_CONTAINER (frame1), box2); - gtk_box_pack_start (GTK_BOX (box2), btnColor, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (box2), btnFile, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (box1), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (box1), btnClose, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box2), btnColor, FALSE); + gtk_box_pack_start (GTK_BOX (box2), btnFile, FALSE); + gtk_box_pack_start (GTK_BOX (box1), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), FALSE); + gtk_box_pack_start (GTK_BOX (box1), btnClose, FALSE); /* connect signals */ g_signal_connect_swapped (btnClose, "clicked", @@ -3038,7 +3039,7 @@ create_scrolled_windows (GtkWidget *widget) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (content_area), scrolled_window, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), scrolled_window, TRUE); gtk_widget_show (scrolled_window); grid = gtk_grid_new (); @@ -3194,15 +3195,15 @@ create_entry (GtkWidget *widget) box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); - gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), box2, TRUE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); - gtk_box_pack_start (GTK_BOX (box2), hbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), hbox, TRUE); entry = gtk_entry_new (); gtk_entry_set_text (GTK_ENTRY (entry), "hello world \330\247\331\204\330\263\331\204\330\247\331\205 \330\271\331\204\331\212\331\203\331\205"); gtk_editable_select_region (GTK_EDITABLE (entry), 0, 5); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE); cb = GTK_COMBO_BOX_TEXT (gtk_combo_box_text_new_with_entry ()); @@ -3221,41 +3222,41 @@ create_entry (GtkWidget *widget) cb_entry = gtk_bin_get_child (GTK_BIN (cb)); gtk_entry_set_text (GTK_ENTRY (cb_entry), "hello world \n\n\n foo"); gtk_editable_select_region (GTK_EDITABLE (cb_entry), 0, -1); - gtk_box_pack_start (GTK_BOX (box2), GTK_WIDGET (cb), TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), GTK_WIDGET (cb), TRUE); sensitive_check = gtk_check_button_new_with_label("Sensitive"); - gtk_box_pack_start (GTK_BOX (box2), sensitive_check, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), sensitive_check, TRUE); g_signal_connect (sensitive_check, "toggled", G_CALLBACK (entry_toggle_sensitive), entry); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sensitive_check), TRUE); has_frame_check = gtk_check_button_new_with_label("Has Frame"); - gtk_box_pack_start (GTK_BOX (box2), has_frame_check, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), has_frame_check, TRUE); g_signal_connect (has_frame_check, "toggled", G_CALLBACK (entry_toggle_frame), entry); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (has_frame_check), TRUE); progress_check = gtk_check_button_new_with_label("Show Progress"); - gtk_box_pack_start (GTK_BOX (box2), progress_check, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), progress_check, TRUE); g_signal_connect (progress_check, "toggled", G_CALLBACK (entry_toggle_progress), entry); progress_check = gtk_check_button_new_with_label("Pulse Progress"); - gtk_box_pack_start (GTK_BOX (box2), progress_check, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), progress_check, TRUE); g_signal_connect (progress_check, "toggled", G_CALLBACK (entry_toggle_pulse), entry); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), separator, TRUE); 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); 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); } @@ -3291,7 +3292,7 @@ create_expander (GtkWidget *widget) expander = gtk_expander_new ("The Hidden"); - gtk_box_pack_start (GTK_BOX (box1), expander, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), expander, TRUE); hidden = gtk_label_new ("Revealed!"); @@ -3386,10 +3387,10 @@ create_event_box (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (window), box1); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (box1), hbox, TRUE, FALSE); + gtk_box_pack_start (GTK_BOX (box1), hbox, FALSE); event_box = gtk_event_box_new (); - gtk_box_pack_start (GTK_BOX (hbox), event_box, TRUE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), event_box, FALSE); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (event_box), vbox); @@ -3401,38 +3402,38 @@ create_event_box (GtkWidget *widget) NULL); label = gtk_label_new ("Click on this label"); - gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); button = gtk_button_new_with_label ("button in eventbox"); - gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); g_signal_connect (button, "clicked", G_CALLBACK (event_box_button_clicked), NULL); visible_window_check = gtk_check_button_new_with_label("Visible Window"); - gtk_box_pack_start (GTK_BOX (box1), visible_window_check, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), visible_window_check, TRUE); g_signal_connect (visible_window_check, "toggled", G_CALLBACK (event_box_toggle_visible_window), event_box); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (visible_window_check), TRUE); above_child_check = gtk_check_button_new_with_label("Above Child"); - gtk_box_pack_start (GTK_BOX (box1), above_child_check, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), above_child_check, TRUE); g_signal_connect (above_child_check, "toggled", G_CALLBACK (event_box_toggle_above_child), event_box); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (above_child_check), FALSE); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), separator, TRUE); 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); 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); } @@ -3501,7 +3502,7 @@ create_size_group_window (GdkScreen *screen, content_area = gtk_dialog_get_content_area (GTK_DIALOG (window)); grid = gtk_grid_new (); - gtk_box_pack_start (GTK_BOX (content_area), grid, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), grid, TRUE); gtk_grid_set_row_spacing (GTK_GRID (grid), 5); gtk_grid_set_column_spacing (GTK_GRID (grid), 5); @@ -3562,17 +3563,17 @@ create_size_group_window (GdkScreen *screen, g_object_unref (vgroup2); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); - gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE); spin_button = gtk_spin_button_new_with_range (1, 100, 1); gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin_button), SIZE_GROUP_INITIAL_SIZE); - gtk_box_pack_start (GTK_BOX (hbox), spin_button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), spin_button, TRUE); g_signal_connect (spin_button, "value_changed", G_CALLBACK (size_group_hsize_changed), main_button); spin_button = gtk_spin_button_new_with_range (1, 100, 1); gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin_button), SIZE_GROUP_INITIAL_SIZE); - gtk_box_pack_start (GTK_BOX (hbox), spin_button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), spin_button, TRUE); g_signal_connect (spin_button, "value_changed", G_CALLBACK (size_group_vsize_changed), main_button); @@ -3823,7 +3824,7 @@ create_spins (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (window), main_vbox); frame = gtk_frame_new ("Not accelerated"); - gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (frame), vbox); @@ -3831,15 +3832,15 @@ create_spins (GtkWidget *widget) /* Time, month, hex spinners */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE); label = gtk_label_new ("Time :"); gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox2), label, TRUE); adjustment = gtk_adjustment_new (0, 0, 1410, 30, 60, 0); spinner = gtk_spin_button_new (adjustment, 0, 0); @@ -3850,15 +3851,15 @@ create_spins (GtkWidget *widget) NULL); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (spinner), 5); - gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox2), spinner, TRUE); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE); label = gtk_label_new ("Month :"); gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox2), label, TRUE); adjustment = gtk_adjustment_new (1.0, 1.0, 12.0, 1.0, 5.0, 0.0); @@ -3875,15 +3876,15 @@ create_spins (GtkWidget *widget) NULL); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (spinner), 9); - gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox2), spinner, TRUE); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE); label = gtk_label_new ("Hex :"); gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox2), label, TRUE); adjustment = gtk_adjustment_new (0, 0, 255, 1, 16, 0); spinner = gtk_spin_button_new (adjustment, 0, 0); @@ -3898,87 +3899,87 @@ create_spins (GtkWidget *widget) NULL); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE); gtk_entry_set_width_chars (GTK_ENTRY (spinner), 4); - gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox2), spinner, TRUE); frame = gtk_frame_new ("Accelerated"); - gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (frame), vbox); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE); label = gtk_label_new ("Value :"); gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox2), label, TRUE); adjustment = gtk_adjustment_new (0.0, -10000.0, 10000.0, 0.5, 100.0, 0.0); spinner1 = gtk_spin_button_new (adjustment, 1.0, 2); gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE); - gtk_box_pack_start (GTK_BOX (vbox2), spinner1, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox2), spinner1, TRUE); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE); label = gtk_label_new ("Digits :"); gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox2), label, TRUE); adjustment = gtk_adjustment_new (2, 1, 15, 1, 1, 0); spinner2 = gtk_spin_button_new (adjustment, 0.0, 0); g_signal_connect (adjustment, "value_changed", G_CALLBACK (change_digits), spinner2); - gtk_box_pack_start (GTK_BOX (vbox2), spinner2, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox2), spinner2, TRUE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); button = gtk_check_button_new_with_label ("Snap to 0.5-ticks"); g_signal_connect (button, "clicked", G_CALLBACK (toggle_snap), spinner1); - gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), button, TRUE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); button = gtk_check_button_new_with_label ("Numeric only input mode"); g_signal_connect (button, "clicked", G_CALLBACK (toggle_numeric), spinner1); - gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), button, TRUE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); val_label = gtk_label_new (""); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); button = gtk_button_new_with_label ("Value as Int"); g_object_set_data (G_OBJECT (button), "user_data", val_label); g_signal_connect (button, "clicked", G_CALLBACK (get_value), GINT_TO_POINTER (1)); - 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 ("Value as Float"); g_object_set_data (G_OBJECT (button), "user_data", val_label); g_signal_connect (button, "clicked", G_CALLBACK (get_value), GINT_TO_POINTER (2)); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); - gtk_box_pack_start (GTK_BOX (vbox), val_label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), val_label, TRUE); gtk_label_set_text (GTK_LABEL (val_label), "0"); frame = gtk_frame_new ("Using Convenience Constructor"); - gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (frame), hbox); @@ -3989,17 +3990,17 @@ create_spins (GtkWidget *widget) gtk_spin_button_set_value (GTK_SPIN_BUTTON (spinner), 0.0); g_signal_connect (spinner, "value_changed", G_CALLBACK (get_spin_value), val_label); - gtk_box_pack_start (GTK_BOX (hbox), spinner, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (hbox), val_label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), spinner, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), val_label, TRUE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (main_vbox), hbox, TRUE); 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 (hbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); } if (!gtk_widget_get_visible (window)) @@ -4303,21 +4304,21 @@ create_cursors (GtkWidget *widget) guint w, h; hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); label = gtk_label_new ("Cursor Theme:"); gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); entry = gtk_entry_new (); gtk_entry_set_text (GTK_ENTRY (entry), "default"); - gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE); gdk_display_get_maximal_cursor_size (gtk_widget_get_display (vbox), &w, &h); size = gtk_spin_button_new_with_range (1.0, MIN (w, h), 1.0); gtk_spin_button_set_value (GTK_SPIN_BUTTON (size), 24.0); - gtk_box_pack_start (GTK_BOX (hbox), size, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), size, TRUE); g_signal_connect (entry, "changed", G_CALLBACK (change_cursor_theme), hbox); @@ -4326,12 +4327,12 @@ create_cursors (GtkWidget *widget) } hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); label = gtk_label_new ("Cursor Name:"); gtk_widget_set_halign (label, GTK_ALIGN_START); gtk_widget_set_valign (label, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); entry = gtk_entry_new (); completion = gtk_entry_completion_new (); @@ -4340,7 +4341,7 @@ create_cursors (GtkWidget *widget) gtk_entry_completion_set_text_column (completion, 0); gtk_entry_set_completion (GTK_ENTRY (entry), completion); g_object_unref (model); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE); frame = g_object_new (gtk_frame_get_type (), @@ -4367,16 +4368,16 @@ create_cursors (GtkWidget *widget) any = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (main_vbox), any, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (main_vbox), any, TRUE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (main_vbox), hbox, TRUE); 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 (hbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); gtk_widget_show (window); @@ -4530,7 +4531,7 @@ create_flipping (GtkWidget *widget) gtk_window_set_title (GTK_WINDOW (window), "Bidirectional Flipping"); check_button = gtk_check_button_new_with_label ("Right-to-left global direction"); - gtk_box_pack_start (GTK_BOX (content_area), check_button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), check_button, TRUE); if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE); @@ -4539,22 +4540,22 @@ create_flipping (GtkWidget *widget) G_CALLBACK (flipping_toggled_cb), NULL); check_button = gtk_check_button_new_with_label ("Toggle orientation of all boxes"); - gtk_box_pack_start (GTK_BOX (content_area), check_button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), check_button, TRUE); g_signal_connect (check_button, "toggled", G_CALLBACK (flipping_orientation_toggled_cb), NULL); gtk_box_pack_start (GTK_BOX (content_area), create_forward_back ("Default", GTK_TEXT_DIR_NONE), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (content_area), create_forward_back ("Left-to-Right", GTK_TEXT_DIR_LTR), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (content_area), create_forward_back ("Right-to-Left", GTK_TEXT_DIR_RTL), - TRUE, TRUE); + TRUE); gtk_dialog_add_button (GTK_DIALOG (window), "Close", GTK_RESPONSE_CLOSE); g_signal_connect (window, "response", G_CALLBACK (gtk_widget_destroy), NULL); @@ -4641,7 +4642,7 @@ create_focus (GtkWidget *widget) frame = gtk_frame_new ("Weird tab focus chain"); - gtk_box_pack_start (GTK_BOX (content_area), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), frame, TRUE); table = make_focus_table (&list); @@ -4654,7 +4655,7 @@ create_focus (GtkWidget *widget) frame = gtk_frame_new ("Default tab focus chain"); - gtk_box_pack_start (GTK_BOX (content_area), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), frame, TRUE); list = NULL; table = make_focus_table (&list); @@ -4746,7 +4747,7 @@ dialog_response_cb (GtkWidget *widget, gint response, gpointer unused) label = gtk_label_new ("Dialog Test"); g_object_set (label, "margin", 10, NULL); gtk_box_pack_start (GTK_BOX (content_area), - label, TRUE, TRUE); + label, TRUE); gtk_widget_show (label); } @@ -5001,7 +5002,7 @@ create_event_watcher (GtkWidget *widget) g_signal_connect (button, "clicked", G_CALLBACK (event_watcher_toggle), NULL); - gtk_box_pack_start (GTK_BOX (content_area), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), button, TRUE); gtk_widget_show (button); gtk_dialog_add_button (GTK_DIALOG (dialog_window), "Close", GTK_RESPONSE_CLOSE); @@ -5059,7 +5060,7 @@ create_range_controls (GtkWidget *widget) box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); - gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), box2, TRUE); gtk_widget_show (box2); @@ -5069,11 +5070,11 @@ create_range_controls (GtkWidget *widget) gtk_widget_set_size_request (GTK_WIDGET (scale), 150, -1); gtk_scale_set_digits (GTK_SCALE (scale), 1); gtk_scale_set_draw_value (GTK_SCALE (scale), TRUE); - gtk_box_pack_start (GTK_BOX (box2), scale, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), scale, TRUE); gtk_widget_show (scale); scrollbar = gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (adjustment)); - gtk_box_pack_start (GTK_BOX (box2), scrollbar, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), scrollbar, TRUE); gtk_widget_show (scrollbar); scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (adjustment)); @@ -5082,7 +5083,7 @@ create_range_controls (GtkWidget *widget) "format_value", G_CALLBACK (reformat_value), NULL); - gtk_box_pack_start (GTK_BOX (box2), scale, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), scale, TRUE); gtk_widget_show (scale); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); @@ -5091,7 +5092,7 @@ create_range_controls (GtkWidget *widget) gtk_widget_set_size_request (scale, -1, 200); gtk_scale_set_digits (GTK_SCALE (scale), 2); gtk_scale_set_draw_value (GTK_SCALE (scale), TRUE); - gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE); gtk_widget_show (scale); scale = gtk_scale_new (GTK_ORIENTATION_VERTICAL, GTK_ADJUSTMENT (adjustment)); @@ -5099,7 +5100,7 @@ create_range_controls (GtkWidget *widget) gtk_scale_set_digits (GTK_SCALE (scale), 2); gtk_scale_set_draw_value (GTK_SCALE (scale), TRUE); gtk_range_set_inverted (GTK_RANGE (scale), TRUE); - gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE); gtk_widget_show (scale); scale = gtk_scale_new (GTK_ORIENTATION_VERTICAL, GTK_ADJUSTMENT (adjustment)); @@ -5108,20 +5109,20 @@ create_range_controls (GtkWidget *widget) "format_value", G_CALLBACK (reformat_value), NULL); - gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE); gtk_widget_show (scale); - gtk_box_pack_start (GTK_BOX (box2), hbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), hbox, TRUE); gtk_widget_show (hbox); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), separator, TRUE); gtk_widget_show (separator); 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); @@ -5129,7 +5130,7 @@ create_range_controls (GtkWidget *widget) 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); @@ -5271,21 +5272,21 @@ create_pages (GtkNotebook *notebook, gint start, gint end) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); button = gtk_check_button_new_with_label ("Fill Tab"); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); g_signal_connect (button, "toggled", G_CALLBACK (tab_fill), child); button = gtk_check_button_new_with_label ("Expand Tab"); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); g_signal_connect (button, "toggled", G_CALLBACK (tab_expand), child); button = gtk_button_new_with_label ("Hide Page"); - gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), button, FALSE); g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_hide), child); @@ -5296,13 +5297,13 @@ create_pages (GtkNotebook *notebook, gint start, gint end) pixwid = gtk_image_new_from_pixbuf (book_closed); g_object_set_data (G_OBJECT (child), "tab_pixmap", pixwid); - gtk_box_pack_start (GTK_BOX (label_box), pixwid, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (label_box), pixwid, TRUE); gtk_widget_set_margin_start (pixwid, 3); gtk_widget_set_margin_end (pixwid, 3); gtk_widget_set_margin_bottom (pixwid, 1); gtk_widget_set_margin_top (pixwid, 1); label = gtk_label_new_with_mnemonic (accel_buffer); - gtk_box_pack_start (GTK_BOX (label_box), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (label_box), label, TRUE); gtk_widget_show (label_box); @@ -5310,13 +5311,13 @@ create_pages (GtkNotebook *notebook, gint start, gint end) pixwid = gtk_image_new_from_pixbuf (book_closed); g_object_set_data (G_OBJECT (child), "menu_pixmap", pixwid); - gtk_box_pack_start (GTK_BOX (menu_box), pixwid, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (menu_box), pixwid, TRUE); gtk_widget_set_margin_start (pixwid, 3); gtk_widget_set_margin_end (pixwid, 3); gtk_widget_set_margin_bottom (pixwid, 1); gtk_widget_set_margin_top (pixwid, 1); label = gtk_label_new (buffer); - gtk_box_pack_start (GTK_BOX (menu_box), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (menu_box), label, TRUE); gtk_widget_show (menu_box); gtk_notebook_append_page_menu (notebook, child, label_box, menu_box); @@ -5442,7 +5443,7 @@ create_notebook (GtkWidget *widget) g_signal_connect (sample_notebook, "switch_page", G_CALLBACK (page_switch), NULL); gtk_notebook_set_tab_pos (GTK_NOTEBOOK (sample_notebook), GTK_POS_TOP); - gtk_box_pack_start (GTK_BOX (box1), sample_notebook, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), sample_notebook, TRUE); gtk_widget_realize (sample_notebook); @@ -5455,62 +5456,62 @@ create_notebook (GtkWidget *widget) create_pages (GTK_NOTEBOOK (sample_notebook), 1, 5); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), separator, TRUE); box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); - gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), box2, TRUE); button = gtk_check_button_new_with_label ("popup menu"); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, FALSE); + gtk_box_pack_start (GTK_BOX (box2), button, FALSE); g_signal_connect (button, "clicked", G_CALLBACK (notebook_popup), sample_notebook); box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); - gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), box2, TRUE); label = gtk_label_new ("Notebook Style :"); - gtk_box_pack_start (GTK_BOX (box2), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), label, TRUE); omenu = build_option_menu (items, G_N_ELEMENTS (items), 0, notebook_type_changed, sample_notebook); - gtk_box_pack_start (GTK_BOX (box2), omenu, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), omenu, TRUE); button = gtk_button_new_with_label ("Show all Pages"); - gtk_box_pack_start (GTK_BOX (box2), button, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); g_signal_connect (button, "clicked", G_CALLBACK (show_all_pages), sample_notebook); box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); gtk_box_set_homogeneous (GTK_BOX (box2), TRUE); - gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), box2, TRUE); button = gtk_button_new_with_label ("prev"); g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_notebook_prev_page), sample_notebook); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); button = gtk_button_new_with_label ("next"); g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_notebook_next_page), sample_notebook); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); button = gtk_button_new_with_label ("rotate"); g_signal_connect (button, "clicked", G_CALLBACK (rotate_notebook), sample_notebook); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), separator, TRUE); 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 (box1), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box1), button, FALSE); gtk_widget_set_can_default (button, TRUE); gtk_widget_grab_default (button); } @@ -5633,7 +5634,7 @@ create_panes (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (window), vbox); vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL); - 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); @@ -5663,14 +5664,14 @@ create_panes (GtkWidget *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); gtk_widget_show (vbox); } @@ -5725,13 +5726,13 @@ paned_keyboard_window1 (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (frame1), vbox1); button7 = gtk_button_new_with_label ("button7"); - gtk_box_pack_start (GTK_BOX (vbox1), button7, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox1), button7, FALSE); button8 = gtk_button_new_with_label ("button8"); - gtk_box_pack_start (GTK_BOX (vbox1), button8, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox1), button8, FALSE); button9 = gtk_button_new_with_label ("button9"); - gtk_box_pack_start (GTK_BOX (vbox1), button9, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox1), button9, FALSE); vpaned1 = gtk_paned_new (GTK_ORIENTATION_VERTICAL); gtk_paned_pack2 (GTK_PANED (hpaned1), vpaned1, TRUE, TRUE); @@ -5747,10 +5748,10 @@ paned_keyboard_window1 (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (frame5), hbox1); button5 = gtk_button_new_with_label ("button5"); - gtk_box_pack_start (GTK_BOX (hbox1), button5, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox1), button5, FALSE); button6 = gtk_button_new_with_label ("button6"); - gtk_box_pack_start (GTK_BOX (hbox1), button6, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox1), button6, FALSE); frame3 = gtk_frame_new (NULL); gtk_paned_pack2 (GTK_PANED (vpaned1), frame3, TRUE, TRUE); @@ -5812,7 +5813,7 @@ paned_keyboard_window2 (GtkWidget *widget) gtk_paned_pack2 (GTK_PANED (hpaned2), hbox2, TRUE, TRUE); vpaned2 = gtk_paned_new (GTK_ORIENTATION_VERTICAL); - gtk_box_pack_start (GTK_BOX (hbox2), vpaned2, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox2), vpaned2, TRUE); frame7 = gtk_frame_new (NULL); gtk_paned_pack1 (GTK_PANED (vpaned2), frame7, FALSE, TRUE); @@ -5829,7 +5830,7 @@ paned_keyboard_window2 (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (frame8), button11); button10 = gtk_button_new_with_label ("button10"); - gtk_box_pack_start (GTK_BOX (hbox2), button10, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox2), button10, FALSE); return window2; } @@ -5864,10 +5865,10 @@ paned_keyboard_window3 (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (window3), vbox2); label1 = gtk_label_new ("Three panes nested inside each other"); - gtk_box_pack_start (GTK_BOX (vbox2), label1, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), label1, FALSE); hpaned3 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (vbox2), hpaned3, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox2), hpaned3, TRUE); frame9 = gtk_frame_new (NULL); gtk_paned_pack1 (GTK_PANED (hpaned3), frame9, FALSE, TRUE); @@ -5938,11 +5939,11 @@ paned_keyboard_window4 (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (window4), vbox3); label2 = gtk_label_new ("Widget tree:\n\nhpaned \n - vpaned\n - hbox\n - vpaned\n - vpaned\n - vpaned\n"); - gtk_box_pack_start (GTK_BOX (vbox3), label2, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox3), label2, FALSE); gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_LEFT); hpaned6 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (vbox3), hpaned6, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox3), hpaned6, TRUE); vpaned3 = gtk_paned_new (GTK_ORIENTATION_VERTICAL); gtk_paned_pack1 (GTK_PANED (hpaned6), vpaned3, FALSE, TRUE); @@ -5957,7 +5958,7 @@ paned_keyboard_window4 (GtkWidget *widget) gtk_paned_pack2 (GTK_PANED (hpaned6), hbox3, TRUE, TRUE); vpaned4 = gtk_paned_new (GTK_ORIENTATION_VERTICAL); - gtk_box_pack_start (GTK_BOX (hbox3), vpaned4, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox3), vpaned4, TRUE); button21 = gtk_button_new_with_label ("button21"); gtk_paned_pack1 (GTK_PANED (vpaned4), button21, FALSE, TRUE); @@ -5966,7 +5967,7 @@ paned_keyboard_window4 (GtkWidget *widget) gtk_paned_pack2 (GTK_PANED (vpaned4), button20, TRUE, TRUE); vpaned5 = gtk_paned_new (GTK_ORIENTATION_VERTICAL); - gtk_box_pack_start (GTK_BOX (hbox3), vpaned5, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox3), vpaned5, TRUE); button23 = gtk_button_new_with_label ("button23"); gtk_paned_pack1 (GTK_PANED (vpaned5), button23, FALSE, TRUE); @@ -5975,7 +5976,7 @@ paned_keyboard_window4 (GtkWidget *widget) gtk_paned_pack2 (GTK_PANED (vpaned5), button22, TRUE, TRUE); vpaned6 = gtk_paned_new (GTK_ORIENTATION_VERTICAL); - gtk_box_pack_start (GTK_BOX (hbox3), vpaned6, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox3), vpaned6, TRUE); button25 = gtk_button_new_with_label ("button25"); gtk_paned_pack1 (GTK_PANED (vpaned6), button25, FALSE, TRUE); @@ -6338,17 +6339,17 @@ create_wmhints (GtkWidget *widget) label = gtk_label_new ("Try iconizing me!"); gtk_widget_set_size_request (label, 150, 50); - gtk_box_pack_start (GTK_BOX (box1), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), label, TRUE); gtk_widget_show (label); separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), separator, TRUE); gtk_widget_show (separator); 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); @@ -6358,7 +6359,7 @@ create_wmhints (GtkWidget *widget) 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); @@ -6424,7 +6425,7 @@ tracking_label (GtkWidget *window) label = gtk_label_new ("<no window state events received>"); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE); g_signal_connect (window, "window_state_event", @@ -6437,7 +6438,7 @@ tracking_label (GtkWidget *window) G_CALLBACK (gtk_window_deiconify), window, G_CONNECT_SWAPPED); - gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (hbox), button, FALSE); button = gtk_button_new_with_label ("Iconify"); g_signal_connect_object (button, @@ -6445,7 +6446,7 @@ tracking_label (GtkWidget *window) G_CALLBACK (gtk_window_iconify), window, G_CONNECT_SWAPPED); - gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (hbox), button, FALSE); button = gtk_button_new_with_label ("Fullscreen"); g_signal_connect_object (button, @@ -6453,7 +6454,7 @@ tracking_label (GtkWidget *window) G_CALLBACK (gtk_window_fullscreen), window, G_CONNECT_SWAPPED); - gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (hbox), button, FALSE); button = gtk_button_new_with_label ("Unfullscreen"); g_signal_connect_object (button, @@ -6461,7 +6462,7 @@ tracking_label (GtkWidget *window) G_CALLBACK (gtk_window_unfullscreen), window, G_CONNECT_SWAPPED); - gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (hbox), button, FALSE); button = gtk_button_new_with_label ("Present"); g_signal_connect_object (button, @@ -6469,7 +6470,7 @@ tracking_label (GtkWidget *window) G_CALLBACK (gtk_window_present), window, G_CONNECT_SWAPPED); - gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (hbox), button, FALSE); button = gtk_button_new_with_label ("Show"); g_signal_connect_object (button, @@ -6477,7 +6478,7 @@ tracking_label (GtkWidget *window) G_CALLBACK (gtk_widget_show), window, G_CONNECT_SWAPPED); - gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (hbox), button, FALSE); gtk_widget_show (hbox); @@ -6525,7 +6526,7 @@ get_state_controls (GtkWidget *window) G_CALLBACK (gtk_window_stick), window, G_CONNECT_SWAPPED); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); button = gtk_button_new_with_label ("Unstick"); g_signal_connect_object (button, @@ -6533,7 +6534,7 @@ get_state_controls (GtkWidget *window) G_CALLBACK (gtk_window_unstick), window, G_CONNECT_SWAPPED); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); button = gtk_button_new_with_label ("Maximize"); g_signal_connect_object (button, @@ -6541,7 +6542,7 @@ get_state_controls (GtkWidget *window) G_CALLBACK (gtk_window_maximize), window, G_CONNECT_SWAPPED); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); button = gtk_button_new_with_label ("Unmaximize"); g_signal_connect_object (button, @@ -6549,7 +6550,7 @@ get_state_controls (GtkWidget *window) G_CALLBACK (gtk_window_unmaximize), window, G_CONNECT_SWAPPED); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); button = gtk_button_new_with_label ("Iconify"); g_signal_connect_object (button, @@ -6557,7 +6558,7 @@ get_state_controls (GtkWidget *window) G_CALLBACK (gtk_window_iconify), window, G_CONNECT_SWAPPED); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); button = gtk_button_new_with_label ("Fullscreen"); g_signal_connect_object (button, @@ -6565,7 +6566,7 @@ get_state_controls (GtkWidget *window) G_CALLBACK (gtk_window_fullscreen), window, G_CONNECT_SWAPPED); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); button = gtk_button_new_with_label ("Unfullscreen"); g_signal_connect_object (button, @@ -6573,21 +6574,21 @@ get_state_controls (GtkWidget *window) G_CALLBACK (gtk_window_unfullscreen), window, G_CONNECT_SWAPPED); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); button_above = gtk_toggle_button_new_with_label ("Keep above"); g_signal_connect (button_above, "toggled", G_CALLBACK (keep_window_above), window); - gtk_box_pack_start (GTK_BOX (vbox), button_above, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button_above, FALSE); button_below = gtk_toggle_button_new_with_label ("Keep below"); g_signal_connect (button_below, "toggled", G_CALLBACK (keep_window_below), window); - gtk_box_pack_start (GTK_BOX (vbox), button_below, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button_below, FALSE); g_object_set_data (G_OBJECT (button_above), "radio", button_below); g_object_set_data (G_OBJECT (button_below), "radio", button_above); @@ -6598,7 +6599,7 @@ get_state_controls (GtkWidget *window) G_CALLBACK (gtk_widget_hide), window, G_CONNECT_SWAPPED); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); gtk_widget_show (vbox); @@ -6852,7 +6853,7 @@ window_controls (GtkWidget *window) gtk_container_add (GTK_CONTAINER (control_window), vbox); label = gtk_label_new ("<no configure events>"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, TRUE); g_signal_connect (window, "configure_event", @@ -6862,14 +6863,14 @@ window_controls (GtkWidget *window) adjustment = gtk_adjustment_new (10.0, -2000.0, 2000.0, 1.0, 5.0, 0.0); spin = gtk_spin_button_new (adjustment, 0, 0); - gtk_box_pack_start (GTK_BOX (vbox), spin, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), spin, TRUE); g_object_set_data (G_OBJECT (control_window), "spin1", spin); adjustment = gtk_adjustment_new (10.0, -2000.0, 2000.0, 1.0, 5.0, 0.0); spin = gtk_spin_button_new (adjustment, 0, 0); - gtk_box_pack_start (GTK_BOX (vbox), spin, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), spin, TRUE); g_object_set_data (G_OBJECT (control_window), "spin2", spin); @@ -6879,56 +6880,56 @@ window_controls (GtkWidget *window) G_CALLBACK (gtk_widget_queue_resize), window, G_CONNECT_SWAPPED); - gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), button, FALSE); button = gtk_button_new_with_label ("Resize"); g_signal_connect (button, "clicked", G_CALLBACK (set_size_callback), control_window); - gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), button, FALSE); button = gtk_button_new_with_label ("Set default size"); g_signal_connect (button, "clicked", G_CALLBACK (set_default_size_callback), control_window); - gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), button, FALSE); button = gtk_button_new_with_label ("Unset default size"); g_signal_connect (button, "clicked", G_CALLBACK (unset_default_size_callback), control_window); - gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), button, FALSE); button = gtk_button_new_with_label ("Set size request"); g_signal_connect (button, "clicked", G_CALLBACK (set_size_request_callback), control_window); - gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), button, FALSE); button = gtk_button_new_with_label ("Unset size request"); g_signal_connect (button, "clicked", G_CALLBACK (unset_size_request_callback), control_window); - gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), button, FALSE); button = gtk_button_new_with_label ("Move"); g_signal_connect (button, "clicked", G_CALLBACK (set_location_callback), control_window); - gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), button, FALSE); button = gtk_button_new_with_label ("Move to current position"); g_signal_connect (button, "clicked", G_CALLBACK (move_to_position_callback), control_window); - gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), button, FALSE); button = gtk_check_button_new_with_label ("Allow resize"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE); @@ -6936,7 +6937,7 @@ window_controls (GtkWidget *window) "toggled", G_CALLBACK (resizable_callback), control_window); - gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), button, FALSE); button = gtk_button_new_with_mnemonic ("_Show"); g_signal_connect_object (button, @@ -6944,7 +6945,7 @@ window_controls (GtkWidget *window) G_CALLBACK (gtk_widget_show), window, G_CONNECT_SWAPPED); - gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), button, FALSE); button = gtk_button_new_with_mnemonic ("_Hide"); g_signal_connect_object (button, @@ -6952,7 +6953,7 @@ window_controls (GtkWidget *window) G_CALLBACK (gtk_widget_hide), window, G_CONNECT_SWAPPED); - gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), button, FALSE); om = gtk_combo_box_text_new (); i = 0; @@ -6983,7 +6984,7 @@ window_controls (GtkWidget *window) G_CALLBACK (gravity_selected), control_window); - gtk_box_pack_end (GTK_BOX (vbox), om, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), om, FALSE); om = gtk_combo_box_text_new (); @@ -7010,7 +7011,7 @@ window_controls (GtkWidget *window) G_CALLBACK (pos_selected), control_window); - gtk_box_pack_end (GTK_BOX (vbox), om, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), om, FALSE); gtk_widget_show (vbox); @@ -7248,10 +7249,10 @@ create_progress_bar (GtkWidget *widget) gtk_window_set_title (GTK_WINDOW (pdata->window), "GtkProgressBar"); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); - gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE); frame = gtk_frame_new ("Progress"); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); gtk_container_add (GTK_CONTAINER (frame), vbox2); @@ -7261,19 +7262,19 @@ create_progress_bar (GtkWidget *widget) PANGO_ELLIPSIZE_MIDDLE); gtk_widget_set_halign (pdata->pbar, GTK_ALIGN_CENTER); gtk_widget_set_valign (pdata->pbar, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox2), pdata->pbar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), pdata->pbar, FALSE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); gtk_widget_set_halign (hbox, GTK_ALIGN_CENTER); gtk_widget_set_valign (hbox, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE); label = gtk_label_new ("Label updated by user :"); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); pdata->label = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (hbox), pdata->label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), pdata->label, TRUE); frame = gtk_frame_new ("Options"); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); gtk_container_add (GTK_CONTAINER (frame), vbox2); @@ -7281,7 +7282,7 @@ create_progress_bar (GtkWidget *widget) grid = gtk_grid_new (); gtk_grid_set_row_spacing (GTK_GRID (grid), 10); gtk_grid_set_column_spacing (GTK_GRID (grid), 10); - gtk_box_pack_start (GTK_BOX (vbox2), grid, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox2), grid, TRUE); label = gtk_label_new ("Orientation :"); gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1); @@ -7310,14 +7311,14 @@ create_progress_bar (GtkWidget *widget) gtk_grid_attach (GTK_GRID (grid), hbox, 1, 2, 1, 1); label = gtk_label_new ("Text: "); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); pdata->entry = gtk_entry_new (); gtk_widget_set_hexpand (pdata->entry, TRUE); g_signal_connect (pdata->entry, "changed", G_CALLBACK (entry_changed), pdata); - gtk_box_pack_start (GTK_BOX (hbox), pdata->entry, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), pdata->entry, TRUE); gtk_widget_set_size_request (pdata->entry, 100, -1); label = gtk_label_new ("Ellipsize text :"); @@ -7640,14 +7641,14 @@ create_snapshot (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (window), vbox); button = gtk_button_new_with_label ("Snapshot widget"); - gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), button, TRUE); g_signal_connect (button, "clicked", G_CALLBACK (snapshot_widget), data); button = gtk_button_new_with_label ("Snapshot toplevel"); data->toplevel_button = button; - gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), button, TRUE); g_signal_connect (button, "clicked", G_CALLBACK (snapshot_widget), data); @@ -7762,16 +7763,16 @@ create_selection_test (GtkWidget *widget) /* Create the list */ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); - gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE); label = gtk_label_new ("Gets available targets for current selection"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); scrolled_win = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox), scrolled_win, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), scrolled_win, TRUE); gtk_widget_set_size_request (scrolled_win, 100, 200); store = gtk_list_store_new (1, G_TYPE_STRING); @@ -7910,12 +7911,12 @@ create_scroll_test (GtkWidget *widget) gtk_window_set_title (GTK_WINDOW (window), "Scroll Test"); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - 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); drawing_area = gtk_drawing_area_new (); gtk_widget_set_size_request (drawing_area, 200, 200); - gtk_box_pack_start (GTK_BOX (hbox), drawing_area, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), drawing_area, TRUE); gtk_widget_show (drawing_area); gtk_widget_set_events (drawing_area, GDK_EXPOSURE_MASK | GDK_SCROLL_MASK); @@ -7924,7 +7925,7 @@ create_scroll_test (GtkWidget *widget) scroll_test_pos = 0.0; scrollbar = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, adjustment); - gtk_box_pack_start (GTK_BOX (hbox), scrollbar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), scrollbar, FALSE); gtk_widget_show (scrollbar); g_signal_connect (drawing_area, "draw", @@ -8028,7 +8029,7 @@ create_timeout_test (GtkWidget *widget) label = gtk_label_new ("count: 0"); g_object_set (label, "margin", 10, NULL); - gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), label, TRUE); gtk_widget_show (label); button = gtk_button_new_with_label ("close"); @@ -8036,7 +8037,7 @@ create_timeout_test (GtkWidget *widget) G_CALLBACK (gtk_widget_destroy), window); gtk_widget_set_can_default (button, TRUE); - gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (action_area), button, TRUE); gtk_widget_grab_default (button); gtk_widget_show (button); @@ -8045,7 +8046,7 @@ create_timeout_test (GtkWidget *widget) G_CALLBACK(start_timeout_test), label); gtk_widget_set_can_default (button, TRUE); - gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (action_area), button, TRUE); gtk_widget_show (button); button = gtk_button_new_with_label ("stop"); @@ -8053,7 +8054,7 @@ create_timeout_test (GtkWidget *widget) G_CALLBACK (stop_timeout_test), NULL); gtk_widget_set_can_default (button, TRUE); - gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (action_area), button, TRUE); gtk_widget_show (button); } @@ -8099,7 +8100,7 @@ create_mainloop (GtkWidget *widget) label = gtk_label_new ("In recursive main loop..."); g_object_set (label, "margin", 20, NULL); - gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), label, TRUE); gtk_widget_show (label); gtk_dialog_add_button (GTK_DIALOG (window), @@ -8527,7 +8528,7 @@ create_native_dialogs (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (window), box); label = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), label, FALSE); combo = gtk_combo_box_text_new (); @@ -8540,7 +8541,7 @@ create_native_dialogs (GtkWidget *widget) g_signal_connect (combo, "changed", G_CALLBACK (native_action_changed), native); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), GTK_FILE_CHOOSER_ACTION_OPEN); - gtk_box_pack_start (GTK_BOX (box), combo, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), combo, FALSE); combo = gtk_combo_box_text_new (); @@ -8551,34 +8552,34 @@ create_native_dialogs (GtkWidget *widget) g_signal_connect (combo, "changed", G_CALLBACK (native_filter_changed), native); gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0); - gtk_box_pack_start (GTK_BOX (box), combo, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), combo, FALSE); check_button = gtk_check_button_new_with_label ("Modal"); g_signal_connect (check_button, "toggled", G_CALLBACK (native_modal_toggle), native); - gtk_box_pack_start (GTK_BOX (box), check_button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), check_button, FALSE); check_button = gtk_check_button_new_with_label ("Multiple select"); g_signal_connect (check_button, "toggled", G_CALLBACK (native_multi_select_toggle), native); - gtk_box_pack_start (GTK_BOX (box), check_button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), check_button, FALSE); check_button = gtk_check_button_new_with_label ("Confirm overwrite"); g_signal_connect (check_button, "toggled", G_CALLBACK (native_overwrite_confirmation_toggle), native); - gtk_box_pack_start (GTK_BOX (box), check_button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), check_button, FALSE); check_button = gtk_check_button_new_with_label ("Extra widget"); g_signal_connect (check_button, "toggled", G_CALLBACK (native_extra_widget_toggle), native); - gtk_box_pack_start (GTK_BOX (box), check_button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), check_button, FALSE); show_button = gtk_button_new_with_label ("Show"); hide_button = gtk_button_new_with_label ("Hide"); gtk_widget_set_sensitive (hide_button, FALSE); - gtk_box_pack_start (GTK_BOX (box), show_button, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (box), hide_button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), show_button, FALSE); + gtk_box_pack_start (GTK_BOX (box), hide_button, FALSE); /* connect signals */ g_signal_connect (native, "response", @@ -8716,14 +8717,14 @@ create_main_window (void) gtk_get_minor_version ()); label = gtk_label_new (buffer); - gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box1), label, FALSE); gtk_widget_set_name (label, "testgtk-version-label"); scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (box1), scrolled_window, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), scrolled_window, TRUE); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (scrolled_window), box2); @@ -8741,20 +8742,20 @@ create_main_window (void) NULL); else gtk_widget_set_sensitive (button, FALSE); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); } separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), separator, TRUE); 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); button = gtk_button_new_with_mnemonic ("_Close"); g_signal_connect (button, "clicked", G_CALLBACK (do_exit), 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); diff --git a/tests/testheaderbar.c b/tests/testheaderbar.c index 75bde0df4f..79406ba665 100644 --- a/tests/testheaderbar.c +++ b/tests/testheaderbar.c @@ -92,10 +92,11 @@ change_header (GtkButton *button, gpointer data) g_object_set (box, "margin", 10, NULL); gtk_container_add (GTK_CONTAINER (header), box); label = gtk_label_new ("Label"); - gtk_box_pack_start (GTK_BOX (box), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box), label, TRUE); widget = gtk_level_bar_new (); gtk_level_bar_set_value (GTK_LEVEL_BAR (widget), 0.4); - gtk_box_pack_start (GTK_BOX (box), widget, TRUE, TRUE); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (box), widget, TRUE); } else { @@ -159,12 +160,12 @@ main (int argc, char *argv[]) button = gtk_button_new_with_label ("Fullscreen"); gtk_action_bar_pack_end (GTK_ACTION_BAR (footer), button); g_signal_connect (button, "clicked", G_CALLBACK (toggle_fullscreen), window); - gtk_box_pack_end (GTK_BOX (box), footer, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (box), footer, FALSE); content = gtk_image_new_from_icon_name ("start-here-symbolic", GTK_ICON_SIZE_DIALOG); gtk_image_set_pixel_size (GTK_IMAGE (content), 512); - gtk_box_pack_start (GTK_BOX (box), content, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box), content, TRUE); gtk_widget_show (window); diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c index 7a0d4138ea..41009b7c68 100644 --- a/tests/testheightforwidth.c +++ b/tests/testheightforwidth.c @@ -977,7 +977,7 @@ create_window (void) g_signal_connect (button, "clicked", G_CALLBACK (test_clicked), &interfaces[i]); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); } return window; diff --git a/tests/testiconview.c b/tests/testiconview.c index 9fe3fb8522..bc9a77ed69 100644 --- a/tests/testiconview.c +++ b/tests/testiconview.c @@ -433,7 +433,8 @@ main (gint argc, gchar **argv) gtk_container_add (GTK_CONTAINER (window), vbox); paned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); - gtk_box_pack_start (GTK_BOX (vbox), paned, TRUE, TRUE); + gtk_widget_set_vexpand (paned, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), paned, TRUE); icon_list = gtk_icon_view_new (); gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_list), GTK_SELECTION_MULTIPLE); @@ -553,43 +554,43 @@ main (gint argc, gchar **argv) bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START); - gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE); button = gtk_button_new_with_label ("Add some"); g_signal_connect (button, "clicked", G_CALLBACK (add_some), icon_list); - gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (bbox), button, TRUE); button = gtk_button_new_with_label ("Add many"); g_signal_connect (button, "clicked", G_CALLBACK (add_many), icon_list); - gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (bbox), button, TRUE); button = gtk_button_new_with_label ("Add large"); g_signal_connect (button, "clicked", G_CALLBACK (add_large), icon_list); - gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (bbox), button, TRUE); button = gtk_button_new_with_label ("Remove selected"); g_signal_connect (button, "clicked", G_CALLBACK (foreach_selected_remove), icon_list); - gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (bbox), button, TRUE); button = gtk_button_new_with_label ("Swap"); g_signal_connect (button, "clicked", G_CALLBACK (swap_rows), icon_list); - gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (bbox), button, TRUE); bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START); - gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE); button = gtk_button_new_with_label ("Select all"); g_signal_connect (button, "clicked", G_CALLBACK (select_all), icon_list); - gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (bbox), button, TRUE); button = gtk_button_new_with_label ("Unselect all"); g_signal_connect (button, "clicked", G_CALLBACK (unselect_all), icon_list); - gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (bbox), button, TRUE); button = gtk_button_new_with_label ("Select nonexisting"); g_signal_connect (button, "clicked", G_CALLBACK (select_nonexisting), icon_list); - gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (bbox), button, TRUE); icon_list = gtk_icon_view_new (); diff --git a/tests/testinput.c b/tests/testinput.c index 38899ca4ed..d7b4e6e097 100644 --- a/tests/testinput.c +++ b/tests/testinput.c @@ -256,7 +256,8 @@ main (int argc, char *argv[]) drawing_area = gtk_drawing_area_new (); gtk_widget_set_size_request (drawing_area, 200, 200); - gtk_box_pack_start (GTK_BOX (vbox), drawing_area, TRUE, TRUE); + gtk_widget_set_vexpand (drawing_area, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), drawing_area, TRUE); gtk_widget_show (drawing_area); @@ -308,7 +309,7 @@ main (int argc, char *argv[]) /* .. And create some buttons */ button = gtk_button_new_with_label ("Quit"); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), diff --git a/tests/testlist3.c b/tests/testlist3.c index 5ce5d66c2a..686cf8af95 100644 --- a/tests/testlist3.c +++ b/tests/testlist3.c @@ -92,7 +92,8 @@ create_row (const gchar *text) g_object_set (box, "margin-start", 10, "margin-end", 10, NULL); label = gtk_label_new (text); gtk_container_add (GTK_CONTAINER (row), box); - gtk_box_pack_start (GTK_BOX (box), label, TRUE, FALSE); + gtk_widget_set_hexpand (label, TRUE); + gtk_container_add (GTK_CONTAINER (box), label); gtk_container_add (GTK_CONTAINER (box), ebox); gtk_drag_source_set (ebox, GDK_BUTTON1_MASK, entries, 1, GDK_ACTION_MOVE); diff --git a/tests/testmultidisplay.c b/tests/testmultidisplay.c index 6c23a2dc10..aacc430e04 100644 --- a/tests/testmultidisplay.c +++ b/tests/testmultidisplay.c @@ -78,9 +78,9 @@ make_selection_dialog (GdkScreen * screen, vbox = g_object_new (GTK_TYPE_BOX, "orientation", GTK_ORIENTATION_VERTICAL, NULL); - gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE); - gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE); gtk_widget_grab_focus (entry); gtk_dialog_add_buttons (GTK_DIALOG (window), diff --git a/tests/testorientable.c b/tests/testorientable.c index 12e5833346..91ee7536b6 100644 --- a/tests/testorientable.c +++ b/tests/testorientable.c @@ -64,13 +64,13 @@ main (int argc, char **argv) gtk_grid_attach (GTK_GRID (grid), box, 0, 1, 1, 1); gtk_box_pack_start (GTK_BOX (box), gtk_button_new_with_label ("GtkBox 1"), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (box), gtk_button_new_with_label ("GtkBox 2"), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (box), gtk_button_new_with_label ("GtkBox 3"), - TRUE, TRUE); + TRUE); /* GtkButtonBox */ box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL); @@ -78,13 +78,13 @@ main (int argc, char **argv) gtk_grid_attach (GTK_GRID (grid), box, 1, 1, 1, 1); gtk_box_pack_start (GTK_BOX (box), gtk_button_new_with_label ("GtkButtonBox 1"), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (box), gtk_button_new_with_label ("GtkButtonBox 2"), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (box), gtk_button_new_with_label ("GtkButtonBox 3"), - TRUE, TRUE); + TRUE); /* GtkSeparator */ box = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL); diff --git a/tests/testoverlay.c b/tests/testoverlay.c index 1d510d3d22..aa0ae6bd07 100644 --- a/tests/testoverlay.c +++ b/tests/testoverlay.c @@ -464,12 +464,12 @@ test_input_stacking (void) "But the entry does"); 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); entry = gtk_entry_new (); 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 (win), overlay); diff --git a/tests/testpixbuf-scale.c b/tests/testpixbuf-scale.c index 880410a473..3a5f809e32 100644 --- a/tests/testpixbuf-scale.c +++ b/tests/testpixbuf-scale.c @@ -108,13 +108,13 @@ main(int argc, char **argv) NULL); gtk_widget_set_halign (combo_box, GTK_ALIGN_START); - gtk_box_pack_start (GTK_BOX (vbox), combo_box, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), combo_box, FALSE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); label = gtk_label_new ("Overall Alpha:"); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE); adjustment = gtk_adjustment_new (overall_alpha, 0, 255, 1, 10, 0); g_signal_connect (adjustment, "value_changed", @@ -122,14 +122,16 @@ main(int argc, char **argv) hscale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adjustment); gtk_scale_set_digits (GTK_SCALE (hscale), 0); - gtk_box_pack_start (GTK_BOX (hbox), hscale, TRUE, TRUE); + gtk_widget_set_hexpand (hscale, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), hscale, TRUE); /* Compute the size without the drawing area, so we know how big to make the default size */ gtk_widget_get_preferred_size ( (vbox), &scratch_requisition, NULL); darea = gtk_drawing_area_new (); - gtk_box_pack_start (GTK_BOX (vbox), darea, TRUE, TRUE); + gtk_widget_set_hexpand (darea, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), darea, TRUE); gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (darea), draw_func, NULL, NULL); diff --git a/tests/testrecentchoosermenu.c b/tests/testrecentchoosermenu.c index 744b008544..b3a65c0c2c 100644 --- a/tests/testrecentchoosermenu.c +++ b/tests/testrecentchoosermenu.c @@ -167,7 +167,7 @@ main (int argc, char *argv[]) gtk_widget_show (box); menubar = gtk_menu_bar_new (); - gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box), menubar, TRUE); gtk_widget_show (menubar); menu = create_file_menu (accel_group); @@ -183,14 +183,14 @@ main (int argc, char *argv[]) gtk_widget_show (menuitem); label = gtk_label_new ("No recent item selected"); - gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), label, TRUE); gtk_widget_show (label); button = gtk_button_new_with_label ("Close"); g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_widget_destroy), window); - gtk_box_pack_end (GTK_BOX (box), button, TRUE, TRUE); + gtk_box_pack_end (GTK_BOX (box), button, TRUE); gtk_widget_set_can_default (button, TRUE); gtk_widget_grab_default (button); gtk_widget_show (button); diff --git a/tests/testscale.c b/tests/testscale.c index f33c22c62d..b4065e5dbd 100644 --- a/tests/testscale.c +++ b/tests/testscale.c @@ -130,7 +130,7 @@ int main (int argc, char *argv[]) scales = g_slist_prepend (scales, scale); gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE); gtk_container_add (GTK_CONTAINER (frame), scale); - gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), frame, FALSE); frame = gtk_frame_new ("With fill level"); scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1); @@ -139,7 +139,7 @@ int main (int argc, char *argv[]) gtk_range_set_show_fill_level (GTK_RANGE (scale), TRUE); gtk_range_set_fill_level (GTK_RANGE (scale), 50); gtk_container_add (GTK_CONTAINER (frame), scale); - gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), frame, FALSE); frame = gtk_frame_new ("Simple marks"); extra_scale = scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1); @@ -149,7 +149,7 @@ int main (int argc, char *argv[]) gtk_scale_add_mark (GTK_SCALE (scale), marks[1], GTK_POS_BOTTOM, NULL); gtk_scale_add_mark (GTK_SCALE (scale), marks[2], GTK_POS_BOTTOM, NULL); gtk_container_add (GTK_CONTAINER (frame), scale); - gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), frame, FALSE); frame = gtk_frame_new ("Simple marks up"); scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1); @@ -159,7 +159,7 @@ int main (int argc, char *argv[]) gtk_scale_add_mark (GTK_SCALE (scale), marks[1], GTK_POS_TOP, NULL); gtk_scale_add_mark (GTK_SCALE (scale), marks[2], GTK_POS_TOP, NULL); gtk_container_add (GTK_CONTAINER (frame), scale); - gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), frame, FALSE); frame = gtk_frame_new ("Labeled marks"); box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); @@ -171,7 +171,7 @@ int main (int argc, char *argv[]) gtk_scale_add_mark (GTK_SCALE (scale), marks[1], GTK_POS_BOTTOM, labels[1]); gtk_scale_add_mark (GTK_SCALE (scale), marks[2], GTK_POS_BOTTOM, labels[2]); gtk_container_add (GTK_CONTAINER (frame), scale); - gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), frame, FALSE); frame = gtk_frame_new ("Some labels"); scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1); @@ -181,7 +181,7 @@ int main (int argc, char *argv[]) gtk_scale_add_mark (GTK_SCALE (scale), marks[1], GTK_POS_TOP, NULL); gtk_scale_add_mark (GTK_SCALE (scale), marks[2], GTK_POS_TOP, labels[2]); gtk_container_add (GTK_CONTAINER (frame), scale); - gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), frame, FALSE); frame = gtk_frame_new ("Above and below"); scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1); @@ -192,7 +192,7 @@ int main (int argc, char *argv[]) gtk_scale_add_mark (GTK_SCALE (scale), bath_marks[2], GTK_POS_BOTTOM, bath_labels[2]); gtk_scale_add_mark (GTK_SCALE (scale), bath_marks[3], GTK_POS_TOP, bath_labels[3]); gtk_container_add (GTK_CONTAINER (frame), scale); - gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), frame, FALSE); frame = gtk_frame_new ("Positions"); scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1); @@ -203,7 +203,7 @@ int main (int argc, char *argv[]) gtk_scale_add_mark (GTK_SCALE (scale), pos_marks[2], GTK_POS_TOP, pos_labels[2]); gtk_scale_add_mark (GTK_SCALE (scale), pos_marks[3], GTK_POS_BOTTOM, pos_labels[3]); gtk_container_add (GTK_CONTAINER (frame), scale); - gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), frame, FALSE); box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_container_add (GTK_CONTAINER (box1), box2); diff --git a/tests/testscrolledwindow.c b/tests/testscrolledwindow.c index dcb9f6fad8..b2818cb5ae 100644 --- a/tests/testscrolledwindow.c +++ b/tests/testscrolledwindow.c @@ -102,11 +102,11 @@ scrollable_policy (void) gtk_widget_show (vbox); gtk_widget_show (hbox); gtk_container_add (GTK_CONTAINER (window), hbox); - gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE); frame = gtk_frame_new ("Scrolled Window"); - gtk_widget_show (frame); - gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE); + gtk_widget_set_hexpand (frame, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE); swindow = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), @@ -140,24 +140,24 @@ scrollable_policy (void) gtk_widget_show (cntl); gtk_widget_show (expander); gtk_container_add (GTK_CONTAINER (expander), cntl); - gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE); /* Add Horizontal policy control here */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); gtk_widget_show (hbox); widget = gtk_label_new ("hscroll-policy"); - gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); widget = gtk_combo_box_text_new (); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Minimum"); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Natural"); gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); - gtk_widget_show (widget); + gtk_widget_set_hexpand (widget, TRUE); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); + gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (horizontal_policy_changed), viewport); @@ -167,17 +167,17 @@ scrollable_policy (void) gtk_widget_show (hbox); widget = gtk_label_new ("vscroll-policy"); - gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); widget = gtk_combo_box_text_new (); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Minimum"); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Natural"); gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); - gtk_widget_show (widget); + gtk_widget_set_hexpand (widget, TRUE); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); + gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (vertical_policy_changed), viewport); @@ -186,12 +186,13 @@ scrollable_policy (void) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); widget = gtk_label_new ("min-content-width"); - gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); widget = gtk_spin_button_new_with_range (100.0, 1000.0, 10.0); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); + gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE); gtk_widget_show (widget); gtk_widget_show (hbox); @@ -201,12 +202,13 @@ scrollable_policy (void) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); widget = gtk_label_new ("min-content-height"); - gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); widget = gtk_spin_button_new_with_range (100.0, 1000.0, 10.0); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); + gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE); gtk_widget_show (widget); gtk_widget_show (hbox); @@ -218,25 +220,25 @@ scrollable_policy (void) gtk_widget_show (hbox); widget = gtk_label_new ("label-flip"); - gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); widget = gtk_combo_box_text_new (); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Horizontal"); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Vertical"); gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0); - gtk_widget_show (widget); + gtk_widget_set_hexpand (widget, TRUE); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); + gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE); g_signal_connect (G_OBJECT (widget), "changed", G_CALLBACK (label_flip_changed), label); /* Add Kinetic scrolling control here */ widget = gtk_check_button_new_with_label ("Kinetic scrolling"); - gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (cntl), widget, TRUE, TRUE); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (cntl), widget, TRUE); g_signal_connect (G_OBJECT (widget), "toggled", G_CALLBACK (kinetic_scrolling_changed), swindow); @@ -248,18 +250,17 @@ scrollable_policy (void) widget = gtk_menu_button_new (); gtk_menu_button_set_popover (GTK_MENU_BUTTON (widget), popover); gtk_container_add (GTK_CONTAINER (widget), gtk_label_new ("Popover")); - gtk_box_pack_start (GTK_BOX (cntl), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (cntl), widget, FALSE); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_add (GTK_CONTAINER (popover), vbox); - gtk_widget_show (vbox); /* Popover's scrolled window */ swindow = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_end (GTK_BOX (vbox), swindow, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (vbox), swindow, FALSE); gtk_widget_show (swindow); gtk_widget_show (hbox); @@ -272,13 +273,12 @@ scrollable_policy (void) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); widget = gtk_label_new ("min-content-width"); - gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); widget = gtk_spin_button_new_with_range (0.0, 150.0, 10.0); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); - gtk_widget_show (widget); - gtk_widget_show (hbox); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); g_object_bind_property (gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget)), "value", @@ -287,15 +287,14 @@ scrollable_policy (void) G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); widget = gtk_label_new ("min-content-height"); - gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); widget = gtk_spin_button_new_with_range (0.0, 150.0, 10.0); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); - gtk_widget_show (widget); - gtk_widget_show (hbox); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); g_object_bind_property (gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget)), "value", @@ -307,13 +306,12 @@ scrollable_policy (void) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); widget = gtk_label_new ("max-content-width"); - gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); widget = gtk_spin_button_new_with_range (250.0, 1000.0, 10.0); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); - gtk_widget_show (widget); - gtk_widget_show (hbox); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); g_object_bind_property (gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget)), "value", @@ -322,14 +320,13 @@ scrollable_policy (void) G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE); widget = gtk_label_new ("max-content-height"); - gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); widget = gtk_spin_button_new_with_range (250.0, 1000.0, 10.0); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); - gtk_widget_show (widget); - gtk_widget_show (hbox); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); g_object_bind_property (gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget)), "value", @@ -341,17 +338,16 @@ scrollable_policy (void) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); widget = gtk_button_new_with_label ("Remove"); - gtk_widget_show (widget); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); g_signal_connect (widget, "clicked", G_CALLBACK (remove_row), listbox); widget = gtk_button_new_with_label ("Add"); - gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); - gtk_widget_show (widget); - gtk_widget_show (hbox); + gtk_widget_set_hexpand (widget, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); g_signal_connect (widget, "clicked", G_CALLBACK (add_row), listbox); diff --git a/tests/testselection.c b/tests/testselection.c index 9f5d07309a..e0aa482389 100644 --- a/tests/testselection.c +++ b/tests/testselection.c @@ -418,7 +418,7 @@ main (int argc, char *argv[]) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); - gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE); gtk_widget_show (vbox); selection_button = gtk_toggle_button_new_with_label ("Claim Selection"); @@ -449,11 +449,12 @@ main (int argc, char *argv[]) gtk_widget_show (hbox); label = gtk_label_new ("Target:"); - gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX(hbox), label, FALSE); gtk_widget_show (label); entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX(hbox), entry, TRUE, TRUE); + gtk_widget_set_hexpand (entry, TRUE); + gtk_box_pack_start (GTK_BOX(hbox), entry, TRUE); gtk_widget_show (entry); /* .. And create some buttons */ diff --git a/tests/testsensitive.c b/tests/testsensitive.c index 4f4ccb7e33..663ce1e37c 100644 --- a/tests/testsensitive.c +++ b/tests/testsensitive.c @@ -65,15 +65,15 @@ int main (int argc, char *argv[]) gtk_container_add (GTK_CONTAINER (window), box); w = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 15); - gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (w), gtk_entry_new (), TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), w, TRUE); + gtk_box_pack_start (GTK_BOX (w), gtk_entry_new (), TRUE); bu = gtk_button_new_with_label ("Bu"); - gtk_box_pack_start (GTK_BOX (w), bu, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (w), bu, TRUE); c = gtk_switch_new (); gtk_switch_set_active (GTK_SWITCH (c), TRUE); gtk_widget_set_halign (c, GTK_ALIGN_CENTER); gtk_widget_set_valign (c, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (box), c, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), c, TRUE); g_signal_connect (bu, "clicked", G_CALLBACK (set_insensitive), w); g_signal_connect (bu, "state-flags-changed", G_CALLBACK (state_flags_changed), NULL); diff --git a/tests/testspinbutton.c b/tests/testspinbutton.c index 303192eb1e..91d06778ec 100644 --- a/tests/testspinbutton.c +++ b/tests/testspinbutton.c @@ -57,7 +57,7 @@ prepare_window_for_orientation (GtkOrientation orientation) gtk_widget_set_halign (GTK_WIDGET (spin), GTK_ALIGN_CENTER); GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); - gtk_box_pack_start (GTK_BOX (hbox), spin, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), spin, FALSE); gtk_container_add (GTK_CONTAINER (mainbox), hbox); } diff --git a/tests/teststack.c b/tests/teststack.c index 11176640a7..fa06a34cb1 100644 --- a/tests/teststack.c +++ b/tests/teststack.c @@ -127,7 +127,7 @@ main (gint argc, gtk_container_add (GTK_CONTAINER (window), box); switcher = gtk_stack_switcher_new (); - gtk_box_pack_start (GTK_BOX (box), switcher, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), switcher, FALSE); stack = gtk_stack_new (); @@ -141,8 +141,9 @@ main (gint argc, sidebar = gtk_stack_sidebar_new (); gtk_stack_sidebar_set_stack (GTK_STACK_SIDEBAR (sidebar), GTK_STACK (stack)); layout = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_box_pack_start (GTK_BOX (layout), sidebar, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (layout), stack, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (layout), sidebar, FALSE); + gtk_widget_set_hexpand (stack, TRUE); + gtk_box_pack_start (GTK_BOX (layout), stack, TRUE); gtk_container_add (GTK_CONTAINER (box), layout); diff --git a/tests/testswitch.c b/tests/testswitch.c index 0d07327ce0..6a483be804 100644 --- a/tests/testswitch.c +++ b/tests/testswitch.c @@ -26,13 +26,12 @@ make_switch (gboolean is_on, sw = gtk_switch_new (); gtk_switch_set_active (GTK_SWITCH (sw), is_on); - gtk_box_pack_start (GTK_BOX (hbox), sw, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), sw, FALSE); gtk_widget_set_sensitive (sw, is_sensitive); - gtk_widget_show (sw); label = gtk_label_new (is_on ? "Enabled" : "Disabled"); - gtk_box_pack_end (GTK_BOX (hbox), label, TRUE, TRUE); - gtk_widget_show (label); + gtk_widget_set_hexpand (label, TRUE); + gtk_box_pack_end (GTK_BOX (hbox), label, TRUE); g_object_bind_property_full (sw, "active", label, "label", @@ -117,27 +116,24 @@ make_delayed_switch (gboolean is_on, sw = gtk_switch_new (); gtk_switch_set_active (GTK_SWITCH (sw), is_on); - gtk_box_pack_start (GTK_BOX (hbox), sw, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), sw, FALSE); gtk_widget_set_sensitive (sw, is_sensitive); - gtk_widget_show (sw); g_signal_connect (sw, "state-set", G_CALLBACK (set_state), NULL); spinner = gtk_spinner_new (); - gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), spinner, TRUE); gtk_widget_set_opacity (spinner, 0.0); - gtk_widget_show (spinner); check = gtk_check_button_new (); - gtk_box_pack_end (GTK_BOX (hbox), check, FALSE, TRUE); - gtk_widget_show (check); + gtk_box_pack_end (GTK_BOX (hbox), check, TRUE); g_object_bind_property (sw, "state", check, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); label = gtk_label_new (is_on ? "Enabled" : "Disabled"); - gtk_box_pack_end (GTK_BOX (hbox), label, TRUE, TRUE); - gtk_widget_show (label); + gtk_widget_set_hexpand (label, TRUE); + gtk_box_pack_end (GTK_BOX (hbox), label, TRUE); g_object_bind_property_full (sw, "active", label, "label", diff --git a/tests/testtoolbar.c b/tests/testtoolbar.c index 5ab5337cf9..9ae1953e2e 100644 --- a/tests/testtoolbar.c +++ b/tests/testtoolbar.c @@ -509,19 +509,19 @@ main (gint argc, gchar **argv) gtk_grid_attach (GTK_GRID (grid), hbox2, 1, 2, 1, 1); checkbox = gtk_check_button_new_with_mnemonic("_Vertical"); - gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE); g_signal_connect (checkbox, "toggled", G_CALLBACK (change_orientation), toolbar); checkbox = gtk_check_button_new_with_mnemonic("_Show Arrow"); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), TRUE); - gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE); g_signal_connect (checkbox, "toggled", G_CALLBACK (change_show_arrow), toolbar); checkbox = gtk_check_button_new_with_mnemonic("_Set Toolbar Style:"); g_signal_connect (checkbox, "toggled", G_CALLBACK (set_toolbar_style_toggled), toolbar); - gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE); option_menu = gtk_combo_box_text_new (); gtk_widget_set_sensitive (option_menu, FALSE); @@ -531,13 +531,13 @@ main (gint argc, gchar **argv) gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (option_menu), toolbar_styles[i]); gtk_combo_box_set_active (GTK_COMBO_BOX (option_menu), gtk_toolbar_get_style (GTK_TOOLBAR (toolbar))); - gtk_box_pack_start (GTK_BOX (hbox2), option_menu, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox2), option_menu, FALSE); g_signal_connect (option_menu, "changed", G_CALLBACK (change_toolbar_style), toolbar); checkbox = gtk_check_button_new_with_mnemonic("_Set Icon Size:"); g_signal_connect (checkbox, "toggled", G_CALLBACK (set_icon_size_toggled), toolbar); - gtk_box_pack_start (GTK_BOX (hbox2), checkbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox2), checkbox, FALSE); option_menu = gtk_combo_box_text_new (); g_object_set_data (G_OBJECT (checkbox), "option-menu", option_menu); @@ -545,7 +545,7 @@ main (gint argc, gchar **argv) gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (option_menu), "small toolbar"); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (option_menu), "large toolbar"); - gtk_box_pack_start (GTK_BOX (hbox2), option_menu, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox2), option_menu, FALSE); g_signal_connect (option_menu, "changed", G_CALLBACK (icon_size_history_changed), toolbar); @@ -695,13 +695,13 @@ main (gint argc, gchar **argv) gtk_grid_attach (GTK_GRID (grid), hbox, 1, 4, 1, 1); button = gtk_button_new_with_label ("Drag me to the toolbar"); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE); label = gtk_label_new ("Drop index:"); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE); label = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE); checkbox = gtk_check_button_new_with_mnemonic("_Right to left"); if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) @@ -710,7 +710,7 @@ main (gint argc, gchar **argv) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), FALSE); g_signal_connect (checkbox, "toggled", G_CALLBACK (rtl_toggled), NULL); - gtk_box_pack_end (GTK_BOX (hbox), checkbox, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX (hbox), checkbox, FALSE); gtk_drag_source_set (button, GDK_BUTTON1_MASK, target_table, G_N_ELEMENTS (target_table), diff --git a/tests/testtooltips.c b/tests/testtooltips.c index 6ed4066cf9..64bde2d598 100644 --- a/tests/testtooltips.c +++ b/tests/testtooltips.c @@ -275,7 +275,7 @@ main (int argc, char *argv[]) /* A check button using the tooltip-markup property */ button = gtk_check_button_new_with_label ("This one uses the tooltip-markup property"); gtk_widget_set_tooltip_text (button, "Hello, I am a static tooltip."); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), button, FALSE); text = gtk_widget_get_tooltip_text (button); markup = gtk_widget_get_tooltip_markup (button); @@ -288,13 +288,13 @@ main (int argc, char *argv[]) g_object_set (button, "has-tooltip", TRUE, NULL); g_signal_connect (button, "query-tooltip", G_CALLBACK (query_tooltip_cb), NULL); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), button, FALSE); /* A label */ button = gtk_label_new ("I am just a label"); gtk_label_set_selectable (GTK_LABEL (button), FALSE); gtk_widget_set_tooltip_text (button, "Label & and tooltip"); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), button, FALSE); text = gtk_widget_get_tooltip_text (button); markup = gtk_widget_get_tooltip_markup (button); @@ -306,7 +306,7 @@ main (int argc, char *argv[]) button = gtk_label_new ("I am a selectable label"); gtk_label_set_selectable (GTK_LABEL (button), TRUE); gtk_widget_set_tooltip_markup (button, "<b>Another</b> Label tooltip"); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), button, FALSE); text = gtk_widget_get_tooltip_text (button); markup = gtk_widget_get_tooltip_markup (button); @@ -316,7 +316,7 @@ main (int argc, char *argv[]) /* Another one, with a custom tooltip window */ button = gtk_check_button_new_with_label ("This one has a custom tooltip window!"); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), button, FALSE); tooltip_window = gtk_window_new (GTK_WINDOW_POPUP); tooltip_button = gtk_label_new ("blaat!"); @@ -337,7 +337,7 @@ main (int argc, char *argv[]) button = gtk_button_new_with_label ("This one is insensitive"); gtk_widget_set_sensitive (button, FALSE); g_object_set (button, "tooltip-text", "Insensitive!", NULL); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), button, FALSE); /* Testcases from Kris without a tree view don't exist. */ tree_view = gtk_tree_view_new_with_model (create_model ()); @@ -360,7 +360,7 @@ main (int argc, char *argv[]) gtk_tree_view_column_set_clickable (column, TRUE); g_object_set (gtk_tree_view_column_get_button (column), "tooltip-text", "Header", NULL); - gtk_box_pack_start (GTK_BOX (box), tree_view, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), tree_view, FALSE); /* And a text view for Matthias */ buffer = gtk_text_buffer_new (NULL); @@ -384,7 +384,7 @@ main (int argc, char *argv[]) g_signal_connect (text_view, "query-tooltip", G_CALLBACK (query_tooltip_text_view_cb), tag); - gtk_box_pack_start (GTK_BOX (box), text_view, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), text_view, FALSE); /* Drawing area */ drawing_area = gtk_drawing_area_new (); @@ -395,7 +395,7 @@ main (int argc, char *argv[]) g_object_set (drawing_area, "has-tooltip", TRUE, NULL); g_signal_connect (drawing_area, "query-tooltip", G_CALLBACK (query_tooltip_drawing_area_cb), NULL); - gtk_box_pack_start (GTK_BOX (box), drawing_area, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), drawing_area, FALSE); button = gtk_label_new ("Custom tooltip I"); label = gtk_label_new ("See, custom"); @@ -403,13 +403,13 @@ main (int argc, char *argv[]) g_object_set (button, "has-tooltip", TRUE, NULL); g_signal_connect (button, "query-tooltip", G_CALLBACK (query_tooltip_label_cb), label); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), button, FALSE); button = gtk_label_new ("Custom tooltip II"); label = gtk_label_new ("See, custom, too"); g_object_ref_sink (label); g_object_set (button, "has-tooltip", TRUE, NULL); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), button, FALSE); g_signal_connect (button, "query-tooltip", G_CALLBACK (query_tooltip_label_cb), label); diff --git a/tests/testtoplevelembed.c b/tests/testtoplevelembed.c index c1cda8d871..4115bf987a 100644 --- a/tests/testtoplevelembed.c +++ b/tests/testtoplevelembed.c @@ -21,8 +21,9 @@ create_tab_label (GtkWidget *toplevel) GtkWidget *image = gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_MENU); gtk_container_add (GTK_CONTAINER (button), image); - gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE); + gtk_widget_set_hexpand (label, TRUE); + gtk_box_pack_start (GTK_BOX (box), label, TRUE); + gtk_box_pack_start (GTK_BOX (box), button, TRUE); g_signal_connect (button, "clicked", G_CALLBACK (remove_notebook_page), toplevel); diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c index 5e9f20489d..1205943b3a 100644 --- a/tests/testtreecolumns.c +++ b/tests/testtreecolumns.c @@ -768,7 +768,7 @@ main (int argc, char *argv[]) gtk_container_add (GTK_CONTAINER (window), vbox); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); /* Left Pane */ cell = gtk_cell_renderer_text_new (); @@ -785,52 +785,52 @@ main (int argc, char *argv[]) gtk_tree_view_append_column (GTK_TREE_VIEW (left_tree_view), column); gtk_tree_view_column_set_cell_data_func (column, cell, get_visible, NULL, NULL); - gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE); /* Middle Pane */ vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE); bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD); - gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE); button = gtk_button_new_with_mnemonic ("<< (_Q)"); gtk_widget_set_sensitive (button, FALSE); g_signal_connect (button, "clicked", G_CALLBACK (add_left_clicked), top_right_tree_view); g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (top_right_tree_view)), "changed", G_CALLBACK (selection_changed), button); - gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (bbox), button, FALSE); button = gtk_button_new_with_mnemonic (">> (_W)"); gtk_widget_set_sensitive (button, FALSE); g_signal_connect (button, "clicked", G_CALLBACK (add_right_clicked), top_right_tree_view); g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (left_tree_view)), "changed", G_CALLBACK (selection_changed), button); - gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (bbox), button, FALSE); bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD); - gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE); button = gtk_button_new_with_mnemonic ("<< (_E)"); gtk_widget_set_sensitive (button, FALSE); g_signal_connect (button, "clicked", G_CALLBACK (add_left_clicked), bottom_right_tree_view); g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (bottom_right_tree_view)), "changed", G_CALLBACK (selection_changed), button); - gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (bbox), button, FALSE); button = gtk_button_new_with_mnemonic (">> (_R)"); gtk_widget_set_sensitive (button, FALSE); g_signal_connect (button, "clicked", G_CALLBACK (add_right_clicked), bottom_right_tree_view); g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (left_tree_view)), "changed", G_CALLBACK (selection_changed), button); - gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (bbox), button, FALSE); /* Right Pane */ vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE); swindow = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -845,7 +845,7 @@ main (int argc, char *argv[]) gtk_tree_view_append_column (GTK_TREE_VIEW (top_right_tree_view), column); gtk_container_add (GTK_CONTAINER (swindow), top_right_tree_view); - gtk_box_pack_start (GTK_BOX (vbox2), swindow, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox2), swindow, TRUE); swindow = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -859,7 +859,7 @@ main (int argc, char *argv[]) gtk_tree_view_column_set_cell_data_func (column, cell, get_visible, NULL, NULL); gtk_tree_view_append_column (GTK_TREE_VIEW (bottom_right_tree_view), column); gtk_container_add (GTK_CONTAINER (swindow), bottom_right_tree_view); - gtk_box_pack_start (GTK_BOX (vbox2), swindow, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox2), swindow, TRUE); /* Drag and Drop */ @@ -895,13 +895,13 @@ main (int argc, char *argv[]) gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), - FALSE, FALSE); + FALSE); 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 ("_Add new Column"); g_signal_connect (button, "clicked", G_CALLBACK (add_clicked), left_tree_model); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE); gtk_widget_show (window); gtk_main (); diff --git a/tests/testtreecolumnsizing.c b/tests/testtreecolumnsizing.c index 33c8907966..405415cb04 100644 --- a/tests/testtreecolumnsizing.c +++ b/tests/testtreecolumnsizing.c @@ -190,14 +190,15 @@ main (int argc, char **argv) gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), BORDER_EXPAND); gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), ALL_EXPAND); - gtk_box_pack_start (GTK_BOX (vbox), combo_box, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), combo_box, FALSE); /* Scrolled window and tree view */ sw = gtk_scrolled_window_new (NULL, NULL); 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_widget_set_vexpand (sw, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE); tree_view = gtk_tree_view_new_with_model (create_model ()); gtk_container_add (GTK_CONTAINER (sw), tree_view); @@ -220,7 +221,7 @@ main (int argc, char **argv) button = gtk_toggle_button_new_with_label ("Toggle long content row"); g_signal_connect (button, "toggled", G_CALLBACK (toggle_long_content_row), tree_view); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); /* Set up option menu callback and default item */ g_signal_connect (combo_box, "changed", diff --git a/tests/testtreeedit.c b/tests/testtreeedit.c index cd4fc365a4..8aa446927c 100644 --- a/tests/testtreeedit.c +++ b/tests/testtreeedit.c @@ -210,7 +210,7 @@ create_control (GtkWidget *box, gint number, gint cntl, CallbackData *data) checkbutton = gtk_check_button_new_with_label (name); gtk_widget_show (checkbutton); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), cntl == CNTL_FIXED); - gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE); g_signal_connect (G_OBJECT (checkbutton), "toggled", callback, data); g_free (name); @@ -246,7 +246,8 @@ main (gint argc, gchar **argv) gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_ETCHED_IN); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE); + gtk_widget_set_vexpand (scrolled_window, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE); tree_model = create_model (); tree_view = gtk_tree_view_new_with_model (tree_model); @@ -350,12 +351,12 @@ main (gint argc, gchar **argv) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); gtk_widget_show (hbox); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); /* Alignment controls */ cntl_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); gtk_widget_show (cntl_vbox); - gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE); create_control (cntl_vbox, 1, CNTL_ALIGN, &callback[0]); create_control (cntl_vbox, 2, CNTL_ALIGN, &callback[1]); @@ -365,7 +366,7 @@ main (gint argc, gchar **argv) /* Expand controls */ cntl_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); gtk_widget_show (cntl_vbox); - gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE); create_control (cntl_vbox, 1, CNTL_EXPAND, &callback[0]); create_control (cntl_vbox, 2, CNTL_EXPAND, &callback[1]); @@ -375,7 +376,7 @@ main (gint argc, gchar **argv) /* Fixed controls */ cntl_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); gtk_widget_show (cntl_vbox); - gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE); create_control (cntl_vbox, 1, CNTL_FIXED, &callback[0]); create_control (cntl_vbox, 2, CNTL_FIXED, &callback[1]); diff --git a/tests/testtreeflow.c b/tests/testtreeflow.c index c5777fd20d..4a6c28abeb 100644 --- a/tests/testtreeflow.c +++ b/tests/testtreeflow.c @@ -134,13 +134,14 @@ main (int argc, char *argv[]) gtk_window_set_title (GTK_WINDOW (window), "Reflow test"); g_signal_connect (window, "destroy", gtk_main_quit, NULL); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Incremental Reflow Test"), FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Incremental Reflow Test"), FALSE); gtk_container_add (GTK_CONTAINER (window), vbox); scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE); + gtk_widget_set_vexpand (scrolled_window, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE); initialize_model (); tree_view = gtk_tree_view_new_with_model (model); @@ -156,9 +157,9 @@ main (int argc, char *argv[]) NULL); gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - 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 ("<b>_Futz!!</b>"); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE); gtk_label_set_use_markup (GTK_LABEL (gtk_bin_get_child (GTK_BIN (button))), TRUE); g_signal_connect (button, "clicked", G_CALLBACK (futz), NULL); g_signal_connect (button, "realize", G_CALLBACK (gtk_widget_grab_focus), NULL); diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c index d4296f1478..8d9a54eacc 100644 --- a/tests/testtreefocus.c +++ b/tests/testtreefocus.c @@ -352,13 +352,14 @@ main (int argc, char *argv[]) gtk_window_set_title (GTK_WINDOW (window), "Card planning sheet"); g_signal_connect (window, "destroy", gtk_main_quit, NULL); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Jonathan's Holiday Card Planning Sheet"), FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Jonathan's Holiday Card Planning Sheet"), FALSE); gtk_container_add (GTK_CONTAINER (window), vbox); scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_ETCHED_IN); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE); + gtk_widget_set_vexpand (scrolled_window, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE); model = make_model (); tree_view = gtk_tree_view_new_with_model (model); @@ -466,13 +467,14 @@ main (int argc, char *argv[]) gtk_window_set_title (GTK_WINDOW (window), "Model"); g_signal_connect (window, "destroy", gtk_main_quit, NULL); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("The model revealed"), FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("The model revealed"), FALSE); gtk_container_add (GTK_CONTAINER (window), vbox); scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_ETCHED_IN); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE); + gtk_widget_set_vexpand (scrolled_window, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE); tree_view = gtk_tree_view_new_with_model (model); diff --git a/tests/testtreesort.c b/tests/testtreesort.c index 3edd941d12..8cbcb98b87 100644 --- a/tests/testtreesort.c +++ b/tests/testtreesort.c @@ -122,19 +122,20 @@ main (int argc, char *argv[]) gtk_window_set_title (GTK_WINDOW (window), "Words, words, words - Window 1"); g_signal_connect (window, "destroy", gtk_main_quit, NULL); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Jonathan and Kristian's list of cool words. (And Anders' cool list of numbers) \n\nThis is just a GtkTreeStore"), FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Jonathan and Kristian's list of cool words. (And Anders' cool list of numbers) \n\nThis is just a GtkTreeStore"), FALSE); gtk_container_add (GTK_CONTAINER (window), vbox); entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE); button = gtk_button_new_with_label ("Switch search method"); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); scrolled_window = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_ETCHED_IN); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE); + gtk_widget_set_vexpand (scrolled_window, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE); model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT); @@ -251,7 +252,7 @@ main (int argc, char *argv[]) vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); gtk_box_pack_start (GTK_BOX (vbox2), gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeStore of window 1"), - FALSE, FALSE); + FALSE); gtk_container_add (GTK_CONTAINER (window2), vbox2); scrolled_window2 = gtk_scrolled_window_new (NULL, NULL); @@ -260,7 +261,8 @@ main (int argc, char *argv[]) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window2), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox2), scrolled_window2, TRUE, TRUE); + gtk_widget_set_vexpand (scrolled_window2, TRUE); + gtk_box_pack_start (GTK_BOX (vbox2), scrolled_window2, TRUE); tree_view2 = gtk_tree_view_new_with_model (smodel); @@ -320,7 +322,7 @@ main (int argc, char *argv[]) vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); gtk_box_pack_start (GTK_BOX (vbox3), gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeModelSort of window 2"), - FALSE, FALSE); + FALSE); gtk_container_add (GTK_CONTAINER (window3), vbox3); scrolled_window3 = gtk_scrolled_window_new (NULL, NULL); @@ -329,7 +331,8 @@ main (int argc, char *argv[]) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window3), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox3), scrolled_window3, TRUE, TRUE); + gtk_widget_set_vexpand (scrolled_window3, TRUE); + gtk_box_pack_start (GTK_BOX (vbox3), scrolled_window3, TRUE); tree_view3 = gtk_tree_view_new_with_model (ssmodel); diff --git a/tests/testwindowsize.c b/tests/testwindowsize.c index a7df0b5fec..3bfd20ff82 100644 --- a/tests/testwindowsize.c +++ b/tests/testwindowsize.c @@ -59,8 +59,9 @@ show_dialog (void) gtk_window_set_default_size (GTK_WINDOW (dialog), default_width, default_height); gtk_window_set_resizable (GTK_WINDOW (dialog), resizable); + gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), - label, TRUE, TRUE); + label, TRUE); gtk_widget_show (label); label = gtk_label_new ("? x ?"); diff --git a/tests/treestoretest.c b/tests/treestoretest.c index 586bd93411..a33bcb50e5 100644 --- a/tests/treestoretest.c +++ b/tests/treestoretest.c @@ -328,7 +328,8 @@ make_window (gint view_type) /* Put them together */ gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view); - gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE); + gtk_widget_set_vexpand (scrolled_window, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE); gtk_container_add (GTK_CONTAINER (window), vbox); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, @@ -337,7 +338,7 @@ make_window (gint view_type) /* buttons */ button = gtk_button_new_with_label ("gtk_tree_store_remove"); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); g_signal_connect (selection, "changed", G_CALLBACK (selection_changed), button); @@ -349,9 +350,9 @@ make_window (gint view_type) button = gtk_button_new_with_label ("gtk_tree_store_insert"); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE); g_object_set_data (G_OBJECT (button), "user_data", entry); g_signal_connect (button, "clicked", G_CALLBACK (iter_insert), @@ -360,9 +361,9 @@ make_window (gint view_type) button = gtk_button_new_with_label ("gtk_tree_store_set"); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE); g_object_set_data (G_OBJECT (button), "user_data", entry); g_signal_connect (button, "clicked", G_CALLBACK (iter_change), @@ -371,16 +372,16 @@ make_window (gint view_type) button = gtk_button_new_with_label ("gtk_tree_store_insert_with_values"); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE); - gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE); g_object_set_data (G_OBJECT (button), "user_data", entry); g_signal_connect (button, "clicked", G_CALLBACK (iter_insert_with_values), tree_view); button = gtk_button_new_with_label ("gtk_tree_store_insert_before"); - 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 (iter_insert_before), tree_view); @@ -390,7 +391,7 @@ make_window (gint view_type) gtk_widget_set_sensitive (button, FALSE); button = gtk_button_new_with_label ("gtk_tree_store_insert_after"); - 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 (iter_insert_after), tree_view); @@ -400,13 +401,13 @@ make_window (gint view_type) gtk_widget_set_sensitive (button, FALSE); button = gtk_button_new_with_label ("gtk_tree_store_prepend"); - 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 (iter_prepend), tree_view); button = gtk_button_new_with_label ("gtk_tree_store_append"); - 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 (iter_append), tree_view); |