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 /demos | |
| parent | 8f4c0bea6558dc98a2abd7e63436b1ce4caf689e (diff) | |
| download | gtk+-5729ea7744c2a41ae8fb833db6690a6aa5ad7a84.tar.gz | |
box: Remove expand child property
GtkWidget already has hexpand/vexpand properties.
Diffstat (limited to 'demos')
33 files changed, 159 insertions, 201 deletions
diff --git a/demos/gtk-demo/assistant.c b/demos/gtk-demo/assistant.c index cdceb4cd05..4dd76da430 100644 --- a/demos/gtk-demo/assistant.c +++ b/demos/gtk-demo/assistant.c @@ -96,12 +96,12 @@ create_page1 (GtkWidget *assistant) box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12); label = gtk_label_new ("You must fill out this entry to continue:"); - gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), label, FALSE); entry = gtk_entry_new (); gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE); gtk_widget_set_valign (entry, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), entry, TRUE); g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (on_entry_changed), assistant); @@ -119,7 +119,7 @@ create_page2 (GtkWidget *assistant) checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue " "even if you do not check this"); - gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE); gtk_assistant_append_page (GTK_ASSISTANT (assistant), box); gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE); diff --git a/demos/gtk-demo/button_box.c b/demos/gtk-demo/button_box.c index a5d22571da..b9a17ec1fa 100644 --- a/demos/gtk-demo/button_box.c +++ b/demos/gtk-demo/button_box.c @@ -70,7 +70,7 @@ do_button_box (GtkWidget *do_widget) frame_horz = gtk_frame_new ("Horizontal Button Boxes"); gtk_widget_set_margin_top (frame_horz, 10); gtk_widget_set_margin_bottom (frame_horz, 10); - gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); g_object_set (vbox, "margin", 10, NULL); @@ -78,30 +78,30 @@ do_button_box (GtkWidget *do_widget) gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Spread", 40, GTK_BUTTONBOX_SPREAD), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Center", 40, GTK_BUTTONBOX_CENTER), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Expand", 0, GTK_BUTTONBOX_EXPAND), - TRUE, TRUE); + TRUE); frame_vert = gtk_frame_new ("Vertical Button Boxes"); - gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); g_object_set (hbox, "margin", 10, NULL); @@ -109,25 +109,25 @@ do_button_box (GtkWidget *do_widget) gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Spread", 10, GTK_BUTTONBOX_SPREAD), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Edge", 10, GTK_BUTTONBOX_EDGE), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Start", 10, GTK_BUTTONBOX_START), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "End", 10, GTK_BUTTONBOX_END), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Center", 10, GTK_BUTTONBOX_CENTER), - TRUE, TRUE); + TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Expand", 0, GTK_BUTTONBOX_EXPAND), - TRUE, TRUE); + TRUE); } if (!gtk_widget_get_visible (window)) diff --git a/demos/gtk-demo/changedisplay.c b/demos/gtk-demo/changedisplay.c index 8f7d16446d..3694eb07d0 100644 --- a/demos/gtk-demo/changedisplay.c +++ b/demos/gtk-demo/changedisplay.c @@ -312,7 +312,7 @@ create_frame (ChangeDisplayInfo *info, GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwin), GTK_SHADOW_IN); - gtk_box_pack_start (GTK_BOX (hbox), scrollwin, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), scrollwin, TRUE); *tree_view = gtk_tree_view_new (); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (*tree_view), FALSE); @@ -322,7 +322,7 @@ create_frame (ChangeDisplayInfo *info, gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE); *button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); - gtk_box_pack_start (GTK_BOX (hbox), *button_vbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), *button_vbox, FALSE); if (!info->size_group) info->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); @@ -362,11 +362,11 @@ create_display_frame (ChangeDisplayInfo *info) button = left_align_button_new ("_Open..."); g_signal_connect (button, "clicked", G_CALLBACK (open_display_cb), info); - gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE); button = left_align_button_new ("_Close"); g_signal_connect (button, "clicked", G_CALLBACK (close_display_cb), info); - gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE); info->display_model = (GtkTreeModel *)gtk_list_store_new (DISPLAY_NUM_COLUMNS, G_TYPE_STRING, @@ -539,10 +539,10 @@ do_changedisplay (GtkWidget *do_widget) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); g_object_set (vbox, "margin", 8, NULL); - gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE); frame = create_display_frame (info); - gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE); initialize_displays (info); diff --git a/demos/gtk-demo/clipboard.c b/demos/gtk-demo/clipboard.c index 444ac89271..8c6f8c3c0d 100644 --- a/demos/gtk-demo/clipboard.c +++ b/demos/gtk-demo/clipboard.c @@ -225,45 +225,45 @@ do_clipboard (GtkWidget *do_widget) label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); g_object_set (hbox, "margin", 8, NULL); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); /* Create the first entry */ entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE); /* Create the button */ button = gtk_button_new_with_mnemonic (_("_Copy")); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE); g_signal_connect (button, "clicked", G_CALLBACK (copy_button_clicked), entry); label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); g_object_set (hbox, "margin", 8, NULL); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); /* Create the second entry */ entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE); /* Create the button */ button = gtk_button_new_with_mnemonic (_("_Paste")); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE); g_signal_connect (button, "clicked", G_CALLBACK (paste_button_clicked), entry); label = gtk_label_new ("Images can be transferred via the clipboard, too"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); g_object_set (hbox, "margin", 8, NULL); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); /* Create the first image */ image = gtk_image_new_from_icon_name ("dialog-warning", diff --git a/demos/gtk-demo/colorsel.c b/demos/gtk-demo/colorsel.c index 7f85c4e38e..8f6a1c5974 100644 --- a/demos/gtk-demo/colorsel.c +++ b/demos/gtk-demo/colorsel.c @@ -87,7 +87,7 @@ do_colorsel (GtkWidget *do_widget) frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); - gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE); da = gtk_drawing_area_new (); gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 200); @@ -100,7 +100,7 @@ do_colorsel (GtkWidget *do_widget) gtk_widget_set_halign (button, GTK_ALIGN_END); gtk_widget_set_valign (button, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); g_signal_connect (button, "clicked", G_CALLBACK (change_color_callback), NULL); diff --git a/demos/gtk-demo/combobox.c b/demos/gtk-demo/combobox.c index 0607866833..cbff3b17f2 100644 --- a/demos/gtk-demo/combobox.c +++ b/demos/gtk-demo/combobox.c @@ -326,7 +326,7 @@ do_combobox (GtkWidget *do_widget) * insensitive rows */ frame = gtk_frame_new ("Items with icons"); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); g_object_set (box, "margin", 5, NULL); @@ -367,7 +367,7 @@ do_combobox (GtkWidget *do_widget) /* A combobox demonstrating trees. */ frame = gtk_frame_new ("Where are we ?"); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); g_object_set (box, "margin", 5, NULL); @@ -395,7 +395,7 @@ do_combobox (GtkWidget *do_widget) /* A GtkComboBoxEntry with validation */ frame = gtk_frame_new ("Editable"); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); g_object_set (box, "margin", 5, NULL); @@ -413,7 +413,7 @@ do_combobox (GtkWidget *do_widget) /* A combobox with string IDs */ frame = gtk_frame_new ("String IDs"); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); g_object_set (box, "margin", 5, NULL); diff --git a/demos/gtk-demo/cursors.c b/demos/gtk-demo/cursors.c index 580342e73e..019cd63d0b 100644 --- a/demos/gtk-demo/cursors.c +++ b/demos/gtk-demo/cursors.c @@ -27,13 +27,13 @@ add_section (GtkWidget *box, gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_widget_set_margin_top (label, 10); gtk_widget_set_margin_bottom (label, 10); - gtk_box_pack_start (GTK_BOX (box), label, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box), label, TRUE); section = gtk_flow_box_new (); gtk_widget_set_halign (section, GTK_ALIGN_START); gtk_flow_box_set_selection_mode (GTK_FLOW_BOX (section), GTK_SELECTION_NONE); gtk_flow_box_set_min_children_per_line (GTK_FLOW_BOX (section), 2); gtk_flow_box_set_max_children_per_line (GTK_FLOW_BOX (section), 20); - gtk_box_pack_start (GTK_BOX (box), section, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box), section, TRUE); return section; } diff --git a/demos/gtk-demo/demo.ui b/demos/gtk-demo/demo.ui index cfd06509a5..fd08164af4 100644 --- a/demos/gtk-demo/demo.ui +++ b/demos/gtk-demo/demo.ui @@ -159,9 +159,6 @@ </object> </child> </object> - <packing> - <property name="expand">0</property> - </packing> </child> <child> <object class="GtkToolbar" id="toolbar1"> @@ -227,7 +224,6 @@ </child> </object> <packing> - <property name="expand">0</property> <property name="position">1</property> </packing> </child> @@ -235,6 +231,7 @@ <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="shadow_type">in</property> <property name="visible">1</property> + <property name="expand">1</property> <child> <object class="GtkTreeView" id="treeview1"> <property name="visible">1</property> @@ -286,7 +283,6 @@ </object> <packing> <property name="position">2</property> - <property name="expand">1</property> </packing> </child> <child> @@ -295,7 +291,6 @@ </object> <packing> <property name="position">3</property> - <property name="expand">0</property> </packing> </child> </object> diff --git a/demos/gtk-demo/dialog.c b/demos/gtk-demo/dialog.c index 983e455099..5b982f5f3d 100644 --- a/demos/gtk-demo/dialog.c +++ b/demos/gtk-demo/dialog.c @@ -56,15 +56,15 @@ interactive_dialog_clicked (GtkButton *button, content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); - gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE); image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG); - gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), image, FALSE); table = gtk_grid_new (); gtk_grid_set_row_spacing (GTK_GRID (table), 4); gtk_grid_set_column_spacing (GTK_GRID (table), 4); - gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), table, TRUE); label = gtk_label_new_with_mnemonic ("_Entry 1"); gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1); local_entry1 = gtk_entry_new (); @@ -122,30 +122,30 @@ do_dialog (GtkWidget *do_widget) /* Standard message dialog */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); button = gtk_button_new_with_mnemonic ("_Message Dialog"); g_signal_connect (button, "clicked", G_CALLBACK (message_dialog_clicked), NULL); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), - FALSE, FALSE); + FALSE); /* Interactive dialog*/ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); button = gtk_button_new_with_mnemonic ("_Interactive Dialog"); g_signal_connect (button, "clicked", G_CALLBACK (interactive_dialog_clicked), NULL); - gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE); table = gtk_grid_new (); gtk_grid_set_row_spacing (GTK_GRID (table), 4); gtk_grid_set_column_spacing (GTK_GRID (table), 4); - gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), table, FALSE); label = gtk_label_new_with_mnemonic ("_Entry 1"); gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1); diff --git a/demos/gtk-demo/drawingarea.c b/demos/gtk-demo/drawingarea.c index 6908a84449..b613e3e3b6 100644 --- a/demos/gtk-demo/drawingarea.c +++ b/demos/gtk-demo/drawingarea.c @@ -221,11 +221,11 @@ do_drawingarea (GtkWidget *do_widget) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "<u>Checkerboard pattern</u>"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); - gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE); da = gtk_drawing_area_new (); gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100); @@ -240,11 +240,11 @@ do_drawingarea (GtkWidget *do_widget) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "<u>Scribble area</u>"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); - gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE); da = gtk_drawing_area_new (); gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100); diff --git a/demos/gtk-demo/editable_cells.c b/demos/gtk-demo/editable_cells.c index c890e6438b..63ee41613e 100644 --- a/demos/gtk-demo/editable_cells.c +++ b/demos/gtk-demo/editable_cells.c @@ -358,7 +358,7 @@ do_editable_cells (GtkWidget *do_widget) gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Shopping list (you can edit the cells!)"), - FALSE, FALSE); + FALSE); sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), @@ -366,7 +366,7 @@ do_editable_cells (GtkWidget *do_widget) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE); /* create models */ items_model = create_items_model (); @@ -387,17 +387,17 @@ do_editable_cells (GtkWidget *do_widget) /* some buttons */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE); button = gtk_button_new_with_label ("Add item"); g_signal_connect (button, "clicked", G_CALLBACK (add_item), treeview); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); button = gtk_button_new_with_label ("Remove item"); g_signal_connect (button, "clicked", G_CALLBACK (remove_item), treeview); - gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE); gtk_window_set_default_size (GTK_WINDOW (window), 320, 200); } diff --git a/demos/gtk-demo/entry_buffer.c b/demos/gtk-demo/entry_buffer.c index 5bae1a6df4..ad9cb80637 100644 --- a/demos/gtk-demo/entry_buffer.c +++ b/demos/gtk-demo/entry_buffer.c @@ -34,19 +34,19 @@ do_entry_buffer (GtkWidget *do_widget) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "Entries share a buffer. Typing in one is reflected in the other."); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); /* Create a buffer */ buffer = gtk_entry_buffer_new (NULL, 0); /* Create our first entry */ entry = gtk_entry_new_with_buffer (buffer); - gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE); /* Create the second entry */ entry = gtk_entry_new_with_buffer (buffer); gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE); - gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE); g_object_unref (buffer); } diff --git a/demos/gtk-demo/entry_completion.c b/demos/gtk-demo/entry_completion.c index 306d590bb4..7c078cd567 100644 --- a/demos/gtk-demo/entry_completion.c +++ b/demos/gtk-demo/entry_completion.c @@ -60,11 +60,11 @@ do_entry_completion (GtkWidget *do_widget) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <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 entry */ entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE); /* Create the completion object */ completion = gtk_entry_completion_new (); diff --git a/demos/gtk-demo/expander.c b/demos/gtk-demo/expander.c index d4f18586b4..a4523eb79c 100644 --- a/demos/gtk-demo/expander.c +++ b/demos/gtk-demo/expander.c @@ -29,7 +29,7 @@ static void do_not_expand (GtkWidget *child, gpointer data) { gtk_container_child_set (GTK_CONTAINER (gtk_widget_get_parent (child)), child, - "expand", FALSE, "fill", FALSE, NULL); + "fill", FALSE, NULL); } GtkWidget * @@ -59,7 +59,7 @@ do_expander (GtkWidget *do_widget) area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (window)); box = gtk_widget_get_parent (area); gtk_container_child_set (GTK_CONTAINER (gtk_widget_get_parent (box)), box, - "expand", TRUE, "fill", TRUE, NULL); + "fill", TRUE, NULL); gtk_container_foreach (GTK_CONTAINER (area), do_not_expand, NULL); expander = gtk_expander_new ("Details:"); @@ -85,7 +85,7 @@ do_expander (GtkWidget *do_widget) "resize the window. Do it already !", -1); gtk_container_add (GTK_CONTAINER (sw), tv); gtk_container_add (GTK_CONTAINER (expander), sw); - gtk_box_pack_end (GTK_BOX (area), expander, TRUE, TRUE); + gtk_box_pack_end (GTK_BOX (area), expander, TRUE); g_signal_connect (expander, "notify::expanded", G_CALLBACK (expander_cb), window); diff --git a/demos/gtk-demo/iconview.c b/demos/gtk-demo/iconview.c index bf65f4ed5b..30537ebf1e 100644 --- a/demos/gtk-demo/iconview.c +++ b/demos/gtk-demo/iconview.c @@ -266,7 +266,7 @@ do_iconview (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (window), vbox); tool_bar = gtk_toolbar_new (); - gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE); up_button = gtk_tool_button_new (NULL, NULL); gtk_tool_button_set_label (GTK_TOOL_BUTTON (up_button), _("_Up")); @@ -290,8 +290,9 @@ do_iconview (GtkWidget *do_widget) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_widget_set_vexpand (sw, TRUE); - gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE); /* Create the store and fill it with the contents of '/' */ parent = g_strdup ("/"); diff --git a/demos/gtk-demo/images.c b/demos/gtk-demo/images.c index 1b2c166a99..12a312d64e 100644 --- a/demos/gtk-demo/images.c +++ b/demos/gtk-demo/images.c @@ -354,13 +354,13 @@ do_images (GtkWidget *do_widget) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "<u>Image loaded from a file</u>"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_widget_set_halign (frame, GTK_ALIGN_CENTER); gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); image = gtk_image_new_from_icon_name ("gtk3-demo", GTK_ICON_SIZE_DIALOG); @@ -372,13 +372,13 @@ do_images (GtkWidget *do_widget) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "<u>Animation loaded from a file</u>"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_widget_set_halign (frame, GTK_ALIGN_CENTER); gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); image = gtk_image_new_from_resource ("/images/floppybuddy.gif"); @@ -389,13 +389,13 @@ do_images (GtkWidget *do_widget) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "<u>Symbolic themed icon</u>"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_widget_set_halign (frame, GTK_ALIGN_CENTER); gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic"); image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG); @@ -408,13 +408,13 @@ do_images (GtkWidget *do_widget) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "<u>Progressive image loading</u>"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN); gtk_widget_set_halign (frame, GTK_ALIGN_CENTER); gtk_widget_set_valign (frame, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); /* Create an empty image for now; the progressive loader * will create the pixbuf and fill it in. @@ -426,7 +426,7 @@ do_images (GtkWidget *do_widget) /* Sensitivity control */ button = gtk_toggle_button_new_with_mnemonic ("_Insensitive"); - gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE); g_signal_connect (button, "toggled", G_CALLBACK (toggle_sensitivity_callback), diff --git a/demos/gtk-demo/infobar.c b/demos/gtk-demo/infobar.c index 9b71794d44..d261bd6116 100644 --- a/demos/gtk-demo/infobar.c +++ b/demos/gtk-demo/infobar.c @@ -65,24 +65,24 @@ do_infobar (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (window), vbox); bar = gtk_info_bar_new (); - gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE); gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_INFO); label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_INFO"); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE); button = gtk_toggle_button_new_with_label ("Message"); g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); gtk_container_add (GTK_CONTAINER (actions), button); bar = gtk_info_bar_new (); - gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE); gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_WARNING); label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_WARNING"); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE); button = gtk_toggle_button_new_with_label ("Warning"); g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); @@ -91,24 +91,24 @@ do_infobar (GtkWidget *do_widget) bar = gtk_info_bar_new_with_buttons (_("_OK"), GTK_RESPONSE_OK, NULL); gtk_info_bar_set_show_close_button (GTK_INFO_BAR (bar), TRUE); g_signal_connect (bar, "response", G_CALLBACK (on_bar_response), window); - gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE); gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_QUESTION); label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_QUESTION"); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE); button = gtk_toggle_button_new_with_label ("Question"); g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); gtk_container_add (GTK_CONTAINER (actions), button); bar = gtk_info_bar_new (); - gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE); gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_ERROR); label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_ERROR"); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE); button = gtk_toggle_button_new_with_label ("Error"); g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); @@ -116,12 +116,12 @@ do_infobar (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (actions), button); bar = gtk_info_bar_new (); - gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE); gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_OTHER); label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_OTHER"); gtk_label_set_line_wrap (GTK_LABEL (label), TRUE); gtk_label_set_xalign (GTK_LABEL (label), 0); - gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE); button = gtk_toggle_button_new_with_label ("Other"); g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE); @@ -130,7 +130,7 @@ do_infobar (GtkWidget *do_widget) frame = gtk_frame_new ("Info bars"); gtk_widget_set_margin_top (frame, 8); gtk_widget_set_margin_bottom (frame, 8); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); g_object_set (vbox2, "margin", 8, NULL); @@ -138,9 +138,9 @@ do_infobar (GtkWidget *do_widget) /* Standard message dialog */ label = gtk_label_new ("An example of different info bars"); - gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE); - gtk_box_pack_start (GTK_BOX (vbox2), actions, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), actions, FALSE); } if (!gtk_widget_get_visible (window)) diff --git a/demos/gtk-demo/list_store.c b/demos/gtk-demo/list_store.c index c0c37ae29d..b7e70b7270 100644 --- a/demos/gtk-demo/list_store.c +++ b/demos/gtk-demo/list_store.c @@ -268,7 +268,7 @@ do_list_store (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (window), vbox); label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a nice ODBC interface to bugzilla or so, though)."); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), @@ -276,7 +276,7 @@ do_list_store (GtkWidget *do_widget) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE); /* create tree model */ model = create_model (); diff --git a/demos/gtk-demo/listbox.c b/demos/gtk-demo/listbox.c index 24b679c63a..3d95bca156 100644 --- a/demos/gtk-demo/listbox.c +++ b/demos/gtk-demo/listbox.c @@ -359,10 +359,11 @@ do_listbox (GtkWidget *do_widget) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_container_add (GTK_CONTAINER (window), vbox); label = gtk_label_new ("Messages from Gtk+ and friends"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); scrolled = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE); + gtk_widget_set_vexpand (scrolled, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE); listbox = gtk_list_box_new (); gtk_container_add (GTK_CONTAINER (scrolled), listbox); diff --git a/demos/gtk-demo/main.ui b/demos/gtk-demo/main.ui index d3f10e1ffe..99b49572a2 100644 --- a/demos/gtk-demo/main.ui +++ b/demos/gtk-demo/main.ui @@ -97,6 +97,7 @@ <property name="scrollable">1</property> <property name="enable_popup">1</property> <property name="show_border">0</property> + <property name="expand">1</property> <child> <object class="GtkScrolledWindow"> <property name="visible">1</property> @@ -166,7 +167,6 @@ </child> </object> <packing> - <property name="expand">1</property> <property name="position">1</property> </packing> </child> diff --git a/demos/gtk-demo/menus.c b/demos/gtk-demo/menus.c index 9fdd35350c..107a6db3eb 100644 --- a/demos/gtk-demo/menus.c +++ b/demos/gtk-demo/menus.c @@ -115,7 +115,7 @@ do_menus (GtkWidget *do_widget) menubar = gtk_menu_bar_new (); gtk_widget_set_hexpand (menubar, TRUE); - gtk_box_pack_start (GTK_BOX (box1), menubar, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), menubar, TRUE); gtk_widget_show (menubar); menu = create_menu (2); @@ -136,19 +136,19 @@ do_menus (GtkWidget *do_widget) gtk_widget_show (menuitem); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); - gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE); + gtk_box_pack_start (GTK_BOX (box1), box2, TRUE); gtk_widget_show (box2); button = gtk_button_new_with_label ("Flip"); g_signal_connect (button, "clicked", G_CALLBACK (change_orientation), menubar); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); gtk_widget_show (button); button = gtk_button_new_with_label ("Close"); g_signal_connect_swapped (button, "clicked", G_CALLBACK(gtk_widget_destroy), window); - gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE); gtk_widget_set_can_default (button, TRUE); gtk_widget_grab_default (button); gtk_widget_show (button); diff --git a/demos/gtk-demo/overlay.c b/demos/gtk-demo/overlay.c index f3b836d6be..c6d7e90656 100644 --- a/demos/gtk-demo/overlay.c +++ b/demos/gtk-demo/overlay.c @@ -65,12 +65,12 @@ do_overlay (GtkWidget *do_widget) gtk_label_set_use_markup (GTK_LABEL (label), TRUE); gtk_widget_set_margin_top (label, 8); gtk_widget_set_margin_bottom (label, 8); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); gtk_entry_set_placeholder_text (GTK_ENTRY (entry), "Your Lucky Number"); gtk_widget_set_margin_top (entry, 8); gtk_widget_set_margin_bottom (entry, 8); - gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE); gtk_container_add (GTK_CONTAINER (window), overlay); diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c index cdfb5a9063..40c67f053b 100644 --- a/demos/gtk-demo/panes.c +++ b/demos/gtk-demo/panes.c @@ -148,7 +148,7 @@ do_panes (GtkWidget *do_widget) vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL); g_object_set (vpaned, "margin", 5, NULL); - gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE); hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); gtk_paned_add1 (GTK_PANED (vpaned), hpaned); @@ -178,14 +178,14 @@ do_panes (GtkWidget *do_widget) "Horizontal", "Left", "Right"), - FALSE, FALSE); + FALSE); gtk_box_pack_start (GTK_BOX (vbox), create_pane_options (GTK_PANED (vpaned), "Vertical", "Top", "Bottom"), - FALSE, FALSE); + FALSE); } if (!gtk_widget_get_visible (window)) diff --git a/demos/gtk-demo/search_entry.c b/demos/gtk-demo/search_entry.c index 62045edf81..5655108dff 100644 --- a/demos/gtk-demo/search_entry.c +++ b/demos/gtk-demo/search_entry.c @@ -241,20 +241,20 @@ do_search_entry (GtkWidget *do_widget) label = gtk_label_new (NULL); gtk_label_set_markup (GTK_LABEL (label), "Search entry demo"); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); /* Create our entry */ entry = gtk_search_entry_new (); - gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE); /* Create the find and cancel buttons */ notebook = gtk_notebook_new (); gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE); gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE); - gtk_box_pack_start (GTK_BOX (hbox), notebook, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), notebook, FALSE); find_button = gtk_button_new_with_label ("Find"); g_signal_connect (find_button, "clicked", diff --git a/demos/gtk-demo/search_entry2.c b/demos/gtk-demo/search_entry2.c index 376c34e663..650c25633d 100644 --- a/demos/gtk-demo/search_entry2.c +++ b/demos/gtk-demo/search_entry2.c @@ -91,12 +91,12 @@ do_search_entry2 (GtkWidget *do_widget) entry = gtk_search_entry_new (); container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); gtk_widget_set_halign (container, GTK_ALIGN_CENTER); - gtk_box_pack_start (GTK_BOX (container), entry, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (container), entry, FALSE); searchbar = gtk_search_bar_new (); gtk_search_bar_connect_entry (GTK_SEARCH_BAR (searchbar), GTK_ENTRY (entry)); gtk_search_bar_set_show_close_button (GTK_SEARCH_BAR (searchbar), FALSE); gtk_container_add (GTK_CONTAINER (searchbar), container); - gtk_box_pack_start (GTK_BOX (vbox), searchbar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), searchbar, FALSE); /* Hook the search bar to key presses */ g_signal_connect (window, "key-press-event", @@ -104,26 +104,26 @@ do_search_entry2 (GtkWidget *do_widget) /* Help */ label = gtk_label_new ("Start Typing to search"); - gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), label, TRUE); /* Toggle button */ button = gtk_toggle_button_new_with_label ("Search"); g_object_bind_property (button, "active", searchbar, "search-mode-enabled", G_BINDING_BIDIRECTIONAL); - gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), button, TRUE); /* Result */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); label = gtk_label_new ("Result:"); gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_widget_set_margin_start (label, 6); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); label = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); g_signal_connect (entry, "search-changed", G_CALLBACK (search_changed_cb), label); @@ -131,15 +131,15 @@ do_search_entry2 (GtkWidget *do_widget) G_CALLBACK (changed_cb), label); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE); label = gtk_label_new ("Signal:"); gtk_label_set_xalign (GTK_LABEL (label), 0.0); gtk_widget_set_margin_start (label, 6); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); label = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE); g_signal_connect (entry, "search-changed", G_CALLBACK (search_changed), label); diff --git a/demos/gtk-demo/sidebar.c b/demos/gtk-demo/sidebar.c index 14b5851236..4d6e9ab067 100644 --- a/demos/gtk-demo/sidebar.c +++ b/demos/gtk-demo/sidebar.c @@ -49,7 +49,7 @@ do_sidebar (GtkWidget *do_widget) box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); sidebar = gtk_stack_sidebar_new (); - gtk_box_pack_start (GTK_BOX (box), sidebar, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), sidebar, FALSE); stack = gtk_stack_new (); gtk_stack_set_transition_type (GTK_STACK (stack), GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN); @@ -57,9 +57,9 @@ do_sidebar (GtkWidget *do_widget) /* Separator between sidebar and stack */ widget = gtk_separator_new (GTK_ORIENTATION_VERTICAL); - gtk_box_pack_start (GTK_BOX(box), widget, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX(box), widget, FALSE); - gtk_box_pack_start (GTK_BOX (box), stack, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), stack, TRUE); for (i=0; (c = *(pages+i)) != NULL; i++ ) { diff --git a/demos/gtk-demo/sizegroup.c b/demos/gtk-demo/sizegroup.c index c32fcb942f..4fd1cf6cfb 100644 --- a/demos/gtk-demo/sizegroup.c +++ b/demos/gtk-demo/sizegroup.c @@ -116,7 +116,7 @@ do_sizegroup (GtkWidget *do_widget) /* Create one frame holding color options */ frame = gtk_frame_new ("Color Options"); - gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE); table = gtk_grid_new (); g_object_set (table, "margin", 5, NULL); @@ -129,7 +129,7 @@ do_sizegroup (GtkWidget *do_widget) /* And another frame holding line style options */ frame = gtk_frame_new ("Line Options"); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE); table = gtk_grid_new (); g_object_set (table, "margin", 5, NULL); @@ -142,7 +142,7 @@ do_sizegroup (GtkWidget *do_widget) /* And a check button to turn grouping on and off */ check_button = gtk_check_button_new_with_mnemonic ("_Enable grouping"); - gtk_box_pack_start (GTK_BOX (vbox), check_button, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), check_button, FALSE); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE); g_signal_connect (check_button, "toggled", diff --git a/demos/gtk-demo/spinner.c b/demos/gtk-demo/spinner.c index e9232e8cc2..d1beb5a62e 100644 --- a/demos/gtk-demo/spinner.c +++ b/demos/gtk-demo/spinner.c @@ -53,7 +53,7 @@ do_spinner (GtkWidget *do_widget) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); g_object_set (vbox, "margin", 5, NULL); - gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE); /* Sensitive */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); diff --git a/demos/gtk-demo/textscroll.c b/demos/gtk-demo/textscroll.c index 07d33b810d..0a1b27e060 100644 --- a/demos/gtk-demo/textscroll.c +++ b/demos/gtk-demo/textscroll.c @@ -157,7 +157,7 @@ create_text_view (GtkWidget *hbox, guint timeout; swindow = gtk_scrolled_window_new (NULL, NULL); - gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE); textview = gtk_text_view_new (); gtk_container_add (GTK_CONTAINER (swindow), textview); diff --git a/demos/gtk-demo/toolpalette.c b/demos/gtk-demo/toolpalette.c index 4dfacd393b..6a5cfedb8f 100644 --- a/demos/gtk-demo/toolpalette.c +++ b/demos/gtk-demo/toolpalette.c @@ -473,7 +473,7 @@ do_toolpalette (GtkWidget *do_widget) "text", 0, NULL); gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_orientation), &iter); - gtk_box_pack_start (GTK_BOX (box), combo_orientation, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), combo_orientation, FALSE); /* Style combo box: */ style_model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT); @@ -512,11 +512,11 @@ do_toolpalette (GtkWidget *do_widget) "text", 0, NULL); gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_style), &iter); - gtk_box_pack_start (GTK_BOX (box), combo_style, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (box), combo_style, FALSE); /* Add hbox */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); - gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (box), hbox, TRUE); /* Add and fill the ToolPalette: */ palette = gtk_tool_palette_new (); @@ -526,6 +526,7 @@ do_toolpalette (GtkWidget *do_widget) load_special_items (GTK_TOOL_PALETTE (palette)); palette_scroller = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_set_vexpand (palette_scroller, TRUE); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (palette_scroller), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); @@ -548,7 +549,7 @@ do_toolpalette (GtkWidget *do_widget) notebook = gtk_notebook_new (); g_object_set (notebook, "margin", 6, NULL); - gtk_box_pack_end (GTK_BOX(hbox), notebook, FALSE, FALSE); + gtk_box_pack_end (GTK_BOX(hbox), notebook, FALSE); /* ===== DnD for tool items ===== */ diff --git a/demos/gtk-demo/tree_store.c b/demos/gtk-demo/tree_store.c index 70c69686ce..d4737b8110 100644 --- a/demos/gtk-demo/tree_store.c +++ b/demos/gtk-demo/tree_store.c @@ -403,7 +403,7 @@ do_tree_store (GtkWidget *do_widget) gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Jonathan's Holiday Card Planning Sheet"), - FALSE, FALSE); + FALSE); sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), @@ -411,7 +411,7 @@ do_tree_store (GtkWidget *do_widget) gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE); /* create model */ model = create_model (); diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c index 1f2ab2e78e..76c9cc991c 100644 --- a/demos/widget-factory/widget-factory.c +++ b/demos/widget-factory/widget-factory.c @@ -800,10 +800,11 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget) "use-markup", TRUE, "halign", GTK_ALIGN_START, "valign", GTK_ALIGN_CENTER, + "hexpand", TRUE, "margin", 6, "xalign", 0.0, NULL); - gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (row), label, TRUE); gdk_rgba_parse (&rgba, color); swatch = g_object_new (g_type_from_name ("GtkColorSwatch"), "rgba", &rgba, @@ -815,7 +816,7 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget) NULL); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (box), swatch); - gtk_box_pack_start (GTK_BOX (row), box, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (row), box, FALSE); gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1); row = gtk_widget_get_parent (row); gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE); @@ -911,9 +912,10 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser) "halign", GTK_ALIGN_START, "valign", GTK_ALIGN_CENTER, "margin", 6, + "hexpand", TRUE, "xalign", 0.0, NULL); - gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (row), label, TRUE); gdk_rgba_parse (&rgba, colors[i].color); swatch = g_object_new (g_type_from_name ("GtkColorSwatch"), "rgba", &rgba, @@ -925,7 +927,7 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser) NULL); box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (box), swatch); - gtk_box_pack_start (GTK_BOX (row), box, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (row), box, FALSE); gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1); row = gtk_widget_get_parent (row); gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE); diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui index ec0a394db6..9d11516b2b 100644 --- a/demos/widget-factory/widget-factory.ui +++ b/demos/widget-factory/widget-factory.ui @@ -497,6 +497,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> </child> <child> <object class="GtkBox" id="box223"> + <property name="hexpand">0</property> <style> <class name="linked"/> </style> @@ -505,10 +506,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> <property name="can_focus">1</property> <property name="invisible_char">•</property> <property name="text" translatable="yes">entry</property> + <property name="hexpand">1</property> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkButton" id="button224"> @@ -527,6 +526,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> </child> <child> <object class="GtkBox"> + <property name="hexpand">0</property> <style> <class name="linked"/> </style> @@ -534,6 +534,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> <object class="GtkComboBox"> <property name="model">lrmodel</property> <property name="active">0</property> + <property name="hexpand">1</property> <child> <object class="GtkCellRendererText"/> <attributes> @@ -541,14 +542,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> </attributes> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkComboBox"> <property name="model">lrmodel</property> <property name="active">1</property> + <property name="hexpand">1</property> <child> <object class="GtkCellRendererText"/> <attributes> @@ -556,14 +555,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> </attributes> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkComboBox"> <property name="model">lrmodel</property> <property name="active">2</property> + <property name="hexpand">1</property> <child> <object class="GtkCellRendererText"/> <attributes> @@ -571,9 +568,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> </attributes> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> </object> </child> @@ -986,8 +980,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> <object class="GtkBox" id="box20"> <property name="orientation">vertical</property> <property name="spacing">6</property> + <property name="hexpand">1</property> <child> - <object class="GtkBox" id="box21"> + <object class="GtkBox" id="box21"> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> @@ -1076,9 +1071,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> </packing> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> </object> <packing> @@ -1176,7 +1168,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> </child> </object> <packing> - <property name="expand">1</property> <property name="position">3</property> </packing> </child> @@ -1198,6 +1189,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> <property name="orientation">vertical</property> <property name="homogeneous">1</property> <property name="spacing">6</property> + <property name="hexpand">1</property> <child> <object class="GtkFrame" id="frame1"> <property name="shadow_type">in</property> @@ -1208,9 +1200,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> </object> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkFrame" id="frame2"> @@ -1223,7 +1212,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> </child> </object> <packing> - <property name="expand">1</property> <property name="position">1</property> </packing> </child> @@ -1237,7 +1225,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> </child> </object> <packing> - <property name="expand">1</property> <property name="position">2</property> </packing> </child> @@ -1252,13 +1239,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> </child> </object> <packing> - <property name="expand">1</property> <property name="position">3</property> </packing> </child> </object> <packing> - <property name="expand">1</property> <property name="position">6</property> </packing> </child> @@ -1274,12 +1259,14 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> <object class="GtkBox" id="box4"> <property name="orientation">vertical</property> <property name="spacing">6</property> + <property name="hexpand">1</property> <child> <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="width_request">150</property> <property name="can_focus">1</property> <property name="vscrollbar_policy">always</property> <property name="shadow_type">in</property> + <property name="vexpand">1</property> <child> <object class="GtkTreeView" id="treeview1"> <property name="can_focus">1</property> @@ -1350,14 +1337,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> </object> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkScrolledWindow" id="scrolledwindow2"> <property name="can_focus">1</property> <property name="shadow_type">in</property> + <property name="vexpand">1</property> <child> <object class="GtkTextView" id="textview1"> <property name="can_focus">1</property> @@ -1370,13 +1355,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> </child> </object> <packing> - <property name="expand">1</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">1</property> <property name="position">8</property> </packing> </child> @@ -1618,7 +1601,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property> </child> </object> <packing> - <property name="expand">1</property> <property name="position">4</property> </packing> </child> @@ -1831,9 +1813,6 @@ microphone-sensitivity-medium-symbolic</property> <property name="valign">center</property> <property name="margin">6</property> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkSwitch" id="listboxrow1switch"> @@ -1861,9 +1840,6 @@ microphone-sensitivity-medium-symbolic</property> <property name="valign">center</property> <property name="margin">6</property> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkScale"> @@ -1893,9 +1869,6 @@ microphone-sensitivity-medium-symbolic</property> <property name="valign">center</property> <property name="margin">6</property> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkImage" id="listboxrow3image"> @@ -1925,9 +1898,6 @@ microphone-sensitivity-medium-symbolic</property> <property name="valign">center</property> <property name="margin">6</property> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkImage"> @@ -1958,9 +1928,6 @@ microphone-sensitivity-medium-symbolic</property> <property name="valign">center</property> <property name="margin">6</property> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkButton" id="listboxrow5button"> @@ -1989,9 +1956,6 @@ microphone-sensitivity-medium-symbolic</property> <property name="valign">center</property> <property name="margin">6</property> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkCheckButton"> @@ -2416,9 +2380,6 @@ microphone-sensitivity-medium-symbolic</property> </object> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> </object> </child> @@ -2632,6 +2593,7 @@ microphone-sensitivity-medium-symbolic</property> <object class="GtkListBox" id="munsell"> <property name="selection-mode">multiple</property> <property name="activate-on-single-click">0</property> + <property name="hexpand">0</property> </object> </child> </object> @@ -2951,6 +2913,7 @@ microphone-sensitivity-medium-symbolic</property> <object class="GtkFrame"> <child> <object class="GtkBox"> + <property name="hexpand">0</property> <child> <object class="GtkToolbar"> <property name="orientation">vertical</property> @@ -2980,14 +2943,12 @@ microphone-sensitivity-medium-symbolic</property> </child> <child> <object class="GtkScrolledWindow"> + <property name="hexpand">1</property> <child> <object class="GtkTextView" id="tooltextview"> </object> </child> </object> - <packing> - <property name="expand">1</property> - </packing> </child> <child> <object class="GtkBox"> @@ -3025,9 +2986,6 @@ microphone-sensitivity-medium-symbolic</property> <property name="valign">end</property> <property name="icon-name">edit-delete-symbolic</property> </object> - <packing> - <property name="expand">1</property> - </packing> </child> </object> </child> |