diff options
author | Timm Bäder <mail@baedert.org> | 2016-10-02 17:37:22 +0200 |
---|---|---|
committer | Benjamin Otte <otte@redhat.com> | 2016-10-16 18:17:21 +0200 |
commit | f45dadadd00d892ba16dc081240987425bc32346 (patch) | |
tree | 181fc50993716de719c7d993c9d66bb7b2adb090 /demos/gtk-demo | |
parent | c301357627172e4aeb3a7cb8d04fd5428d930df4 (diff) | |
download | gtk+-f45dadadd00d892ba16dc081240987425bc32346.tar.gz |
box: Remove 'padding' child property
Diffstat (limited to 'demos/gtk-demo')
31 files changed, 147 insertions, 139 deletions
diff --git a/demos/gtk-demo/assistant.c b/demos/gtk-demo/assistant.c index addf13c875..22b19bc829 100644 --- a/demos/gtk-demo/assistant.c +++ b/demos/gtk-demo/assistant.c @@ -97,12 +97,12 @@ create_page1 (GtkWidget *assistant) gtk_container_set_border_width (GTK_CONTAINER (box), 12); label = gtk_label_new ("You must fill out this entry to continue:"); - gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (box), label, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE); g_signal_connect (G_OBJECT (entry), "changed", G_CALLBACK (on_entry_changed), assistant); @@ -122,7 +122,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, 0); + gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE, FALSE); gtk_widget_show_all (box); gtk_assistant_append_page (GTK_ASSISTANT (assistant), box); diff --git a/demos/gtk-demo/button_box.c b/demos/gtk-demo/button_box.c index 7d383d383f..be4e03353d 100644 --- a/demos/gtk-demo/button_box.c +++ b/demos/gtk-demo/button_box.c @@ -68,64 +68,66 @@ do_button_box (GtkWidget *do_widget) gtk_container_add (GTK_CONTAINER (window), main_vbox); frame_horz = gtk_frame_new ("Horizontal Button Boxes"); - gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE, 10); + 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); - vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); gtk_container_set_border_width (GTK_CONTAINER (vbox), 10); gtk_container_add (GTK_CONTAINER (frame_horz), vbox); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Spread", 40, GTK_BUTTONBOX_SPREAD), - TRUE, TRUE, 0); + TRUE, TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE), - TRUE, TRUE, 5); + TRUE, TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START), - TRUE, TRUE, 5); + TRUE, TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END), - TRUE, TRUE, 5); + TRUE, TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Center", 40, GTK_BUTTONBOX_CENTER), - TRUE, TRUE, 5); + TRUE, TRUE); gtk_box_pack_start (GTK_BOX (vbox), create_bbox (TRUE, "Expand", 0, GTK_BUTTONBOX_EXPAND), - TRUE, TRUE, 5); + TRUE, TRUE); frame_vert = gtk_frame_new ("Vertical Button Boxes"); - gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE, 10); + gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE); - hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); gtk_container_set_border_width (GTK_CONTAINER (hbox), 10); gtk_container_add (GTK_CONTAINER (frame_vert), hbox); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Spread", 10, GTK_BUTTONBOX_SPREAD), - TRUE, TRUE, 0); + TRUE, TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Edge", 10, GTK_BUTTONBOX_EDGE), - TRUE, TRUE, 5); + TRUE, TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Start", 10, GTK_BUTTONBOX_START), - TRUE, TRUE, 5); + TRUE, TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "End", 10, GTK_BUTTONBOX_END), - TRUE, TRUE, 5); + TRUE, TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Center", 10, GTK_BUTTONBOX_CENTER), - TRUE, TRUE, 5); + TRUE, TRUE); gtk_box_pack_start (GTK_BOX (hbox), create_bbox (FALSE, "Expand", 0, GTK_BUTTONBOX_EXPAND), - TRUE, TRUE, 5); + TRUE, TRUE); } if (!gtk_widget_get_visible (window)) diff --git a/demos/gtk-demo/changedisplay.c b/demos/gtk-demo/changedisplay.c index 37c364f3e8..c8a4487eaf 100644 --- a/demos/gtk-demo/changedisplay.c +++ b/demos/gtk-demo/changedisplay.c @@ -313,7 +313,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, 0); + gtk_box_pack_start (GTK_BOX (hbox), scrollwin, TRUE, TRUE); *tree_view = gtk_tree_view_new (); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (*tree_view), FALSE); @@ -323,7 +323,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, 0); + gtk_box_pack_start (GTK_BOX (hbox), *button_vbox, FALSE, FALSE); if (!info->size_group) info->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); @@ -363,11 +363,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, 0); + gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE); info->display_model = (GtkTreeModel *)gtk_list_store_new (DISPLAY_NUM_COLUMNS, G_TYPE_STRING, @@ -540,10 +540,10 @@ do_changedisplay (GtkWidget *do_widget) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); gtk_container_set_border_width (GTK_CONTAINER (vbox), 8); - gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE); frame = create_display_frame (info); - gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE); initialize_displays (info); diff --git a/demos/gtk-demo/clipboard.c b/demos/gtk-demo/clipboard.c index 8bb44e9ed9..8e31c5185b 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); gtk_container_set_border_width (GTK_CONTAINER (hbox), 8); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); /* Create the first entry */ entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE); /* Create the button */ button = gtk_button_new_with_mnemonic (_("_Copy")); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); gtk_container_set_border_width (GTK_CONTAINER (hbox), 8); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE); /* Create the second entry */ entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE); /* Create the button */ button = gtk_button_new_with_mnemonic (_("_Paste")); - gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4); gtk_container_set_border_width (GTK_CONTAINER (hbox), 8); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, 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 c00d50357d..4df48b634f 100644 --- a/demos/gtk-demo/colorsel.c +++ b/demos/gtk-demo/colorsel.c @@ -86,7 +86,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, 0); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE); da = gtk_drawing_area_new (); @@ -101,7 +101,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, 0); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, 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 7044c8fb19..09d50e49cb 100644 --- a/demos/gtk-demo/combobox.c +++ b/demos/gtk-demo/combobox.c @@ -327,7 +327,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, 0); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_set_border_width (GTK_CONTAINER (box), 5); @@ -368,7 +368,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, 0); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_set_border_width (GTK_CONTAINER (box), 5); @@ -396,7 +396,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, 0); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_set_border_width (GTK_CONTAINER (box), 5); @@ -414,7 +414,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, 0); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_set_border_width (GTK_CONTAINER (box), 5); diff --git a/demos/gtk-demo/cursors.c b/demos/gtk-demo/cursors.c index eb922a3ef4..cab6333347 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, 0); + gtk_box_pack_start (GTK_BOX (box), label, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (box), section, FALSE, TRUE); return section; } diff --git a/demos/gtk-demo/dialog.c b/demos/gtk-demo/dialog.c index 0eb1c62397..a632519717 100644 --- a/demos/gtk-demo/dialog.c +++ b/demos/gtk-demo/dialog.c @@ -57,15 +57,15 @@ interactive_dialog_clicked (GtkButton *button, hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); gtk_container_set_border_width (GTK_CONTAINER (hbox), 8); - gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE); image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG); - gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, 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 (); @@ -125,30 +125,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, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE); gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), - FALSE, FALSE, 0); + FALSE, FALSE); /* Interactive dialog*/ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); - gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, 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, 0); - gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, 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 3b7da92dcd..8023bb3423 100644 --- a/demos/gtk-demo/drawingarea.c +++ b/demos/gtk-demo/drawingarea.c @@ -228,11 +228,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, 0); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE); da = gtk_drawing_area_new (); /* set a minimum size */ @@ -250,11 +250,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, 0); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE); da = gtk_drawing_area_new (); /* set a minimum size */ diff --git a/demos/gtk-demo/editable_cells.c b/demos/gtk-demo/editable_cells.c index f57ae5cdfe..d6acc49eb7 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, 0); + 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, 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, 0); + gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, 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 d4863e3896..ef3e15ee3e 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE); g_object_unref (buffer); } diff --git a/demos/gtk-demo/entry_completion.c b/demos/gtk-demo/entry_completion.c index cb822356b5..0ca4cbe5ac 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); /* Create our entry */ entry = gtk_entry_new (); - gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, 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 2a2dff8b95..9ec710c506 100644 --- a/demos/gtk-demo/expander.c +++ b/demos/gtk-demo/expander.c @@ -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, 0); + gtk_box_pack_end (GTK_BOX (area), expander, TRUE, TRUE); gtk_widget_show_all (expander); 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 67cdabb43c..2ebe54f1e8 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE, FALSE); up_button = gtk_tool_button_new (NULL, NULL); gtk_tool_button_set_label (GTK_TOOL_BUTTON (up_button), _("_Up")); @@ -291,7 +291,7 @@ do_iconview (GtkWidget *do_widget) GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, 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 2561c7d9bf..a3e9c7a0a6 100644 --- a/demos/gtk-demo/images.c +++ b/demos/gtk-demo/images.c @@ -356,13 +356,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, 0); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); image = gtk_image_new_from_icon_name ("gtk3-demo", GTK_ICON_SIZE_DIALOG); @@ -374,13 +374,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, 0); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); image = gtk_image_new_from_resource ("/images/floppybuddy.gif"); @@ -391,13 +391,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, 0); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic"); image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG); @@ -410,13 +410,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, 0); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); /* Create an empty image for now; the progressive loader * will create the pixbuf and fill it in. @@ -428,7 +428,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, 0); + gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, 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 bca0e31152..62df74f27a 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE); button = gtk_toggle_button_new_with_label ("Message"); g_object_bind_property (button, "active", bar, "visible", G_BINDING_BIDIRECTIONAL); gtk_container_add (GTK_CONTAINER (actions), button); bar = gtk_info_bar_new (); - gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE); button = gtk_toggle_button_new_with_label ("Warning"); g_object_bind_property (button, "active", bar, "visible", G_BINDING_BIDIRECTIONAL); @@ -91,43 +91,45 @@ 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE); button = gtk_toggle_button_new_with_label ("Question"); g_object_bind_property (button, "active", bar, "visible", G_BINDING_BIDIRECTIONAL); gtk_container_add (GTK_CONTAINER (actions), button); bar = gtk_info_bar_new (); - gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE); button = gtk_toggle_button_new_with_label ("Error"); g_object_bind_property (button, "active", bar, "visible", G_BINDING_BIDIRECTIONAL); gtk_container_add (GTK_CONTAINER (actions), button); bar = gtk_info_bar_new (); - gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE); button = gtk_toggle_button_new_with_label ("Other"); g_object_bind_property (button, "active", bar, "visible", G_BINDING_BIDIRECTIONAL); gtk_container_add (GTK_CONTAINER (actions), button); frame = gtk_frame_new ("Info bars"); - gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 8); + gtk_widget_set_margin_top (frame, 8); + gtk_widget_set_margin_bottom (frame, 8); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8); @@ -135,10 +137,10 @@ 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, 0); + gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE); gtk_widget_show_all (actions); - gtk_box_pack_start (GTK_BOX (vbox2), actions, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox2), actions, FALSE, FALSE); } if (!gtk_widget_get_visible (window)) diff --git a/demos/gtk-demo/list_store.c b/demos/gtk-demo/list_store.c index 6a77071f66..db065edb44 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE); /* create tree model */ model = create_model (); diff --git a/demos/gtk-demo/listbox.c b/demos/gtk-demo/listbox.c index 1bd3ee0803..798be03e95 100644 --- a/demos/gtk-demo/listbox.c +++ b/demos/gtk-demo/listbox.c @@ -359,10 +359,10 @@ 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE); listbox = gtk_list_box_new (); gtk_container_add (GTK_CONTAINER (scrolled), listbox); diff --git a/demos/gtk-demo/menus.c b/demos/gtk-demo/menus.c index 86c435e86a..5537751e87 100644 --- a/demos/gtk-demo/menus.c +++ b/demos/gtk-demo/menus.c @@ -117,7 +117,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, 0); + gtk_box_pack_start (GTK_BOX (box1), menubar, FALSE, TRUE); gtk_widget_show (menubar); menu = create_menu (2); @@ -139,19 +139,19 @@ do_menus (GtkWidget *do_widget) box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10); gtk_container_set_border_width (GTK_CONTAINER (box2), 10); - gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE, 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, 0); + gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE); gtk_widget_set_can_default (button, TRUE); gtk_widget_grab_default (button); gtk_widget_show (button); diff --git a/demos/gtk-demo/offscreen_window.c b/demos/gtk-demo/offscreen_window.c index 20f0b6c4f3..ce5a077339 100644 --- a/demos/gtk-demo/offscreen_window.c +++ b/demos/gtk-demo/offscreen_window.c @@ -590,8 +590,8 @@ do_offscreen_window (GtkWidget *do_widget) g_signal_connect (scale, "value-changed", G_CALLBACK (scale_changed), bin); gtk_container_add (GTK_CONTAINER (window), vbox); - gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), bin, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (vbox), bin, TRUE, TRUE); gtk_container_add (GTK_CONTAINER (bin), button); } diff --git a/demos/gtk-demo/offscreen_window2.c b/demos/gtk-demo/offscreen_window2.c index 9d96500613..ce91040ee7 100644 --- a/demos/gtk-demo/offscreen_window2.c +++ b/demos/gtk-demo/offscreen_window2.c @@ -501,11 +501,11 @@ do_offscreen_window2 (GtkWidget *do_widget) gtk_size_group_add_widget (group, applybutton); gtk_container_add (GTK_CONTAINER (window), vbox); - gtk_box_pack_start (GTK_BOX (vbox), bin, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), bin, TRUE, TRUE); gtk_container_add (GTK_CONTAINER (bin), hbox); - gtk_box_pack_start (GTK_BOX (hbox), backbutton, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (hbox), applybutton, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), backbutton, FALSE, FALSE); + gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE); + gtk_box_pack_start (GTK_BOX (hbox), applybutton, FALSE, FALSE); } if (!gtk_widget_get_visible (window)) diff --git a/demos/gtk-demo/overlay.c b/demos/gtk-demo/overlay.c index 5861e11290..4f64347124 100644 --- a/demos/gtk-demo/overlay.c +++ b/demos/gtk-demo/overlay.c @@ -63,10 +63,14 @@ do_overlay (GtkWidget *do_widget) label = gtk_label_new ("<span foreground='blue' weight='ultrabold' font='40'>Numbers</span>"); gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 8); + 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_entry_set_placeholder_text (GTK_ENTRY (entry), "Your Lucky Number"); - gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 8); + 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_container_add (GTK_CONTAINER (window), overlay); diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c index 98cf8bc47b..e92a37c3c4 100644 --- a/demos/gtk-demo/panes.c +++ b/demos/gtk-demo/panes.c @@ -148,7 +148,7 @@ do_panes (GtkWidget *do_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, 0); + gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE, TRUE); gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5); hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); @@ -179,14 +179,14 @@ do_panes (GtkWidget *do_widget) "Horizontal", "Left", "Right"), - FALSE, FALSE, 0); + FALSE, FALSE); gtk_box_pack_start (GTK_BOX (vbox), create_pane_options (GTK_PANED (vpaned), "Vertical", "Top", "Bottom"), - FALSE, FALSE, 0); + FALSE, FALSE); gtk_widget_show_all (vbox); } diff --git a/demos/gtk-demo/search_entry.c b/demos/gtk-demo/search_entry.c index 63df73cb00..37cb10a51b 100644 --- a/demos/gtk-demo/search_entry.c +++ b/demos/gtk-demo/search_entry.c @@ -243,21 +243,21 @@ 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE); gtk_container_set_border_width (GTK_CONTAINER (hbox), 0); /* Create our entry */ entry = gtk_search_entry_new (); - gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (hbox), notebook, FALSE, 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 b20cb13dea..be70e51756 100644 --- a/demos/gtk-demo/search_entry2.c +++ b/demos/gtk-demo/search_entry2.c @@ -92,12 +92,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, 0); + gtk_box_pack_start (GTK_BOX (container), entry, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), searchbar, FALSE, FALSE); /* Hook the search bar to key presses */ g_signal_connect (window, "key-press-event", @@ -105,27 +105,27 @@ 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE); /* Result */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10); - gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE); gtk_container_set_border_width (GTK_CONTAINER (hbox), 0); 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, 0); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE); label = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE); g_signal_connect (entry, "search-changed", G_CALLBACK (search_changed_cb), label); @@ -133,16 +133,16 @@ 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE); gtk_container_set_border_width (GTK_CONTAINER (hbox), 0); 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, 0); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE); label = gtk_label_new (""); - gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, 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 6830accfb6..b7061adf38 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, 0); + gtk_box_pack_start (GTK_BOX (box), sidebar, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX(box), widget, FALSE, FALSE); - gtk_box_pack_start (GTK_BOX (box), stack, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (box), stack, TRUE, TRUE); for (i=0; (c = *(pages+i)) != NULL; i++ ) { diff --git a/demos/gtk-demo/sizegroup.c b/demos/gtk-demo/sizegroup.c index 1a639244a7..e196f254f6 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE); table = gtk_grid_new (); gtk_container_set_border_width (GTK_CONTAINER (table), 5); @@ -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, 0); + gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE); table = gtk_grid_new (); gtk_container_set_border_width (GTK_CONTAINER (table), 5); @@ -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, 0); + gtk_box_pack_start (GTK_BOX (vbox), check_button, FALSE, 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 c368c20fbb..969665f655 100644 --- a/demos/gtk-demo/spinner.c +++ b/demos/gtk-demo/spinner.c @@ -52,7 +52,7 @@ do_spinner (GtkWidget *do_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, 0); + gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE); gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); /* Sensitive */ diff --git a/demos/gtk-demo/textscroll.c b/demos/gtk-demo/textscroll.c index 3c14605554..1931e69ace 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, 0); + gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE, 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 8470eb8b29..2d61e7ee1d 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, 0); + gtk_box_pack_start (GTK_BOX (box), combo_orientation, FALSE, 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, 0); + gtk_box_pack_start (GTK_BOX (box), combo_style, FALSE, FALSE); /* Add hbox */ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); - gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, TRUE); /* Add and fill the ToolPalette: */ palette = gtk_tool_palette_new (); @@ -550,7 +550,7 @@ do_toolpalette (GtkWidget *do_widget) notebook = gtk_notebook_new (); gtk_container_set_border_width (GTK_CONTAINER (notebook), 6); - gtk_box_pack_end (GTK_BOX(hbox), notebook, FALSE, FALSE, 0); + gtk_box_pack_end (GTK_BOX(hbox), notebook, FALSE, FALSE); /* ===== DnD for tool items ===== */ diff --git a/demos/gtk-demo/tree_store.c b/demos/gtk-demo/tree_store.c index a327af0071..318b4dba17 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, 0); + 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, 0); + gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE); /* create model */ model = create_model (); |