[gtk+/wip/baedert/box: 3/22] box: Remove 'padding' child property
- From: Timm Bäder <baedert src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/wip/baedert/box: 3/22] box: Remove 'padding' child property
- Date: Mon, 3 Oct 2016 10:42:03 +0000 (UTC)
commit e1aa59245283b2f4bdef666daa58b3db9ce6dd12
Author: Timm Bäder <mail baedert org>
Date: Sun Oct 2 17:37:22 2016 +0200
box: Remove 'padding' child property
demos/gtk-demo/assistant.c | 6 +-
demos/gtk-demo/button_box.c | 34 +-
demos/gtk-demo/changedisplay.c | 12 +-
demos/gtk-demo/clipboard.c | 20 +-
demos/gtk-demo/colorsel.c | 4 +-
demos/gtk-demo/combobox.c | 8 +-
demos/gtk-demo/cursors.c | 4 +-
demos/gtk-demo/dialog.c | 20 +-
demos/gtk-demo/drawingarea.c | 8 +-
demos/gtk-demo/editable_cells.c | 10 +-
demos/gtk-demo/entry_buffer.c | 6 +-
demos/gtk-demo/entry_completion.c | 4 +-
demos/gtk-demo/expander.c | 2 +-
demos/gtk-demo/iconview.c | 4 +-
demos/gtk-demo/images.c | 18 +-
demos/gtk-demo/infobar.c | 28 +-
demos/gtk-demo/list_store.c | 4 +-
demos/gtk-demo/listbox.c | 4 +-
demos/gtk-demo/menus.c | 8 +-
demos/gtk-demo/offscreen_window.c | 4 +-
demos/gtk-demo/offscreen_window2.c | 8 +-
demos/gtk-demo/overlay.c | 8 +-
demos/gtk-demo/panes.c | 6 +-
demos/gtk-demo/search_entry.c | 8 +-
demos/gtk-demo/search_entry2.c | 20 +-
demos/gtk-demo/sidebar.c | 6 +-
demos/gtk-demo/sizegroup.c | 6 +-
demos/gtk-demo/spinner.c | 2 +-
demos/gtk-demo/textscroll.c | 2 +-
demos/gtk-demo/toolpalette.c | 8 +-
demos/gtk-demo/tree_store.c | 4 +-
demos/widget-factory/widget-factory.c | 8 +-
docs/tools/widgets.c | 136 ++--
examples/search-bar.c | 4 +-
gtk/deprecated/gtkcolorsel.c | 26 +-
gtk/deprecated/gtkfontsel.c | 20 +-
gtk/gtkactionbar.c | 4 +-
gtk/gtkappchooserdialog.c | 6 +-
gtk/gtkassistant.c | 8 +-
gtk/gtkbbox.c | 2 +-
gtk/gtkbox.c | 129 +---
gtk/gtkbox.h | 8 +-
gtk/gtkbutton.c | 8 +-
gtk/gtkcolorchooserwidget.c | 4 +-
gtk/gtkcombobox.c | 4 +-
gtk/gtkcustompaperunixdialog.c | 24 +-
gtk/gtkentrycompletion.c | 4 +-
gtk/gtkfilechooserwidget.c | 10 +-
gtk/gtkheaderbar.c | 12 +-
gtk/gtkinfobar.c | 2 +-
gtk/gtkmenu.c | 2 +-
gtk/gtkmenusectionbox.c | 14 +-
gtk/gtkmenutoolbutton.c | 4 +-
gtk/gtkmodelmenuitem.c | 4 +-
gtk/gtkmountoperation.c | 28 +-
gtk/gtkpathbar.c | 4 +-
gtk/gtkprintbackend.c | 24 +-
gtk/gtkprinteroptionwidget.c | 20 +-
gtk/gtkprintunixdialog.c | 14 +-
gtk/gtkrecentchooserdialog.c | 4 +-
gtk/gtkshortcutssection.c | 2 +-
gtk/gtktoolbutton.c | 12 +-
gtk/gtktreeviewcolumn.c | 8 +-
gtk/inspector/general.c | 8 +-
gtk/inspector/gtkstackcombo.c | 2 +-
gtk/inspector/prop-editor.c | 6 +-
gtk/inspector/size-groups.c | 8 +-
gtk/inspector/strv-editor.c | 10 +-
gtk/ui/gtkfontbutton.ui | 2 -
gtk/ui/gtkprintunixdialog.ui | 1 -
tests/flicker.c | 43 +-
tests/gdkgears.c | 10 +-
tests/motion-compression.c | 4 +-
tests/overlayscroll.c | 2 +-
tests/print-editor.c | 20 +-
tests/syncscroll.c | 6 +-
tests/testaccel.c | 8 +-
tests/testactionbar.c | 4 +-
tests/testactions.c | 24 +-
tests/testadjustsize.c | 4 +-
tests/testanimation.c | 18 +-
tests/testappchooserbutton.c | 10 +-
tests/testassistant.c | 13 +-
tests/testbaseline.c | 16 +-
tests/testbbox.c | 48 +-
tests/testbox.c | 24 +-
tests/testboxcss.c | 16 +-
tests/testcalendar.c | 70 +-
tests/testcellarea.c | 62 +-
tests/testcellrenderertext.c | 8 +-
tests/testclipboard.c | 4 +-
tests/testcombo.c | 40 +-
tests/testcombochange.c | 28 +-
tests/testellipsise.c | 6 +-
tests/testentrycompletion.c | 10 +-
tests/testexpand.c | 20 +-
tests/testexpander.c | 2 +-
tests/testfilechooserbutton.c | 30 +-
tests/testflowbox.c | 44 +-
tests/testframe.c | 4 +-
tests/testgiconpixbuf.c | 14 +-
tests/testgrid.c | 10 +-
tests/testgtk.c | 1036 +++++++++++++------------
tests/testheaderbar.c | 8 +-
tests/testheightforwidth.c | 2 +-
tests/testiconview.c | 22 +-
tests/testinput.c | 4 +-
tests/testmerge.c | 30 +-
tests/testmultidisplay.c | 4 +-
tests/testoffscreen.c | 38 +-
tests/testorientable.c | 12 +-
tests/testoverlay.c | 8 +-
tests/testpixbuf-save.c | 8 +-
tests/testpixbuf-scale.c | 14 +-
tests/testrecentchoosermenu.c | 8 +-
tests/testscale.c | 16 +-
tests/testscrolledwindow.c | 70 +-
tests/testselection.c | 8 +-
tests/testsensitive.c | 8 +-
tests/testsocket.c | 48 +-
tests/testsocket_common.c | 20 +-
tests/testspinbutton.c | 4 +-
tests/teststack.c | 6 +-
tests/teststatusicon.c | 12 +-
tests/teststockbuttonmenu.c | 2 +-
tests/testswitch.c | 14 +-
tests/testtoolbar.c | 30 +-
tests/testtooltips.c | 22 +-
tests/testtoplevelembed.c | 4 +-
tests/testtreecolumns.c | 38 +-
tests/testtreecolumnsizing.c | 6 +-
tests/testtreeedit.c | 16 +-
tests/testtreeflow.c | 10 +-
tests/testtreefocus.c | 8 +-
tests/testtreemenu.c | 34 +-
tests/testtreesort.c | 24 +-
tests/testwindows.c | 77 +-
tests/testwindowsize.c | 2 +-
tests/treestoretest.c | 58 +-
testsuite/reftests/inherit-and-initial.ref.ui | 3 -
testsuite/reftests/inherit-and-initial.ui | 3 -
141 files changed, 1585 insertions(+), 1656 deletions(-)
---
diff --git a/demos/gtk-demo/assistant.c b/demos/gtk-demo/assistant.c
index addf13c..22b19bc 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 7d383d3..be4e033 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 37c364f..c8a4487 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 8bb44e9..8e31c51 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 c00d503..4df48b6 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 7044c8f..09d50e4 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 eb922a3..cab6333 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 0eb1c62..a632519 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 3b7da92..8023bb3 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 f57ae5c..d6acc49 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 d4863e3..ef3e15e 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 cb82235..0ca4cbe 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 2a2dff8..9ec710c 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 67cdabb..2ebe54f 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 2561c7d..a3e9c7a 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 bca0e31..62df74f 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 6a77071..db065ed 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 1bd3ee0..798be03 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 86c435e..5537751 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 acd4c41..27bdf95 100644
--- a/demos/gtk-demo/offscreen_window.c
+++ b/demos/gtk-demo/offscreen_window.c
@@ -591,8 +591,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 a9d1687..a585399 100644
--- a/demos/gtk-demo/offscreen_window2.c
+++ b/demos/gtk-demo/offscreen_window2.c
@@ -502,11 +502,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 5861e11..4f64347 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 98cf8bc..e92a37c 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 63df73c..37cb10a 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 b20cb13..be70e51 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 6830acc..b7061ad 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 1a63924..e196f25 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 c368c20..969665f 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 3c14605..1931e69 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 8470eb8..2d61e7e 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 a327af0..318b4db 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 ();
diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index 1584c13..d972f32 100644
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -787,7 +787,7 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget)
"margin", 6,
"xalign", 0.0,
NULL);
- gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE);
gdk_rgba_parse (&rgba, color);
swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
"rgba", &rgba,
@@ -799,7 +799,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, 0);
+ gtk_box_pack_start (GTK_BOX (row), box, FALSE, FALSE);
gtk_widget_show_all (row);
gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1);
row = gtk_widget_get_parent (row);
@@ -898,7 +898,7 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser)
"margin", 6,
"xalign", 0.0,
NULL);
- gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE);
gdk_rgba_parse (&rgba, colors[i].color);
swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
"rgba", &rgba,
@@ -910,7 +910,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, 0);
+ gtk_box_pack_start (GTK_BOX (row), box, FALSE, FALSE);
gtk_widget_show_all (row);
gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1);
row = gtk_widget_get_parent (row);
diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 932daf1..5315f5a 100644
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -89,9 +89,9 @@ create_switch (void)
widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
sw = gtk_switch_new ();
gtk_switch_set_active (GTK_SWITCH (sw), TRUE);
- gtk_box_pack_start (GTK_BOX (widget), sw, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (widget), sw, TRUE, TRUE);
sw = gtk_switch_new ();
- gtk_box_pack_start (GTK_BOX (widget), sw, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (widget), sw, TRUE, TRUE);
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_container_add (GTK_CONTAINER (align), widget);
@@ -156,11 +156,11 @@ create_menu_button (void)
gtk_menu_button_set_popup (GTK_MENU_BUTTON (widget), menu);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Menu Button"), TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Menu Button"), TRUE, TRUE);
return new_widget_info ("menu-button", vbox, SMALL);
}
@@ -209,10 +209,10 @@ create_lockbutton (void)
widget = gtk_lock_button_new (g_object_new (G_TYPE_TEST_PERMISSION, NULL));
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Lock Button"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
gtk_widget_set_halign (vbox, GTK_ALIGN_CENTER);
gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER);
@@ -257,11 +257,11 @@ create_radio (void)
widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
radio = gtk_radio_button_new_with_mnemonic (NULL, "Radio Button _One");
- gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE);
radio = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (radio), "Radio Button _Two");
- gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE);
radio = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (radio), "Radio Button T_hree");
- gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE);
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_container_add (GTK_CONTAINER (align), widget);
@@ -420,7 +420,7 @@ create_search_bar (void)
view = gtk_text_view_new ();
gtk_widget_show (view);
- gtk_box_pack_start (GTK_BOX (box), view, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), view, TRUE, TRUE);
info = new_widget_info ("search-bar", box, SMALL);
gtk_container_set_border_width (GTK_CONTAINER (info->window), 0);
@@ -440,7 +440,7 @@ create_action_bar (void)
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
view = gtk_text_view_new ();
gtk_widget_show (view);
- gtk_box_pack_start (GTK_BOX (box), view, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), view, TRUE, TRUE);
widget = gtk_action_bar_new ();
@@ -574,10 +574,10 @@ create_icon_view (void)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
gtk_container_add (GTK_CONTAINER (align), widget);
- gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Icon View"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
info = new_widget_info ("icon-view", vbox, MEDIUM);
info->no_focus = FALSE;
@@ -600,10 +600,10 @@ create_color_button (void)
color.blue = 0xff<<8;
picker = gtk_color_button_new_with_color (&color);
gtk_container_add (GTK_CONTAINER (align), picker);
- gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Color Button"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
return new_widget_info ("color-button", vbox, SMALL);
}
@@ -619,10 +619,10 @@ create_font_button (void)
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
picker = gtk_font_button_new_with_font ("Sans Serif 10");
gtk_container_add (GTK_CONTAINER (align), picker);
- gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Font Button"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
return new_widget_info ("font-button", vbox, SMALL);
}
@@ -643,16 +643,16 @@ create_file_button (void)
GTK_FILE_CHOOSER_ACTION_OPEN);
gtk_widget_set_size_request (picker, 150, -1);
gtk_container_add (GTK_CONTAINER (align), picker);
- gtk_box_pack_start (GTK_BOX (vbox2), align, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), align, FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox2),
gtk_label_new ("File Button (Files)"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox),
- vbox2, TRUE, TRUE, 0);
+ vbox2, TRUE, TRUE);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
@@ -663,12 +663,12 @@ create_file_button (void)
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (picker), path);
g_free (path);
gtk_container_add (GTK_CONTAINER (align), picker);
- gtk_box_pack_start (GTK_BOX (vbox2), align, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), align, FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox2),
gtk_label_new ("File Button (Select Folder)"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox),
- vbox2, TRUE, TRUE, 0);
+ vbox2, TRUE, TRUE);
return new_widget_info ("file-button", vbox, MEDIUM);
}
@@ -684,17 +684,17 @@ create_separator (void)
gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
gtk_box_pack_start (GTK_BOX (hbox),
gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
- TRUE, TRUE, 0);
+ TRUE, TRUE);
gtk_box_pack_start (GTK_BOX (hbox),
gtk_separator_new (GTK_ORIENTATION_VERTICAL),
- TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
+ TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
gtk_box_pack_start (GTK_BOX (vbox),
g_object_new (GTK_TYPE_LABEL,
"label", "Horizontal and Vertical\nSeparators",
"justify", GTK_JUSTIFY_CENTER,
NULL),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
return new_widget_info ("separator", vbox, MEDIUM);
}
@@ -721,7 +721,7 @@ create_panes (void)
FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (hbox),
pane,
- TRUE, TRUE, 0);
+ TRUE, TRUE);
pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
gtk_paned_pack1 (GTK_PANED (pane),
g_object_new (GTK_TYPE_FRAME,
@@ -735,14 +735,14 @@ create_panes (void)
FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (hbox),
pane,
- TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
+ TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
gtk_box_pack_start (GTK_BOX (vbox),
g_object_new (GTK_TYPE_LABEL,
"label", "Horizontal and Vertical\nPanes",
"justify", GTK_JUSTIFY_CENTER,
NULL),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
return new_widget_info ("panes", vbox, MEDIUM);
}
@@ -905,10 +905,10 @@ create_menubar (void)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
align = gtk_alignment_new (0.5, 0.5, 1.0, 0.0);
gtk_container_add (GTK_CONTAINER (align), widget);
- gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Menu Bar"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
return new_widget_info ("menubar", vbox, SMALL);
}
@@ -985,10 +985,10 @@ create_progressbar (void)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
align = gtk_alignment_new (0.5, 0.5, 1.0, 0.0);
gtk_container_add (GTK_CONTAINER (align), widget);
- gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Progress Bar"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
return new_widget_info ("progressbar", vbox, SMALL);
}
@@ -1003,10 +1003,10 @@ create_level_bar (void)
gtk_level_bar_set_value (GTK_LEVEL_BAR (widget), 0.333);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
- gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Level Bar"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
return new_widget_info ("levelbar", vbox, SMALL);
}
@@ -1038,10 +1038,10 @@ create_scrollbar (void)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
align = gtk_alignment_new (0.5, 0.5, 1.0, 0.0);
gtk_container_add (GTK_CONTAINER (align), widget);
- gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Scrollbar"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
return new_widget_info ("scrollbar", vbox, SMALL);
}
@@ -1057,10 +1057,10 @@ create_spinbutton (void)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_container_add (GTK_CONTAINER (align), widget);
- gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Spin Button"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
return new_widget_info ("spinbutton", vbox, SMALL);
}
@@ -1077,13 +1077,13 @@ create_statusbar (void)
gtk_container_add (GTK_CONTAINER (align), gtk_label_new ("Status Bar"));
gtk_box_pack_start (GTK_BOX (vbox),
align,
- FALSE, FALSE, 0);
+ FALSE, FALSE);
widget = gtk_statusbar_new ();
align = gtk_alignment_new (0.5, 1.0, 1.0, 0.0);
gtk_container_add (GTK_CONTAINER (align), widget);
gtk_statusbar_push (GTK_STATUSBAR (widget), 0, "Hold on...");
- gtk_box_pack_end (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), align, FALSE, FALSE);
info = new_widget_info ("statusbar", vbox, SMALL);
gtk_container_set_border_width (GTK_CONTAINER (info->window), 0);
@@ -1103,18 +1103,18 @@ create_scales (void)
gtk_box_pack_start (GTK_BOX (hbox),
gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
0.0, 100.0, 1.0),
- TRUE, TRUE, 0);
+ TRUE, TRUE);
gtk_box_pack_start (GTK_BOX (hbox),
gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL,
0.0, 100.0, 1.0),
- TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
+ TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
gtk_box_pack_start (GTK_BOX (vbox),
g_object_new (GTK_TYPE_LABEL,
"label", "Horizontal and Vertical\nScales",
"justify", GTK_JUSTIFY_CENTER,
NULL),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
return new_widget_info ("scales", vbox, MEDIUM);}
static WidgetInfo *
@@ -1129,10 +1129,10 @@ create_image (void)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_container_add (GTK_CONTAINER (align), widget);
- gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Image"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
return new_widget_info ("image", vbox, SMALL);
}
@@ -1150,10 +1150,10 @@ create_spinner (void)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_container_add (GTK_CONTAINER (align), widget);
- gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Spinner"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
return new_widget_info ("spinner", vbox, SMALL);
}
@@ -1172,7 +1172,7 @@ create_volume_button (void)
gtk_container_add (GTK_CONTAINER (widget), box);
button = gtk_volume_button_new ();
- gtk_box_pack_end (GTK_BOX (box), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (box), button, FALSE, FALSE);
gtk_scale_button_set_value (GTK_SCALE_BUTTON (button), 33);
popup = gtk_scale_button_get_popup (GTK_SCALE_BUTTON (button));
@@ -1221,10 +1221,10 @@ create_appchooserbutton (void)
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
picker = gtk_app_chooser_button_new ("text/plain");
gtk_container_add (GTK_CONTAINER (align), picker);
- gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Application Button"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
return new_widget_info ("appchooserbutton", vbox, SMALL);
}
@@ -1310,10 +1310,10 @@ create_placessidebar (void)
align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
gtk_container_add (GTK_CONTAINER (align), bar);
- gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Places Sidebar"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
return new_widget_info ("placessidebar", vbox, ASIS);
}
@@ -1343,11 +1343,11 @@ create_stack (void)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_box_pack_start (GTK_BOX (vbox), switcher, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), stack, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), switcher, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (vbox), stack, FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Stack"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
return new_widget_info ("stack", vbox, ASIS);
}
@@ -1377,11 +1377,11 @@ create_stack_switcher (void)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_box_pack_start (GTK_BOX (vbox), switcher, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), stack, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), switcher, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (vbox), stack, FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox),
gtk_label_new ("Stack Switcher"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
return new_widget_info ("stackswitcher", vbox, ASIS);
}
@@ -1413,9 +1413,9 @@ create_sidebar (void)
frame = gtk_frame_new (NULL);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (hbox), sidebar, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), gtk_separator_new (GTK_ORIENTATION_VERTICAL), FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), stack, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), sidebar, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (hbox), gtk_separator_new (GTK_ORIENTATION_VERTICAL), FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (hbox), stack, TRUE, TRUE);
gtk_container_add (GTK_CONTAINER (frame), hbox);
return new_widget_info ("sidebar", frame, ASIS);
@@ -1507,9 +1507,9 @@ create_flow_box (void)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Flow Box"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
info = new_widget_info ("flow-box", vbox, ASIS);
info->no_focus = FALSE;
diff --git a/examples/search-bar.c b/examples/search-bar.c
index 16cacdb..8617ed6 100644
--- a/examples/search-bar.c
+++ b/examples/search-bar.c
@@ -30,11 +30,11 @@ activate_cb (GtkApplication *app,
gtk_widget_show (box);
entry = gtk_search_entry_new ();
- gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE);
gtk_widget_show (entry);
menu_button = gtk_menu_button_new ();
- gtk_box_pack_start (GTK_BOX (box), menu_button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), menu_button, FALSE, FALSE);
gtk_widget_show (menu_button);
gtk_search_bar_connect_entry (GTK_SEARCH_BAR (search_bar), GTK_ENTRY (entry));
diff --git a/gtk/deprecated/gtkcolorsel.c b/gtk/deprecated/gtkcolorsel.c
index 8152983..ba2246d 100644
--- a/gtk/deprecated/gtkcolorsel.c
+++ b/gtk/deprecated/gtkcolorsel.c
@@ -412,29 +412,29 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
priv->default_alpha_set = FALSE;
top_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
- gtk_box_pack_start (GTK_BOX (colorsel), top_hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (colorsel), top_hbox, FALSE, FALSE);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
priv->triangle_colorsel = gtk_hsv_new ();
g_signal_connect (priv->triangle_colorsel, "changed",
G_CALLBACK (hsv_changed), colorsel);
gtk_hsv_set_metrics (GTK_HSV (priv->triangle_colorsel), 174, 15);
- gtk_box_pack_start (GTK_BOX (top_hbox), vbox, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), priv->triangle_colorsel, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (top_hbox), vbox, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (vbox), priv->triangle_colorsel, FALSE, FALSE);
gtk_widget_set_tooltip_text (priv->triangle_colorsel,
_("Select the color you want from the outer ring. "
"Select the darkness or lightness of that color "
"using the inner triangle."));
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
- gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE);
frame = gtk_frame_new (NULL);
gtk_widget_set_size_request (frame, -1, 30);
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
color_sample_new (colorsel);
gtk_container_add (GTK_CONTAINER (frame), priv->sample_area);
- gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE);
button = gtk_button_new ();
@@ -445,16 +445,16 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
picker_image = gtk_image_new_from_stock (GTK_STOCK_COLOR_PICKER, GTK_ICON_SIZE_BUTTON);
gtk_container_add (GTK_CONTAINER (button), picker_image);
gtk_widget_show (GTK_WIDGET (picker_image));
- gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE);
gtk_widget_set_tooltip_text (button,
_("Click the eyedropper, then click a color "
"anywhere on your screen to select that color."));
top_right_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
- gtk_box_pack_start (GTK_BOX (top_hbox), top_right_vbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (top_hbox), top_right_vbox, FALSE, FALSE);
table = gtk_grid_new ();
- gtk_box_pack_start (GTK_BOX (top_right_vbox), table, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (top_right_vbox), table, FALSE, FALSE);
gtk_grid_set_row_spacing (GTK_GRID (table), 6);
gtk_grid_set_column_spacing (GTK_GRID (table), 12);
@@ -548,13 +548,13 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
label = gtk_label_new_with_mnemonic (_("_Palette:"));
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (priv->palette_frame), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (priv->palette_frame), label, FALSE, FALSE);
gtk_label_set_mnemonic_widget (GTK_LABEL (label),
priv->custom_palette[0][0]);
- gtk_box_pack_end (GTK_BOX (top_right_vbox), priv->palette_frame, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (priv->palette_frame), table, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (top_right_vbox), priv->palette_frame, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (priv->palette_frame), table, FALSE, FALSE);
gtk_widget_show_all (top_hbox);
@@ -1101,9 +1101,9 @@ color_sample_new (GtkColorSelection *colorsel)
priv->cur_sample = gtk_drawing_area_new ();
gtk_box_pack_start (GTK_BOX (priv->sample_area), priv->old_sample,
- TRUE, TRUE, 0);
+ TRUE, TRUE);
gtk_box_pack_start (GTK_BOX (priv->sample_area), priv->cur_sample,
- TRUE, TRUE, 0);
+ TRUE, TRUE);
g_signal_connect (priv->old_sample, "draw",
G_CALLBACK (color_old_sample_draw),
diff --git a/gtk/deprecated/gtkfontsel.c b/gtk/deprecated/gtkfontsel.c
index 7812e75..4525e39 100644
--- a/gtk/deprecated/gtkfontsel.c
+++ b/gtk/deprecated/gtkfontsel.c
@@ -347,13 +347,13 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
gtk_box_set_spacing (GTK_BOX (fontsel), 12);
priv->size = 12 * PANGO_SCALE;
-
+
/* Create the table of font, style & size. */
table = gtk_table_new (3, 3, FALSE);
gtk_widget_show (table);
gtk_table_set_row_spacings (GTK_TABLE (table), 6);
gtk_table_set_col_spacings (GTK_TABLE (table), 12);
- gtk_box_pack_start (GTK_BOX (fontsel), table, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (fontsel), table, TRUE, TRUE);
#ifdef INCLUDE_FONT_ENTRIES
priv->font_entry = gtk_entry_new ();
@@ -571,30 +571,30 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_widget_show (vbox);
- gtk_box_pack_start (GTK_BOX (fontsel), vbox, FALSE, TRUE, 0);
-
+ gtk_box_pack_start (GTK_BOX (fontsel), vbox, FALSE, TRUE);
+
/* create the text entry widget */
label = gtk_label_new_with_mnemonic (_("_Preview:"));
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE);
text_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show (text_box);
- gtk_box_pack_start (GTK_BOX (vbox), text_box, FALSE, TRUE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), text_box, FALSE, TRUE);
+
priv->preview_entry = gtk_entry_new ();
gtk_label_set_mnemonic_widget (GTK_LABEL (label), priv->preview_entry);
gtk_entry_set_text (GTK_ENTRY (priv->preview_entry), _(PREVIEW_TEXT));
-
+
gtk_widget_show (priv->preview_entry);
g_signal_connect (priv->preview_entry, "changed",
G_CALLBACK (gtk_font_selection_preview_changed), fontsel);
gtk_widget_set_size_request (priv->preview_entry,
-1, INITIAL_PREVIEW_HEIGHT);
gtk_box_pack_start (GTK_BOX (text_box), priv->preview_entry,
- TRUE, TRUE, 0);
+ TRUE, TRUE);
gtk_widget_pop_composite_child();
}
@@ -1682,7 +1682,7 @@ gtk_font_selection_dialog_init (GtkFontSelectionDialog *fontseldiag)
gtk_container_set_border_width (GTK_CONTAINER (priv->fontsel), 5);
gtk_widget_show (priv->fontsel);
gtk_box_pack_start (GTK_BOX (content_area),
- priv->fontsel, TRUE, TRUE, 0);
+ priv->fontsel, TRUE, TRUE);
/* Create the action area */
priv->cancel_button = gtk_dialog_add_button (dialog,
diff --git a/gtk/gtkactionbar.c b/gtk/gtkactionbar.c
index a4bb113..f26796b 100644
--- a/gtk/gtkactionbar.c
+++ b/gtk/gtkactionbar.c
@@ -431,7 +431,7 @@ gtk_action_bar_pack_start (GtkActionBar *action_bar,
{
GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (action_bar);
- gtk_box_pack_start (GTK_BOX (priv->box), child, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (priv->box), child, FALSE, TRUE);
}
/**
@@ -450,7 +450,7 @@ gtk_action_bar_pack_end (GtkActionBar *action_bar,
{
GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (action_bar);
- gtk_box_pack_end (GTK_BOX (priv->box), child, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (priv->box), child, FALSE, TRUE);
}
/**
diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c
index 6efad77..8837e3e 100644
--- a/gtk/gtkappchooserdialog.c
+++ b/gtk/gtkappchooserdialog.c
@@ -347,7 +347,7 @@ construct_appchooser_widget (GtkAppChooserDialog *self)
/* Need to build the appchooser widget after, because of the content-type construct-only property */
self->priv->app_chooser_widget = gtk_app_chooser_widget_new (self->priv->content_type);
- gtk_box_pack_start (GTK_BOX (self->priv->inner_box), self->priv->app_chooser_widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (self->priv->inner_box), self->priv->app_chooser_widget, TRUE, TRUE);
gtk_widget_show (self->priv->app_chooser_widget);
g_signal_connect (self->priv->app_chooser_widget, "application-selected",
@@ -361,10 +361,10 @@ construct_appchooser_widget (GtkAppChooserDialog *self)
/* Add the custom button to the new appchooser */
gtk_box_pack_start (GTK_BOX (self->priv->inner_box),
- self->priv->show_more_button, FALSE, FALSE, 0);
+ self->priv->show_more_button, FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (self->priv->inner_box),
- self->priv->software_button, FALSE, FALSE, 0);
+ self->priv->software_button, FALSE, FALSE);
info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (self->priv->app_chooser_widget));
gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, info != NULL);
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index d8d7329..c011999 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -1825,14 +1825,14 @@ gtk_assistant_insert_page (GtkAssistant *assistant,
priv->pages = g_list_insert (priv->pages, page_info, position);
- gtk_box_pack_start (GTK_BOX (priv->sidebar), page_info->regular_title, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (priv->sidebar), page_info->current_title, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (priv->sidebar), page_info->regular_title, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (priv->sidebar), page_info->current_title, FALSE, FALSE);
gtk_box_reorder_child (GTK_BOX (priv->sidebar), page_info->regular_title, 2 * position);
gtk_box_reorder_child (GTK_BOX (priv->sidebar), page_info->current_title, 2 * position + 1);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_widget_show (box);
- gtk_box_pack_start (GTK_BOX (box), page, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), page, TRUE, TRUE);
g_object_set (box, "margin", 12, NULL);
g_signal_connect (box, "remove", G_CALLBACK (assistant_remove_page_cb), assistant);
@@ -1935,7 +1935,7 @@ add_to_action_area (GtkAssistant *assistant,
gtk_widget_set_valign (child, GTK_ALIGN_BASELINE);
- gtk_box_pack_end (GTK_BOX (priv->action_area), child, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (priv->action_area), child, FALSE, FALSE);
}
/**
diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c
index ab67237..979f2a8 100644
--- a/gtk/gtkbbox.c
+++ b/gtk/gtkbbox.c
@@ -163,7 +163,7 @@ static void
gtk_button_box_add (GtkContainer *container,
GtkWidget *widget)
{
- gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE);
}
static void
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index e39eb49..250ddae 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -58,15 +58,13 @@
*
* Use gtk_box_set_spacing() to determine how much space will be
* minimally placed between all children in the GtkBox. Note that
- * spacing is added between the children, while
- * padding added by gtk_box_pack_start() or gtk_box_pack_end() is added
- * on either side of the widget it belongs to.
+ * spacing is added between the children.
*
* Use gtk_box_reorder_child() to move a GtkBox child to a different
* place in the box.
*
- * Use gtk_box_set_child_packing() to reset the expand,
- * fill and padding child properties.
+ * Use gtk_box_set_child_packing() to reset the expand and
+ * fill child properties.
* Use gtk_box_query_child_packing() to query these fields.
*
* Note that a single-row or single-column #GtkGrid provides exactly
@@ -114,7 +112,6 @@ enum {
CHILD_PROP_0,
CHILD_PROP_EXPAND,
CHILD_PROP_FILL,
- CHILD_PROP_PADDING,
CHILD_PROP_PACK_TYPE,
CHILD_PROP_POSITION,
LAST_CHILD_PROP
@@ -143,7 +140,6 @@ static GParamSpec *child_props[LAST_CHILD_PROP] = { NULL, };
/*
* GtkBoxChild:
* @widget: the child widget, packed into the GtkBox.
- * @padding: the number of extra pixels to put between this child and its
* neighbors, set when packed, zero by default.
* @expand: flag indicates whether extra space should be given to this child.
* Any extra space given to the parent GtkBox is divided up among all children
@@ -158,8 +154,6 @@ struct _GtkBoxChild
{
GtkWidget *widget;
- guint16 padding;
-
guint expand : 1;
guint fill : 1;
guint pack : 1;
@@ -340,14 +334,6 @@ gtk_box_class_init (GtkBoxClass *class)
TRUE,
GTK_PARAM_READWRITE);
- child_props[CHILD_PROP_PADDING] =
- g_param_spec_uint ("padding",
- P_("Padding"),
- P_("Extra space to put between the child and its neighbors, in pixels"),
- 0, G_MAXINT,
- 0,
- GTK_PARAM_READWRITE);
-
child_props[CHILD_PROP_PACK_TYPE] =
g_param_spec_enum ("pack-type",
P_("Pack type"),
@@ -570,7 +556,6 @@ gtk_box_size_allocate_no_center (GtkWidget *widget,
(private->orientation == GTK_ORIENTATION_HORIZONTAL) ? allocation->height :
allocation->width);
size -= sizes[i].minimum_size;
- size -= child->padding * 2;
sizes[i].data = child;
@@ -642,7 +627,7 @@ gtk_box_size_allocate_no_center (GtkWidget *widget,
}
else
{
- child_size = sizes[i].minimum_size + child->padding * 2;
+ child_size = sizes[i].minimum_size;
if (child->expand || gtk_widget_compute_expand (child->widget, private->orientation))
{
@@ -665,7 +650,7 @@ gtk_box_size_allocate_no_center (GtkWidget *widget,
int child_minimum_height, child_natural_height;
if (child->fill)
- child_allocation_width = MAX (1, child_size - child->padding * 2);
+ child_allocation_width = MAX (1, child_size);
else
child_allocation_width = sizes[i].minimum_size;
@@ -760,8 +745,8 @@ gtk_box_size_allocate_no_center (GtkWidget *widget,
{
if (child->fill)
{
- child_allocation.width = MAX (1, child_size - child->padding * 2);
- child_allocation.x = x + child->padding;
+ child_allocation.width = MAX (1, child_size);
+ child_allocation.x = x;
}
else
{
@@ -788,8 +773,8 @@ gtk_box_size_allocate_no_center (GtkWidget *widget,
{
if (child->fill)
{
- child_allocation.height = MAX (1, child_size - child->padding * 2);
- child_allocation.y = y + child->padding;
+ child_allocation.height = MAX (1, child_size);
+ child_allocation.y = y;
}
else
{
@@ -910,8 +895,8 @@ gtk_box_size_allocate_with_center (GtkWidget *widget,
if (child != priv->center)
{
- min_size[child->pack] += req->minimum_size + 2 * child->padding;
- nat_size[child->pack] += req->natural_size + 2 * child->padding;
+ min_size[child->pack] += req->minimum_size;
+ nat_size[child->pack] += req->natural_size;
idx[child->pack] += 1;
}
@@ -986,7 +971,7 @@ gtk_box_size_allocate_with_center (GtkWidget *widget,
}
else
{
- child_size = sizes[packing][i].minimum_size + child->padding * 2;
+ child_size = sizes[packing][i].minimum_size;
if (child->expand || gtk_widget_compute_expand (child->widget, priv->orientation))
{
@@ -1009,7 +994,7 @@ gtk_box_size_allocate_with_center (GtkWidget *widget,
gint child_minimum_height, child_natural_height;
if (child->fill)
- child_allocation_width = MAX (1, child_size - child->padding * 2);
+ child_allocation_width = MAX (1, child_size);
else
child_allocation_width = sizes[packing][i].minimum_size;
@@ -1102,8 +1087,8 @@ gtk_box_size_allocate_with_center (GtkWidget *widget,
{
if (child->fill)
{
- child_allocation.width = MAX (1, child_size - child->padding * 2);
- child_allocation.x = x + child->padding;
+ child_allocation.width = MAX (1, child_size);
+ child_allocation.x = x;
}
else
{
@@ -1126,8 +1111,8 @@ gtk_box_size_allocate_with_center (GtkWidget *widget,
{
if (child->fill)
{
- child_allocation.height = MAX (1, child_size - child->padding * 2);
- child_allocation.y = y + child->padding;
+ child_allocation.height = MAX (1, child_size);
+ child_allocation.y = y;
}
else
{
@@ -1239,7 +1224,6 @@ gtk_box_set_child_property (GtkContainer *container,
{
gboolean expand = 0;
gboolean fill = 0;
- guint padding = 0;
GtkPackType pack_type = 0;
if (property_id != CHILD_PROP_POSITION)
@@ -1247,7 +1231,6 @@ gtk_box_set_child_property (GtkContainer *container,
child,
&expand,
&fill,
- &padding,
&pack_type);
switch (property_id)
{
@@ -1256,7 +1239,6 @@ gtk_box_set_child_property (GtkContainer *container,
child,
g_value_get_boolean (value),
fill,
- padding,
pack_type);
break;
case CHILD_PROP_FILL:
@@ -1264,15 +1246,6 @@ gtk_box_set_child_property (GtkContainer *container,
child,
expand,
g_value_get_boolean (value),
- padding,
- pack_type);
- break;
- case CHILD_PROP_PADDING:
- gtk_box_set_child_packing (GTK_BOX (container),
- child,
- expand,
- fill,
- g_value_get_uint (value),
pack_type);
break;
case CHILD_PROP_PACK_TYPE:
@@ -1280,7 +1253,6 @@ gtk_box_set_child_property (GtkContainer *container,
child,
expand,
fill,
- padding,
g_value_get_enum (value));
break;
case CHILD_PROP_POSITION:
@@ -1303,7 +1275,6 @@ gtk_box_get_child_property (GtkContainer *container,
{
gboolean expand = FALSE;
gboolean fill = FALSE;
- guint padding = 0;
GtkPackType pack_type = 0;
GList *list;
@@ -1312,7 +1283,6 @@ gtk_box_get_child_property (GtkContainer *container,
child,
&expand,
&fill,
- &padding,
&pack_type);
switch (property_id)
{
@@ -1323,9 +1293,6 @@ gtk_box_get_child_property (GtkContainer *container,
case CHILD_PROP_FILL:
g_value_set_boolean (value, fill);
break;
- case CHILD_PROP_PADDING:
- g_value_set_uint (value, padding);
- break;
case CHILD_PROP_PACK_TYPE:
g_value_set_enum (value, pack_type);
break;
@@ -1517,7 +1484,6 @@ gtk_box_pack (GtkBox *box,
GtkWidget *child,
gboolean expand,
gboolean fill,
- guint padding,
GtkPackType pack_type)
{
GtkContainer *container = GTK_CONTAINER (box);
@@ -1530,7 +1496,6 @@ gtk_box_pack (GtkBox *box,
child_info = g_new (GtkBoxChild, 1);
child_info->widget = child;
- child_info->padding = padding;
child_info->expand = expand ? TRUE : FALSE;
child_info->fill = fill ? TRUE : FALSE;
child_info->pack = pack_type;
@@ -1546,8 +1511,6 @@ gtk_box_pack (GtkBox *box,
gtk_container_child_notify_by_pspec (container, child, child_props[CHILD_PROP_EXPAND]);
if (!fill)
gtk_container_child_notify_by_pspec (container, child, child_props[CHILD_PROP_FILL]);
- if (padding != 0)
- gtk_container_child_notify_by_pspec (container, child, child_props[CHILD_PROP_PADDING]);
if (pack_type != GTK_PACK_START)
gtk_container_child_notify_by_pspec (container, child, child_props[CHILD_PROP_PACK_TYPE]);
gtk_container_child_notify_by_pspec (container, child, child_props[CHILD_PROP_POSITION]);
@@ -1612,24 +1575,24 @@ gtk_box_get_size (GtkWidget *widget,
{
if (child == private->center)
{
- center_min = child_minimum + child->padding * 2;
- center_nat = child_natural + child->padding * 2;
+ center_min = child_minimum;
+ center_nat = child_natural;
}
else
{
gint largest;
- largest = child_minimum + child->padding * 2;
+ largest = child_minimum;
minimum = MAX (minimum, largest);
- largest = child_natural + child->padding * 2;
+ largest = child_natural;
natural = MAX (natural, largest);
}
}
else
{
- minimum += child_minimum + child->padding * 2;
- natural += child_natural + child->padding * 2;
+ minimum += child_minimum;
+ natural += child_natural;
}
}
else
@@ -1796,7 +1759,6 @@ gtk_box_compute_size_for_opposing_orientation (GtkBox *box,
sizes[i].minimum_size);
size -= sizes[i].minimum_size;
- size -= child->padding * 2;
sizes[i].data = child;
@@ -1868,7 +1830,7 @@ gtk_box_compute_size_for_opposing_orientation (GtkBox *box,
}
else
{
- child_size = sizes[i].minimum_size + child->padding * 2;
+ child_size = sizes[i].minimum_size;
if (child->expand || gtk_widget_compute_expand (child->widget, private->orientation))
{
@@ -1884,7 +1846,7 @@ gtk_box_compute_size_for_opposing_orientation (GtkBox *box,
if (child->fill)
{
- child_size = MAX (1, child_size - child->padding * 2);
+ child_size = MAX (1, child_size);
}
else
{
@@ -1980,9 +1942,6 @@ gtk_box_compute_size_for_orientation (GtkBox *box,
avail_size, &child_size, &child_natural);
- child_size += child->padding * 2;
- child_natural += child->padding * 2;
-
if (child_size > largest_child)
largest_child = child_size;
@@ -2153,11 +2112,6 @@ gtk_box_new (GtkOrientation orientation,
* parameter has no effect if @expand is set to %FALSE. A child is
* always allocated the full height of a horizontal #GtkBox and the full width
* of a vertical #GtkBox. This option affects the other dimension
- * @padding: extra space in pixels to put between this child and its
- * neighbors, over and above the global amount specified by
- * #GtkBox:spacing property. If @child is a widget at one of the
- * reference ends of @box, then @padding pixels are also put between
- * @child and the reference edge of @box
*
* Adds @child to @box, packed with reference to the start of @box.
* The @child is packed after any other child packed with reference
@@ -2167,10 +2121,9 @@ void
gtk_box_pack_start (GtkBox *box,
GtkWidget *child,
gboolean expand,
- gboolean fill,
- guint padding)
+ gboolean fill)
{
- gtk_box_pack (box, child, expand, fill, padding, GTK_PACK_START);
+ gtk_box_pack (box, child, expand, fill, GTK_PACK_START);
}
/**
@@ -2185,11 +2138,6 @@ gtk_box_pack_start (GtkBox *box,
* parameter has no effect if @expand is set to %FALSE. A child is
* always allocated the full height of a horizontal #GtkBox and the full width
* of a vertical #GtkBox. This option affects the other dimension
- * @padding: extra space in pixels to put between this child and its
- * neighbors, over and above the global amount specified by
- * #GtkBox:spacing property. If @child is a widget at one of the
- * reference ends of @box, then @padding pixels are also put between
- * @child and the reference edge of @box
*
* Adds @child to @box, packed with reference to the end of @box.
* The @child is packed after (away from end of) any other child
@@ -2199,10 +2147,9 @@ void
gtk_box_pack_end (GtkBox *box,
GtkWidget *child,
gboolean expand,
- gboolean fill,
- guint padding)
+ gboolean fill)
{
- gtk_box_pack (box, child, expand, fill, padding, GTK_PACK_END);
+ gtk_box_pack (box, child, expand, fill, GTK_PACK_END);
}
/**
@@ -2452,8 +2399,6 @@ gtk_box_reorder_child (GtkBox *box,
* property
* @fill: (out): pointer to return location for fill child
* property
- * @padding: (out): pointer to return location for padding
- * child property
* @pack_type: (out): pointer to return location for pack-type
* child property
*
@@ -2464,7 +2409,6 @@ gtk_box_query_child_packing (GtkBox *box,
GtkWidget *child,
gboolean *expand,
gboolean *fill,
- guint *padding,
GtkPackType *pack_type)
{
GtkBoxPrivate *private;
@@ -2492,8 +2436,6 @@ gtk_box_query_child_packing (GtkBox *box,
*expand = child_info->expand;
if (fill)
*fill = child_info->fill;
- if (padding)
- *padding = child_info->padding;
if (pack_type)
*pack_type = child_info->pack;
}
@@ -2505,7 +2447,6 @@ gtk_box_query_child_packing (GtkBox *box,
* @child: the #GtkWidget of the child to set
* @expand: the new value of the expand child property
* @fill: the new value of the fill child property
- * @padding: the new value of the padding child property
* @pack_type: the new value of the pack-type child property
*
* Sets the way @child is packed into @box.
@@ -2515,7 +2456,6 @@ gtk_box_set_child_packing (GtkBox *box,
GtkWidget *child,
gboolean expand,
gboolean fill,
- guint padding,
GtkPackType pack_type)
{
GtkBoxPrivate *private;
@@ -2556,12 +2496,6 @@ gtk_box_set_child_packing (GtkBox *box,
gtk_container_child_notify_by_pspec (GTK_CONTAINER (box), child, child_props[CHILD_PROP_FILL]);
}
- if (child_info->padding != padding)
- {
- child_info->padding = padding;
- gtk_container_child_notify_by_pspec (GTK_CONTAINER (box), child, child_props[CHILD_PROP_PADDING]);
- }
-
if (pack_type != GTK_PACK_END)
pack_type = GTK_PACK_START;
if (child_info->pack != pack_type)
@@ -2598,8 +2532,7 @@ gtk_box_add (GtkContainer *container,
gtk_box_pack_start (GTK_BOX (container), widget,
priv->default_expand,
- TRUE,
- 0);
+ TRUE);
}
static void
@@ -2739,7 +2672,7 @@ gtk_box_set_center_widget (GtkBox *box,
}
if (widget)
- priv->center = gtk_box_pack (box, widget, FALSE, TRUE, 0, GTK_PACK_START);
+ priv->center = gtk_box_pack (box, widget, FALSE, TRUE, GTK_PACK_START);
if (old_center)
g_object_unref (old_center);
diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index 9f99afb..b89812a 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -84,14 +84,12 @@ GDK_AVAILABLE_IN_ALL
void gtk_box_pack_start (GtkBox *box,
GtkWidget *child,
gboolean expand,
- gboolean fill,
- guint padding);
+ gboolean fill);
GDK_AVAILABLE_IN_ALL
void gtk_box_pack_end (GtkBox *box,
GtkWidget *child,
gboolean expand,
- gboolean fill,
- guint padding);
+ gboolean fill);
GDK_AVAILABLE_IN_ALL
void gtk_box_set_homogeneous (GtkBox *box,
@@ -119,14 +117,12 @@ void gtk_box_query_child_packing (GtkBox *box,
GtkWidget *child,
gboolean *expand,
gboolean *fill,
- guint *padding,
GtkPackType *pack_type);
GDK_AVAILABLE_IN_ALL
void gtk_box_set_child_packing (GtkBox *box,
GtkWidget *child,
gboolean expand,
gboolean fill,
- guint padding,
GtkPackType pack_type);
GDK_AVAILABLE_IN_3_12
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 9b645c3..093b3cc 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -1344,9 +1344,9 @@ gtk_button_construct_child (GtkButton *button)
if (priv->image_position == GTK_POS_LEFT ||
priv->image_position == GTK_POS_TOP)
- gtk_box_pack_start (GTK_BOX (box), priv->image, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), priv->image, FALSE, FALSE);
else
- gtk_box_pack_end (GTK_BOX (box), priv->image, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (box), priv->image, FALSE, FALSE);
if (label_text)
{
@@ -1363,9 +1363,9 @@ gtk_button_construct_child (GtkButton *button)
if (priv->image_position == GTK_POS_RIGHT ||
priv->image_position == GTK_POS_BOTTOM)
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE);
else
- gtk_box_pack_end (GTK_BOX (box), label, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (box), label, FALSE, FALSE);
}
else
{
diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c
index 523219d..00de9dc 100644
--- a/gtk/gtkcolorchooserwidget.c
+++ b/gtk/gtkcolorchooserwidget.c
@@ -537,12 +537,12 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc)
cc->priv->custom = box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
g_object_set (box, "margin-top", 12, NULL);
- gtk_box_pack_end (GTK_BOX (cc->priv->palette), box, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (cc->priv->palette), box, FALSE, TRUE);
/* translators: label for the custom section in the color chooser */
cc->priv->custom_label = label = gtk_label_new (_("Custom"));
gtk_widget_set_halign (label, GTK_ALIGN_START);
- gtk_box_pack_end (GTK_BOX (cc->priv->palette), label, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (cc->priv->palette), label, FALSE, TRUE);
cc->priv->button = button = gtk_color_swatch_new ();
gtk_widget_set_name (button, "add-color-button");
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 2e0976e..73c037b 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -1687,8 +1687,8 @@ gtk_combo_box_add (GtkContainer *container,
gtk_widget_queue_resize (GTK_WIDGET (container));
priv->cell_view = NULL;
}
-
- gtk_box_pack_start (GTK_BOX (priv->box), widget, TRUE, TRUE, 0);
+
+ gtk_box_pack_start (GTK_BOX (priv->box), widget, TRUE, TRUE);
_gtk_bin_set_child (GTK_BIN (container), widget);
if (priv->has_entry)
diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c
index 993f0e0..ff6fa9f 100644
--- a/gtk/gtkcustompaperunixdialog.c
+++ b/gtk/gtkcustompaperunixdialog.c
@@ -555,7 +555,7 @@ new_unit_widget (GtkCustomPaperUnixDialog *dialog,
else
gtk_spin_button_set_digits (GTK_SPIN_BUTTON (button), 1);
- gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
gtk_widget_show (button);
data->spin_button = button;
@@ -569,7 +569,7 @@ new_unit_widget (GtkCustomPaperUnixDialog *dialog,
label = gtk_label_new (_("mm"));
gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
gtk_widget_show (label);
gtk_label_set_mnemonic_widget (GTK_LABEL (mnemonic_label), button);
@@ -979,13 +979,13 @@ wrap_in_frame (const gchar *label,
g_free (bold_text);
frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
- gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE, FALSE);
gtk_widget_set_margin_start (child, 12);
gtk_widget_set_halign (child, GTK_ALIGN_FILL);
gtk_widget_set_valign (child, GTK_ALIGN_FILL);
- gtk_box_pack_start (GTK_BOX (frame), child, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (frame), child, FALSE, FALSE);
gtk_widget_show (frame);
@@ -1043,11 +1043,11 @@ G_GNUC_END_IGNORE_DEPRECATIONS
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 18);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
- gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE);
gtk_widget_show (hbox);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE);
gtk_widget_show (vbox);
scrolled = gtk_scrolled_window_new (NULL, NULL);
@@ -1055,7 +1055,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled),
GTK_SHADOW_IN);
- gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE);
gtk_widget_show (scrolled);
context = gtk_widget_get_style_context (scrolled);
@@ -1090,7 +1090,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
gtk_style_context_set_junction_sides (context, GTK_JUNCTION_TOP);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_INLINE_TOOLBAR);
- gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, FALSE);
gtk_widget_show (toolbar);
icon = g_themed_icon_new_with_default_fallbacks ("list-add-symbolic");
@@ -1109,7 +1109,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18);
priv->values_box = vbox;
- gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE);
gtk_widget_show (vbox);
grid = gtk_grid_new ();
@@ -1141,7 +1141,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
frame = wrap_in_frame (_("Paper Size"), grid);
gtk_widget_show (grid);
- gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
gtk_widget_show (frame);
grid = gtk_grid_new ();
@@ -1214,7 +1214,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
NULL, NULL);
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
- gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE);
gtk_widget_show (combo);
g_signal_connect_swapped (combo, "changed",
@@ -1222,7 +1222,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
frame = wrap_in_frame (_("Paper Margins"), grid);
gtk_widget_show (grid);
- gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
gtk_widget_show (frame);
update_custom_widgets_from_list (dialog);
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index d7ab7a2..1024697 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -631,7 +631,7 @@ gtk_entry_completion_constructed (GObject *object)
gtk_container_add (GTK_CONTAINER (priv->scrolled_window), priv->tree_view);
gtk_box_pack_start (GTK_BOX (priv->vbox), priv->scrolled_window,
- TRUE, TRUE, 0);
+ TRUE, TRUE);
/* we don't want to see the action treeview when no actions have
* been inserted, so we pack the action treeview after the first
@@ -1324,7 +1324,7 @@ gtk_entry_completion_insert_action (GtkEntryCompletion *completion,
gtk_tree_path_free (path);
gtk_box_pack_start (GTK_BOX (completion->priv->vbox),
- completion->priv->action_view, FALSE, FALSE, 0);
+ completion->priv->action_view, FALSE, FALSE);
gtk_widget_show (completion->priv->action_view);
}
}
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index be9d856..6e8d8f6 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -923,7 +923,7 @@ update_preview_widget_visibility (GtkFileChooserWidget *impl)
if (!priv->preview_label)
{
priv->preview_label = gtk_label_new (priv->preview_display_name);
- gtk_box_pack_start (GTK_BOX (priv->preview_box), priv->preview_label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (priv->preview_box), priv->preview_label, FALSE, FALSE);
gtk_box_reorder_child (GTK_BOX (priv->preview_box), priv->preview_label, 0);
gtk_label_set_ellipsize (GTK_LABEL (priv->preview_label), PANGO_ELLIPSIZE_MIDDLE);
gtk_widget_show (priv->preview_label);
@@ -964,7 +964,7 @@ set_preview_widget (GtkFileChooserWidget *impl,
if (priv->preview_widget)
{
gtk_widget_show (priv->preview_widget);
- gtk_box_pack_start (GTK_BOX (priv->preview_box), priv->preview_widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (priv->preview_box), priv->preview_widget, TRUE, TRUE);
gtk_box_reorder_child (GTK_BOX (priv->preview_box),
priv->preview_widget,
(priv->use_preview_label && priv->preview_label) ? 1 : 0);
@@ -2689,7 +2689,7 @@ save_widgets_create (GtkFileChooserWidget *impl)
priv->save_widgets_table = gtk_grid_new ();
gtk_container_set_border_width (GTK_CONTAINER (priv->save_widgets_table), 10);
- gtk_box_pack_start (GTK_BOX (vbox), priv->save_widgets_table, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), priv->save_widgets_table, FALSE, FALSE);
gtk_widget_show (priv->save_widgets_table);
gtk_grid_set_row_spacing (GTK_GRID (priv->save_widgets_table), 12);
gtk_grid_set_column_spacing (GTK_GRID (priv->save_widgets_table), 12);
@@ -2711,7 +2711,7 @@ save_widgets_create (GtkFileChooserWidget *impl)
gtk_label_set_mnemonic_widget (GTK_LABEL (widget), priv->location_entry);
priv->save_widgets = vbox;
- gtk_box_pack_start (GTK_BOX (impl), priv->save_widgets, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (impl), priv->save_widgets, FALSE, FALSE);
gtk_box_reorder_child (GTK_BOX (impl), priv->save_widgets, 0);
gtk_widget_show (priv->save_widgets);
}
@@ -2777,7 +2777,7 @@ location_switch_to_filename_entry (GtkFileChooserWidget *impl)
if (!priv->location_entry)
{
location_entry_create (impl);
- gtk_box_pack_start (GTK_BOX (priv->location_entry_box), priv->location_entry, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (priv->location_entry_box), priv->location_entry, TRUE, TRUE);
}
_gtk_file_chooser_entry_set_base_folder (GTK_FILE_CHOOSER_ENTRY (priv->location_entry),
priv->current_folder);
diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
index 5154675..4e41f3d 100644
--- a/gtk/gtkheaderbar.c
+++ b/gtk/gtkheaderbar.c
@@ -140,7 +140,7 @@ init_sizing_box (GtkHeaderBar *bar)
gtk_widget_show (w);
context = gtk_widget_get_style_context (w);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_TITLE);
- gtk_box_pack_start (GTK_BOX (priv->label_sizing_box), w, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (priv->label_sizing_box), w, FALSE, FALSE);
gtk_label_set_line_wrap (GTK_LABEL (w), FALSE);
gtk_label_set_single_line_mode (GTK_LABEL (w), TRUE);
gtk_label_set_ellipsize (GTK_LABEL (w), PANGO_ELLIPSIZE_END);
@@ -149,7 +149,7 @@ init_sizing_box (GtkHeaderBar *bar)
w = gtk_label_new (NULL);
context = gtk_widget_get_style_context (w);
gtk_style_context_add_class (context, GTK_STYLE_CLASS_SUBTITLE);
- gtk_box_pack_start (GTK_BOX (priv->label_sizing_box), w, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (priv->label_sizing_box), w, FALSE, FALSE);
gtk_label_set_line_wrap (GTK_LABEL (w), FALSE);
gtk_label_set_single_line_mode (GTK_LABEL (w), TRUE);
gtk_label_set_ellipsize (GTK_LABEL (w), PANGO_ELLIPSIZE_END);
@@ -178,7 +178,7 @@ create_title_box (const char *title,
gtk_label_set_line_wrap (GTK_LABEL (title_label), FALSE);
gtk_label_set_single_line_mode (GTK_LABEL (title_label), TRUE);
gtk_label_set_ellipsize (GTK_LABEL (title_label), PANGO_ELLIPSIZE_END);
- gtk_box_pack_start (GTK_BOX (label_box), title_label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (label_box), title_label, FALSE, FALSE);
gtk_widget_show (title_label);
gtk_label_set_width_chars (GTK_LABEL (title_label), MIN_TITLE_CHARS);
@@ -188,7 +188,7 @@ create_title_box (const char *title,
gtk_label_set_line_wrap (GTK_LABEL (subtitle_label), FALSE);
gtk_label_set_single_line_mode (GTK_LABEL (subtitle_label), TRUE);
gtk_label_set_ellipsize (GTK_LABEL (subtitle_label), PANGO_ELLIPSIZE_END);
- gtk_box_pack_start (GTK_BOX (label_box), subtitle_label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (label_box), subtitle_label, FALSE, FALSE);
gtk_widget_set_no_show_all (subtitle_label, TRUE);
gtk_widget_set_visible (subtitle_label, subtitle && subtitle[0]);
@@ -451,7 +451,7 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
if (button)
{
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
n_children ++;
}
}
@@ -463,7 +463,7 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
continue;
}
- gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE);
if (i == 1)
gtk_box_reorder_child (GTK_BOX (box), separator, 0);
diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index cc5a5b7..c925538 100644
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -613,7 +613,7 @@ gtk_info_bar_add_action_widget (GtkInfoBar *info_bar,
g_warning ("Only 'activatable' widgets can be packed into the action area of a GtkInfoBar");
gtk_box_pack_end (GTK_BOX (info_bar->priv->action_area),
- child, FALSE, FALSE, 0);
+ child, FALSE, FALSE);
if (response_id == GTK_RESPONSE_HELP)
gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (info_bar->priv->action_area),
child, TRUE);
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 8636bab..7bb3709 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2985,7 +2985,7 @@ gtk_menu_set_tearoff_state (GtkMenu *menu,
gtk_box_pack_end (GTK_BOX (priv->tearoff_hbox),
priv->tearoff_scrollbar,
- FALSE, FALSE, 0);
+ FALSE, FALSE);
if (gtk_adjustment_get_upper (priv->tearoff_adjustment) > height)
gtk_widget_show (priv->tearoff_scrollbar);
diff --git a/gtk/gtkmenusectionbox.c b/gtk/gtkmenusectionbox.c
index 61c761b..169b539 100644
--- a/gtk/gtkmenusectionbox.c
+++ b/gtk/gtkmenusectionbox.c
@@ -134,7 +134,7 @@ gtk_menu_section_box_sync_separators (GtkMenuSectionBox *box,
return;
if (should_have_separator)
- gtk_box_pack_start (GTK_BOX (box), box->separator, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), box->separator, FALSE, FALSE);
else
gtk_container_remove (GTK_CONTAINER (box), box->separator);
}
@@ -329,7 +329,7 @@ gtk_menu_section_box_insert_func (GtkMenuTrackerItem *item,
gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
if (box->iconic)
- gtk_box_pack_start (GTK_BOX (box->item_box), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box->item_box), widget, TRUE, TRUE);
else
gtk_container_add (GTK_CONTAINER (box->item_box), widget);
gtk_box_reorder_child (GTK_BOX (box->item_box), widget, position);
@@ -348,7 +348,7 @@ gtk_menu_section_box_init (GtkMenuSectionBox *box)
item_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
box->item_box = GTK_BOX (item_box);
- gtk_box_pack_end (GTK_BOX (box), item_box, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (box), item_box, FALSE, FALSE);
gtk_widget_set_halign (GTK_WIDGET (item_box), GTK_ALIGN_FILL);
gtk_widget_show (item_box);
@@ -460,7 +460,7 @@ gtk_menu_section_box_new_submenu (GtkMenuTrackerItem *item,
g_object_set_data (G_OBJECT (button), "focus", focus);
g_object_set_data (G_OBJECT (focus), "focus", button);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
gtk_widget_show (button);
g_signal_connect (focus, "clicked", G_CALLBACK (open_submenu), item);
@@ -508,17 +508,17 @@ gtk_menu_section_box_new_section (GtkMenuTrackerItem *item,
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_widget_set_valign (separator, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (box->separator), separator, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box->separator), separator, TRUE, TRUE);
title = gtk_label_new (label);
g_object_bind_property (item, "label", title, "label", G_BINDING_SYNC_CREATE);
gtk_style_context_add_class (gtk_widget_get_style_context (title), GTK_STYLE_CLASS_SEPARATOR);
gtk_widget_set_halign (title, GTK_ALIGN_START);
- gtk_box_pack_start (GTK_BOX (box->separator), title, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box->separator), title, FALSE, FALSE);
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
gtk_widget_set_valign (separator, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (box->separator), separator, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box->separator), separator, TRUE, TRUE);
gtk_widget_show_all (box->separator);
}
diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index cf2e51f..b9f40b8 100644
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -141,7 +141,7 @@ gtk_menu_tool_button_construct_contents (GtkMenuToolButton *button)
gtk_container_remove (GTK_CONTAINER (parent),
priv->arrow_button);
gtk_box_pack_end (GTK_BOX (box), priv->arrow_button,
- FALSE, FALSE, 0);
+ FALSE, FALSE);
g_object_unref (priv->arrow_button);
}
@@ -290,7 +290,7 @@ gtk_menu_tool_button_init (GtkMenuToolButton *button)
arrow_button = gtk_menu_button_new ();
gtk_box_pack_end (GTK_BOX (box), arrow_button,
- FALSE, FALSE, 0);
+ FALSE, FALSE);
/* the arrow button is insentive until we set a menu */
gtk_widget_set_sensitive (arrow_button, FALSE);
diff --git a/gtk/gtkmodelmenuitem.c b/gtk/gtkmodelmenuitem.c
index 103f053..c1f4aca 100644
--- a/gtk/gtkmodelmenuitem.c
+++ b/gtk/gtkmodelmenuitem.c
@@ -180,7 +180,7 @@ gtk_model_menu_item_set_icon (GtkModelMenuItem *item,
/* Reparent the child without destroying it */
g_object_ref (child);
gtk_container_remove (GTK_CONTAINER (item), child);
- gtk_box_pack_end (GTK_BOX (box), child, TRUE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (box), child, TRUE, TRUE);
g_object_unref (child);
gtk_container_add (GTK_CONTAINER (item), box);
@@ -201,7 +201,7 @@ gtk_model_menu_item_set_icon (GtkModelMenuItem *item,
image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
- gtk_box_pack_start (GTK_BOX (child), image, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (child), image, FALSE, FALSE);
gtk_widget_show (image);
}
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 95d856c..8c2893f 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -557,17 +557,17 @@ G_GNUC_END_IGNORE_DEPRECATIONS
/* Build contents */
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
- gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE);
icon = gtk_image_new_from_icon_name ("dialog-password",
GTK_ICON_SIZE_DIALOG);
gtk_widget_set_halign (icon, GTK_ALIGN_CENTER);
gtk_widget_set_valign (icon, GTK_ALIGN_START);
- gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE);
main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18);
- gtk_box_pack_start (GTK_BOX (hbox), main_vbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), main_vbox, TRUE, TRUE);
secondary = strstr (message, "\n");
if (secondary != NULL)
@@ -584,7 +584,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (label),
- FALSE, TRUE, 0);
+ FALSE, TRUE);
g_free (primary);
attrs = pango_attr_list_new ();
pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD));
@@ -598,7 +598,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (label),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
}
grid = gtk_grid_new ();
@@ -606,7 +606,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
gtk_grid_set_row_spacing (GTK_GRID (grid), 12);
gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
gtk_widget_set_margin_bottom (grid, 12);
- gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE);
can_anonymous = priv->ask_flags & G_ASK_PASSWORD_ANONYMOUS_SUPPORTED;
@@ -631,7 +631,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
choice = gtk_radio_button_new_with_mnemonic (NULL, _("_Anonymous"));
gtk_box_pack_start (GTK_BOX (anon_box),
choice,
- FALSE, FALSE, 0);
+ FALSE, FALSE);
g_signal_connect (choice, "toggled",
G_CALLBACK (pw_dialog_anonymous_toggled), operation);
priv->anonymous_toggle = choice;
@@ -640,7 +640,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
choice = gtk_radio_button_new_with_mnemonic (group, _("Registered U_ser"));
gtk_box_pack_start (GTK_BOX (anon_box),
choice,
- FALSE, FALSE, 0);
+ FALSE, FALSE);
g_signal_connect (choice, "toggled",
G_CALLBACK (pw_dialog_anonymous_toggled), operation);
}
@@ -688,7 +688,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
GINT_TO_POINTER (G_PASSWORD_SAVE_NEVER));
g_signal_connect (choice, "toggled",
G_CALLBACK (remember_button_toggled), operation);
- gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE, FALSE);
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (choice));
choice = gtk_radio_button_new_with_mnemonic (group, _("Remember password until you _logout"));
@@ -698,7 +698,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
GINT_TO_POINTER (G_PASSWORD_SAVE_FOR_SESSION));
g_signal_connect (choice, "toggled",
G_CALLBACK (remember_button_toggled), operation);
- gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE, FALSE);
group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (choice));
choice = gtk_radio_button_new_with_mnemonic (group, _("Remember _forever"));
@@ -708,7 +708,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
GINT_TO_POINTER (G_PASSWORD_SAVE_PERMANENTLY));
g_signal_connect (choice, "toggled",
G_CALLBACK (remember_button_toggled), operation);
- gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE, FALSE);
}
g_signal_connect (G_OBJECT (dialog), "response",
@@ -1414,7 +1414,7 @@ create_show_processes_dialog (GtkMountOperation *op,
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
- gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE);
if (secondary != NULL)
s = g_strdup_printf ("<big><b>%s</b></big>\n\n%s", primary, secondary);
@@ -1425,7 +1425,7 @@ create_show_processes_dialog (GtkMountOperation *op,
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label), s);
g_free (s);
- gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE);
/* First count the items in the list then
* add the buttons in reverse order */
@@ -1477,7 +1477,7 @@ create_show_processes_dialog (GtkMountOperation *op,
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
- gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE);
g_signal_connect (tree_view, "popup-menu",
G_CALLBACK (on_popup_menu_for_process_tree_view),
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index c626a3e..b35c5b3 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -1501,8 +1501,8 @@ make_directory_button (GtkPathBar *path_bar,
button_data->image = gtk_image_new ();
button_data->label = gtk_label_new (NULL);
child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (child), button_data->image, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (child), button_data->label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (child), button_data->image, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (child), button_data->label, FALSE, FALSE);
break;
case NORMAL_BUTTON:
default:
diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c
index cccdbca..79581ac 100644
--- a/gtk/gtkprintbackend.c
+++ b/gtk/gtkprintbackend.c
@@ -772,7 +772,7 @@ request_password (GtkPrintBackend *backend,
icon = gtk_image_new_from_icon_name ("dialog-password-symbolic", GTK_ICON_SIZE_DIALOG);
gtk_widget_set_halign (icon, GTK_ALIGN_CENTER);
gtk_widget_set_valign (icon, GTK_ALIGN_START);
- g_object_set (icon, "margin", 6, NULL);
+ g_object_set (icon, "margin", 12, NULL);
/* Right */
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
@@ -789,13 +789,13 @@ request_password (GtkPrintBackend *backend,
/* Packing */
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
- gtk_box_pack_start (GTK_BOX (content_area), main_box, TRUE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), main_box, TRUE, FALSE);
- gtk_box_pack_start (GTK_BOX (main_box), icon, FALSE, FALSE, 6);
- gtk_box_pack_start (GTK_BOX (main_box), vbox, FALSE, FALSE, 6);
+ gtk_box_pack_start (GTK_BOX (main_box), icon, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (main_box), vbox, FALSE, FALSE);
+
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE);
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 6);
-
/* Right - 2. */
for (i = 0; i < length; i++)
{
@@ -804,6 +804,8 @@ request_password (GtkPrintBackend *backend,
{
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_set_homogeneous (GTK_BOX (box), TRUE);
+ gtk_widget_set_margin_top (box, 6);
+ gtk_widget_set_margin_bottom (box, 6);
label = gtk_label_new (ai_display[i]);
gtk_widget_set_halign (label, GTK_ALIGN_START);
@@ -818,10 +820,10 @@ request_password (GtkPrintBackend *backend,
gtk_entry_set_visibility (GTK_ENTRY (entry), ai_visible[i]);
gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
- gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 6);
+ gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE);
- gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE);
g_signal_connect (entry, "changed",
G_CALLBACK (store_entry), &(priv->auth_info[i]));
@@ -831,8 +833,10 @@ request_password (GtkPrintBackend *backend,
if (can_store_auth_info)
{
chkbtn = gtk_check_button_new_with_mnemonic (_("_Remember password"));
+ gtk_widget_set_margin_top (chkbtn, 6);
+ gtk_widget_set_margin_bottom (chkbtn, 6);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chkbtn), FALSE);
- gtk_box_pack_start (GTK_BOX (vbox), chkbtn, FALSE, FALSE, 6);
+ gtk_box_pack_start (GTK_BOX (vbox), chkbtn, FALSE, FALSE);
g_signal_connect (chkbtn, "toggled",
G_CALLBACK (store_auth_info_toggled),
&(priv->store_auth_info));
diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c
index 47579a6..e270dfa 100644
--- a/gtk/gtkprinteroptionwidget.c
+++ b/gtk/gtkprinteroptionwidget.c
@@ -737,10 +737,10 @@ alternative_append (GtkWidget *box,
button = gtk_radio_button_new_with_label (group, label);
gtk_widget_show (button);
gtk_widget_set_valign (button, GTK_ALIGN_BASELINE);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
g_object_set_data (G_OBJECT (button), "value", (gpointer)value);
- g_signal_connect (button, "toggled",
+ g_signal_connect (button, "toggled",
G_CALLBACK (radio_changed_cb), widget);
return gtk_radio_button_get_group (GTK_RADIO_BUTTON (button));
@@ -768,7 +768,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
gtk_combo_box_set_active (GTK_COMBO_BOX (priv->combo), 0);
gtk_widget_set_sensitive (GTK_WIDGET (widget), FALSE);
gtk_widget_show (priv->combo);
- gtk_box_pack_start (GTK_BOX (widget), priv->combo, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (widget), priv->combo, TRUE, TRUE);
}
else switch (source->type)
{
@@ -776,7 +776,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
priv->check = gtk_check_button_new_with_mnemonic (source->display_text);
g_signal_connect (priv->check, "toggled", G_CALLBACK (check_toggled_cb), widget);
gtk_widget_show (priv->check);
- gtk_box_pack_start (GTK_BOX (widget), priv->check, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (widget), priv->check, TRUE, TRUE);
break;
case GTK_PRINTER_OPTION_TYPE_PICKONE:
case GTK_PRINTER_OPTION_TYPE_PICKONE_PASSWORD:
@@ -808,7 +808,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
source->choices_display[i],
source->choices[i]);
gtk_widget_show (priv->combo);
- gtk_box_pack_start (GTK_BOX (widget), priv->combo, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (widget), priv->combo, TRUE, TRUE);
g_signal_connect (priv->combo, "changed", G_CALLBACK (combo_changed_cb), widget);
text = g_strdup_printf ("%s:", source->display_text);
@@ -822,7 +822,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_widget_set_valign (priv->box, GTK_ALIGN_BASELINE);
gtk_widget_show (priv->box);
- gtk_box_pack_start (GTK_BOX (widget), priv->box, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (widget), priv->box, TRUE, TRUE);
for (i = 0; i < source->num_choices; i++)
{
group = alternative_append (priv->box,
@@ -850,7 +850,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
gtk_entry_set_activates_default (GTK_ENTRY (priv->entry),
gtk_printer_option_get_activates_default (source));
gtk_widget_show (priv->entry);
- gtk_box_pack_start (GTK_BOX (widget), priv->entry, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (widget), priv->entry, TRUE, TRUE);
g_signal_connect (priv->entry, "changed", G_CALLBACK (entry_changed_cb), widget);
text = g_strdup_printf ("%s:", source->display_text);
@@ -863,7 +863,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
case GTK_PRINTER_OPTION_TYPE_FILESAVE:
priv->button = gtk_button_new ();
gtk_widget_show (priv->button);
- gtk_box_pack_start (GTK_BOX (widget), priv->button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (widget), priv->button, TRUE, TRUE);
g_signal_connect (priv->button, "clicked", G_CALLBACK (filesave_choose_cb), widget);
text = g_strdup_printf ("%s:", source->display_text);
@@ -877,7 +877,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
priv->info_label = gtk_label_new (NULL);
gtk_label_set_selectable (GTK_LABEL (priv->info_label), TRUE);
gtk_widget_show (priv->info_label);
- gtk_box_pack_start (GTK_BOX (widget), priv->info_label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (widget), priv->info_label, FALSE, TRUE);
text = g_strdup_printf ("%s:", source->display_text);
priv->label = gtk_label_new_with_mnemonic (text);
@@ -891,7 +891,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
}
priv->image = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_MENU);
- gtk_box_pack_start (GTK_BOX (widget), priv->image, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (widget), priv->image, FALSE, FALSE);
}
/*
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index 82d434a..cbb50ec 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -1303,13 +1303,13 @@ wrap_in_frame (const gchar *label,
g_free (bold_text);
frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
- gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE, FALSE);
gtk_widget_set_margin_start (child, 12);
gtk_widget_set_halign (child, GTK_ALIGN_FILL);
gtk_widget_set_valign (child, GTK_ALIGN_FILL);
- gtk_box_pack_start (GTK_BOX (frame), child, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (frame), child, FALSE, FALSE);
gtk_widget_show (frame);
@@ -1354,14 +1354,14 @@ add_option_to_extension_point (GtkPrinterOption *option,
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_widget_set_valign (hbox, GTK_ALIGN_BASELINE);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE);
gtk_widget_show (hbox);
- gtk_box_pack_start (GTK_BOX (extension_point), hbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (extension_point), hbox, TRUE, TRUE);
}
else
- gtk_box_pack_start (GTK_BOX (extension_point), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (extension_point), widget, TRUE, TRUE);
}
static gint
@@ -1640,7 +1640,7 @@ update_dialog_from_settings (GtkPrintUnixDialog *dialog)
gtk_widget_show (frame);
gtk_box_pack_start (GTK_BOX (priv->advanced_vbox),
- frame, FALSE, FALSE, 0);
+ frame, FALSE, FALSE);
}
}
diff --git a/gtk/gtkrecentchooserdialog.c b/gtk/gtkrecentchooserdialog.c
index ff58ff7..8486e72 100644
--- a/gtk/gtkrecentchooserdialog.c
+++ b/gtk/gtkrecentchooserdialog.c
@@ -215,9 +215,9 @@ gtk_recent_chooser_dialog_constructed (GObject *object)
gtk_container_set_border_width (GTK_CONTAINER (priv->chooser), 5);
gtk_box_pack_start (GTK_BOX (content_area),
- priv->chooser, TRUE, TRUE, 0);
+ priv->chooser, TRUE, TRUE);
gtk_widget_show (priv->chooser);
-
+
_gtk_recent_chooser_set_delegate (GTK_RECENT_CHOOSER (object),
GTK_RECENT_CHOOSER (priv->chooser));
}
diff --git a/gtk/gtkshortcutssection.c b/gtk/gtkshortcutssection.c
index f23b0c1..2ec177d 100644
--- a/gtk/gtkshortcutssection.c
+++ b/gtk/gtkshortcutssection.c
@@ -458,7 +458,7 @@ gtk_shortcuts_section_init (GtkShortcutsSection *self)
gtk_widget_set_hexpand (GTK_WIDGET (self->switcher), TRUE);
gtk_widget_set_halign (GTK_WIDGET (self->switcher), GTK_ALIGN_CENTER);
gtk_container_add (GTK_CONTAINER (self->footer), GTK_WIDGET (self->switcher));
- gtk_box_pack_end (GTK_BOX (self->footer), self->show_all, TRUE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (self->footer), self->show_all, TRUE, TRUE);
gtk_widget_set_halign (self->show_all, GTK_ALIGN_END);
self->pan_gesture = gtk_gesture_pan_new (GTK_WIDGET (self->stack), GTK_ORIENTATION_HORIZONTAL);
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index 50eb173..522c3d4 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -610,8 +610,8 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
else
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, icon_spacing);
if (icon)
- gtk_box_pack_start (GTK_BOX (box), icon, TRUE, TRUE, 0);
- gtk_box_pack_end (GTK_BOX (box), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), icon, TRUE, TRUE);
+ gtk_box_pack_end (GTK_BOX (box), label, FALSE, TRUE);
gtk_container_add (GTK_CONTAINER (button->priv->button), box);
gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "image-button");
gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "text-button");
@@ -622,17 +622,17 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
{
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, icon_spacing);
if (icon)
- gtk_box_pack_start (GTK_BOX (box), icon, label? FALSE : TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), icon, label? FALSE : TRUE, TRUE);
if (label)
- gtk_box_pack_end (GTK_BOX (box), label, TRUE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (box), label, TRUE, TRUE);
}
else
{
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, icon_spacing);
if (icon)
- gtk_box_pack_end (GTK_BOX (box), icon, label ? FALSE : TRUE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (box), icon, label ? FALSE : TRUE, TRUE);
if (label)
- gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE);
}
gtk_container_add (GTK_CONTAINER (button->priv->button), box);
gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "image-button");
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 055d938..2189dc1 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -852,13 +852,13 @@ G_GNUC_END_IGNORE_DEPRECATIONS
if (priv->xalign <= 0.5)
{
- gtk_box_pack_start (GTK_BOX (hbox), priv->alignment, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), priv->arrow, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->alignment, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->arrow, FALSE, FALSE);
}
else
{
- gtk_box_pack_start (GTK_BOX (hbox), priv->arrow, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), priv->alignment, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->arrow, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (hbox), priv->alignment, TRUE, TRUE);
}
gtk_container_add (GTK_CONTAINER (priv->alignment), child);
diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
index 31dd6aa..e92d6c3 100644
--- a/gtk/inspector/general.c
+++ b/gtk/inspector/general.c
@@ -138,13 +138,13 @@ add_check_row (GtkInspectorGeneral *gen,
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE);
check = gtk_image_new_from_icon_name ("object-select-symbolic", GTK_ICON_SIZE_MENU);
gtk_widget_set_halign (check, GTK_ALIGN_END);
gtk_widget_set_valign (check, GTK_ALIGN_BASELINE);
gtk_widget_set_opacity (check, value ? 1.0 : 0.0);
- gtk_box_pack_start (GTK_BOX (box), check, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), check, TRUE, TRUE);
row = gtk_list_box_row_new ();
gtk_container_add (GTK_CONTAINER (row), box);
@@ -177,14 +177,14 @@ add_label_row (GtkInspectorGeneral *gen,
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE);
label = gtk_label_new (value);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_widget_set_halign (label, GTK_ALIGN_END);
gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
gtk_label_set_xalign (GTK_LABEL (label), 1.0);
- gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE);
row = gtk_list_box_row_new ();
gtk_container_add (GTK_CONTAINER (row), box);
diff --git a/gtk/inspector/gtkstackcombo.c b/gtk/inspector/gtkstackcombo.c
index bb93565..170011e 100644
--- a/gtk/inspector/gtkstackcombo.c
+++ b/gtk/inspector/gtkstackcombo.c
@@ -51,7 +51,7 @@ gtk_stack_combo_init (GtkStackCombo *self)
self->stack = NULL;
self->combo = GTK_COMBO_BOX (gtk_combo_box_text_new ());
gtk_widget_show (GTK_WIDGET (self->combo));
- gtk_box_pack_start (GTK_BOX (self), GTK_WIDGET (self->combo), FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (self), GTK_WIDGET (self->combo), FALSE, FALSE);
}
static void gtk_stack_combo_set_stack (GtkStackCombo *self,
diff --git a/gtk/inspector/prop-editor.c b/gtk/inspector/prop-editor.c
index 03debe0..8c32ed6 100644
--- a/gtk/inspector/prop-editor.c
+++ b/gtk/inspector/prop-editor.c
@@ -984,7 +984,7 @@ property_editor (GObject *object,
first = b;
g_object_set_data (G_OBJECT (b), "index", GINT_TO_POINTER (j));
gtk_widget_show (b);
- gtk_box_pack_start (GTK_BOX (box), b, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), b, FALSE, FALSE);
connect_controller (G_OBJECT (b), "toggled",
object, spec, G_CALLBACK (enum_modified));
++j;
@@ -1026,7 +1026,7 @@ property_editor (GObject *object,
b = gtk_check_button_new_with_label (fclass->values[j].value_name);
g_object_set_data (G_OBJECT (b), "index", GINT_TO_POINTER (j));
gtk_widget_show (b);
- gtk_box_pack_start (GTK_BOX (box), b, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), b, FALSE, FALSE);
connect_controller (G_OBJECT (b), "toggled",
object, spec, G_CALLBACK (flags_modified));
}
@@ -1668,7 +1668,7 @@ add_gtk_settings_info (GtkInspectorPropEditor *editor)
gtk_widget_set_halign (button, GTK_ALIGN_END);
gtk_widget_show (button);
gtk_widget_set_sensitive (button, FALSE);
- gtk_box_pack_end (GTK_BOX (row), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (row), button, FALSE, FALSE);
switch (_gtk_settings_get_setting_source (GTK_SETTINGS (object), name))
{
diff --git a/gtk/inspector/size-groups.c b/gtk/inspector/size-groups.c
index eb185ed..2fa94e1 100644
--- a/gtk/inspector/size-groups.c
+++ b/gtk/inspector/size-groups.c
@@ -225,7 +225,7 @@ add_size_group (GtkInspectorSizeGroups *sl,
g_object_set (label, "margin", 10, NULL);
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
- gtk_box_pack_start (GTK_BOX (box2), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), label, TRUE, TRUE);
sw = gtk_switch_new ();
g_object_set (sw, "margin", 10, NULL);
@@ -234,7 +234,7 @@ add_size_group (GtkInspectorSizeGroups *sl,
g_object_bind_property (group, "ignore-hidden",
sw, "active",
G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
- gtk_box_pack_start (GTK_BOX (box2), sw, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), sw, FALSE, FALSE);
box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
gtk_container_add (GTK_CONTAINER (box), box2);
@@ -243,7 +243,7 @@ add_size_group (GtkInspectorSizeGroups *sl,
g_object_set (label, "margin", 10, NULL);
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
- gtk_box_pack_start (GTK_BOX (box2), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), label, TRUE, TRUE);
combo = gtk_combo_box_text_new ();
g_object_set (combo, "margin", 10, NULL);
@@ -256,7 +256,7 @@ add_size_group (GtkInspectorSizeGroups *sl,
g_object_bind_property (group, "mode",
combo, "active",
G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
- gtk_box_pack_start (GTK_BOX (box2), combo, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), combo, FALSE, FALSE);
listbox = gtk_list_box_new ();
gtk_container_add (GTK_CONTAINER (box), listbox);
diff --git a/gtk/inspector/strv-editor.c b/gtk/inspector/strv-editor.c
index f41b46b..3add2e3 100644
--- a/gtk/inspector/strv-editor.c
+++ b/gtk/inspector/strv-editor.c
@@ -68,17 +68,17 @@ add_string (GtkInspectorStrvEditor *editor,
entry = gtk_entry_new ();
gtk_entry_set_text (GTK_ENTRY (entry), str);
gtk_widget_show (entry);
- gtk_box_pack_start (GTK_BOX (box), entry, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), entry, FALSE, TRUE);
g_object_set_data (G_OBJECT (box), "entry", entry);
g_signal_connect_swapped (entry, "notify::text", G_CALLBACK (emit_changed), editor);
button = gtk_button_new_from_icon_name ("user-trash-symbolic", GTK_ICON_SIZE_MENU);
gtk_style_context_add_class (gtk_widget_get_style_context (button), "image-button");
gtk_widget_show (button);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
g_signal_connect (button, "clicked", G_CALLBACK (remove_string), editor);
- gtk_box_pack_start (GTK_BOX (editor->box), box, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (editor->box), box, FALSE, FALSE);
gtk_widget_grab_focus (entry);
@@ -107,8 +107,8 @@ gtk_inspector_strv_editor_init (GtkInspectorStrvEditor *editor)
gtk_widget_show (editor->button);
g_signal_connect (editor->button, "clicked", G_CALLBACK (add_cb), editor);
- gtk_box_pack_start (GTK_BOX (editor), editor->box, FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (editor), editor->button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (editor), editor->box, FALSE, TRUE);
+ gtk_box_pack_start (GTK_BOX (editor), editor->button, FALSE, FALSE);
}
static void
diff --git a/gtk/ui/gtkfontbutton.ui b/gtk/ui/gtkfontbutton.ui
index 5b8e646..f247e01 100644
--- a/gtk/ui/gtkfontbutton.ui
+++ b/gtk/ui/gtkfontbutton.ui
@@ -14,7 +14,6 @@
</object>
<packing>
<property name="expand">1</property>
- <property name="padding">5</property>
</packing>
</child>
<child>
@@ -37,7 +36,6 @@
</object>
<packing>
<property name="fill">0</property>
- <property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index e4e552a..f20305a 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -814,7 +814,6 @@
</object>
<packing>
<property name="expand">1</property>
- <property name="padding">6</property>
<property name="position">1</property>
</packing>
</child>
diff --git a/tests/flicker.c b/tests/flicker.c
index 2bd53ce..4743eb8 100644
--- a/tests/flicker.c
+++ b/tests/flicker.c
@@ -75,12 +75,12 @@ create_flicker (void)
spinbutton7_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton7 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton7_adj), 1, 0);
gtk_widget_show (spinbutton7);
- gtk_box_pack_start (GTK_BOX (hbox2), spinbutton7, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox2), spinbutton7, TRUE, TRUE);
spinbutton8_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton8 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton8_adj), 1, 0);
gtk_widget_show (spinbutton8);
- gtk_box_pack_start (GTK_BOX (hbox2), spinbutton8, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox2), spinbutton8, TRUE, TRUE);
vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox1);
@@ -89,42 +89,42 @@ create_flicker (void)
spinbutton9_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton9 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton9_adj), 1, 0);
gtk_widget_show (spinbutton9);
- gtk_box_pack_start (GTK_BOX (vbox1), spinbutton9, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox1), spinbutton9, FALSE, FALSE);
spinbutton10_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton10 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton10_adj), 1, 0);
gtk_widget_show (spinbutton10);
- gtk_box_pack_start (GTK_BOX (vbox1), spinbutton10, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox1), spinbutton10, FALSE, FALSE);
spinbutton11_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton11 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton11_adj), 1, 0);
gtk_widget_show (spinbutton11);
- gtk_box_pack_start (GTK_BOX (vbox1), spinbutton11, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox1), spinbutton11, FALSE, FALSE);
spinbutton12_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton12 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton12_adj), 1, 0);
gtk_widget_show (spinbutton12);
- gtk_box_pack_start (GTK_BOX (vbox1), spinbutton12, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox1), spinbutton12, FALSE, FALSE);
spinbutton13_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton13 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton13_adj), 1, 0);
gtk_widget_show (spinbutton13);
- gtk_box_pack_start (GTK_BOX (vbox1), spinbutton13, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox1), spinbutton13, FALSE, FALSE);
spinbutton14_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton14 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton14_adj), 1, 0);
gtk_widget_show (spinbutton14);
- gtk_box_pack_start (GTK_BOX (vbox1), spinbutton14, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox1), spinbutton14, FALSE, FALSE);
spinbutton15_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton15 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton15_adj), 1, 0);
gtk_widget_show (spinbutton15);
- gtk_box_pack_start (GTK_BOX (vbox1), spinbutton15, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox1), spinbutton15, FALSE, FALSE);
spinbutton16_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton16 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton16_adj), 1, 0);
gtk_widget_show (spinbutton16);
- gtk_box_pack_start (GTK_BOX (vbox1), spinbutton16, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox1), spinbutton16, FALSE, FALSE);
vpaned1 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
gtk_widget_show (vpaned1);
@@ -138,17 +138,17 @@ create_flicker (void)
spinbutton17_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton17 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton17_adj), 1, 0);
gtk_widget_show (spinbutton17);
- gtk_box_pack_start (GTK_BOX (hbox1), spinbutton17, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox1), spinbutton17, TRUE, TRUE);
spinbutton18_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton18 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton18_adj), 1, 0);
gtk_widget_show (spinbutton18);
- gtk_box_pack_start (GTK_BOX (hbox1), spinbutton18, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox1), spinbutton18, TRUE, TRUE);
spinbutton19_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton19 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton19_adj), 1, 0);
gtk_widget_show (spinbutton19);
- gtk_box_pack_start (GTK_BOX (hbox1), spinbutton19, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox1), spinbutton19, TRUE, TRUE);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_widget_show (vbox2);
@@ -157,43 +157,42 @@ create_flicker (void)
spinbutton20_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton20 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton20_adj), 1, 0);
gtk_widget_show (spinbutton20);
- gtk_box_pack_start (GTK_BOX (vbox2), spinbutton20, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), spinbutton20, FALSE, FALSE);
spinbutton21_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton21 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton21_adj), 1, 0);
gtk_widget_show (spinbutton21);
- gtk_box_pack_start (GTK_BOX (vbox2), spinbutton21, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), spinbutton21, FALSE, FALSE);
spinbutton22_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton22 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton22_adj), 1, 0);
gtk_widget_show (spinbutton22);
- gtk_box_pack_start (GTK_BOX (vbox2), spinbutton22, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), spinbutton22, FALSE, FALSE);
spinbutton23_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton23 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton23_adj), 1, 0);
gtk_widget_show (spinbutton23);
- gtk_box_pack_start (GTK_BOX (vbox2), spinbutton23, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), spinbutton23, FALSE, FALSE);
spinbutton24_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton24 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton24_adj), 1, 0);
gtk_widget_show (spinbutton24);
- gtk_box_pack_start (GTK_BOX (vbox2), spinbutton24, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), spinbutton24, FALSE, FALSE);
spinbutton25_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton25 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton25_adj), 1, 0);
gtk_widget_show (spinbutton25);
- gtk_box_pack_start (GTK_BOX (vbox2), spinbutton25, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), spinbutton25, FALSE, FALSE);
spinbutton26_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton26 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton26_adj), 1, 0);
gtk_widget_show (spinbutton26);
- gtk_box_pack_start (GTK_BOX (vbox2), spinbutton26, TRUE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), spinbutton26, TRUE, FALSE);
spinbutton27_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
spinbutton27 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton27_adj), 1, 0);
gtk_widget_show (spinbutton27);
- gtk_box_pack_end (GTK_BOX (vbox2), spinbutton27, FALSE, FALSE, 0);
-
+ gtk_box_pack_end (GTK_BOX (vbox2), spinbutton27, FALSE, FALSE);
return window1;
}
diff --git a/tests/gdkgears.c b/tests/gdkgears.c
index bfa1a36..dfe80d8 100644
--- a/tests/gdkgears.c
+++ b/tests/gdkgears.c
@@ -176,26 +176,26 @@ main (int argc, char *argv[])
gtk_gears_set_fps_label (GTK_GEARS (gears), GTK_LABEL (fps_label));
spinner = gtk_spinner_new ();
- gtk_box_pack_end (GTK_BOX (hbox), spinner, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), spinner, FALSE, FALSE);
gtk_widget_show (spinner);
gtk_spinner_start (GTK_SPINNER (spinner));
check = gtk_check_button_new_with_label ("Animate spinner");
- gtk_box_pack_end (GTK_BOX (hbox), check, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), check, FALSE, FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE);
gtk_widget_show (check);
g_signal_connect (check, "toggled",
G_CALLBACK (toggle_spin), spinner);
check = gtk_check_button_new_with_label ("Alpha");
- gtk_box_pack_end (GTK_BOX (hbox), check, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), check, FALSE, FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE);
gtk_widget_show (check);
g_signal_connect (check, "toggled",
G_CALLBACK (toggle_alpha), gears);
check = gtk_check_button_new_with_label ("Overlay");
- gtk_box_pack_end (GTK_BOX (hbox), check, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), check, FALSE, FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE);
gtk_widget_show (check);
g_signal_connect (check, "toggled",
@@ -209,7 +209,7 @@ main (int argc, char *argv[])
gtk_container_add (GTK_CONTAINER (popover), label);
gtk_menu_button_set_popover (GTK_MENU_BUTTON (button), popover);
gtk_widget_show (button);
- gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE);
scrolled = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
diff --git a/tests/motion-compression.c b/tests/motion-compression.c
index de6d9d6..1aa2660 100644
--- a/tests/motion-compression.c
+++ b/tests/motion-compression.c
@@ -52,11 +52,11 @@ main (int argc, char **argv)
adjustment = gtk_adjustment_new (20, 0, 200, 1, 10, 0);
scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adjustment);
- gtk_box_pack_end (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), scale, FALSE, FALSE);
label = gtk_label_new ("Event processing time (ms):");
gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
- gtk_box_pack_end (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), label, FALSE, FALSE);
g_signal_connect (window, "motion-notify-event",
G_CALLBACK (on_motion_notify), NULL);
diff --git a/tests/overlayscroll.c b/tests/overlayscroll.c
index e432331..4c3c641 100644
--- a/tests/overlayscroll.c
+++ b/tests/overlayscroll.c
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE);
content = get_content ();
diff --git a/tests/print-editor.c b/tests/print-editor.c
index fe67e51..efdee69 100644
--- a/tests/print-editor.c
+++ b/tests/print-editor.c
@@ -322,15 +322,15 @@ create_custom_widget (GtkPrintOperation *operation,
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
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);
gtk_widget_show (hbox);
label = gtk_label_new ("Font:");
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
gtk_widget_show (label);
-
+
font = gtk_font_button_new_with_font (data->font);
- gtk_box_pack_start (GTK_BOX (hbox), font, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), font, FALSE, FALSE);
gtk_widget_show (font);
data->font_button = font;
@@ -483,22 +483,22 @@ preview_cb (GtkPrintOperation *op,
width = 200;
height = 300;
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- gtk_window_set_transient_for (GTK_WINDOW (window),
+ gtk_window_set_transient_for (GTK_WINDOW (window),
GTK_WINDOW (main_window));
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), vbox);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start (GTK_BOX (vbox), hbox,
- FALSE, FALSE, 0);
+ FALSE, FALSE);
page = gtk_spin_button_new_with_range (1, 100, 1);
- gtk_box_pack_start (GTK_BOX (hbox), page, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (hbox), page, FALSE, FALSE);
+
close = gtk_button_new_with_label ("Close");
- gtk_box_pack_start (GTK_BOX (hbox), close, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), close, FALSE, FALSE);
da = gtk_drawing_area_new ();
gtk_widget_set_size_request (GTK_WIDGET (da), width, height);
- gtk_box_pack_start (GTK_BOX (vbox), da, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), da, TRUE, TRUE);
gtk_widget_realize (da);
diff --git a/tests/syncscroll.c b/tests/syncscroll.c
index 881ad64..2824a89 100644
--- a/tests/syncscroll.c
+++ b/tests/syncscroll.c
@@ -32,7 +32,7 @@ main (int argc, char *argv[])
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_NEVER,
GTK_POLICY_EXTERNAL);
- gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE);
tv = gtk_text_view_new ();
fill_text_view (tv, "Left");
gtk_container_add (GTK_CONTAINER (sw), tv);
@@ -43,7 +43,7 @@ main (int argc, char *argv[])
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_NEVER,
GTK_POLICY_EXTERNAL);
- gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE);
tv = gtk_text_view_new ();
fill_text_view (tv, "Middle");
gtk_container_add (GTK_CONTAINER (sw), tv);
@@ -52,7 +52,7 @@ main (int argc, char *argv[])
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_NEVER,
GTK_POLICY_EXTERNAL);
- gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE);
tv = gtk_text_view_new ();
fill_text_view (tv, "Right");
gtk_container_add (GTK_CONTAINER (sw), tv);
diff --git a/tests/testaccel.c b/tests/testaccel.c
index ef213c9..f3b64d1 100644
--- a/tests/testaccel.c
+++ b/tests/testaccel.c
@@ -74,16 +74,16 @@ key_test (void)
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
gtk_widget_show (box);
gtk_container_add (GTK_CONTAINER (window), box);
- gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE);
store = gtk_list_store_new (3, G_TYPE_INT, G_TYPE_UINT, G_TYPE_UINT);
tv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
gtk_container_add (GTK_CONTAINER (sw), tv);
column = gtk_tree_view_column_new ();
rend = gtk_cell_renderer_accel_new ();
- g_object_set (G_OBJECT (rend),
- "accel-mode", GTK_CELL_RENDERER_ACCEL_MODE_GTK,
- "editable", TRUE,
+ g_object_set (G_OBJECT (rend),
+ "accel-mode", GTK_CELL_RENDERER_ACCEL_MODE_GTK,
+ "editable", TRUE,
NULL);
g_signal_connect (G_OBJECT (rend),
"accel-edited",
diff --git a/tests/testactionbar.c b/tests/testactionbar.c
index 01f819f..3c34cbe 100644
--- a/tests/testactionbar.c
+++ b/tests/testactionbar.c
@@ -113,7 +113,7 @@ activate (GApplication *gapp)
"row-spacing", 12,
"column-spacing", 12,
NULL);
- gtk_box_pack_start (GTK_BOX (box), grid, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), grid, FALSE, FALSE);
label = gtk_label_new ("Start");
gtk_widget_set_halign (label, GTK_ALIGN_END);
@@ -147,7 +147,7 @@ activate (GApplication *gapp)
gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1);
gtk_grid_attach (GTK_GRID (grid), check, 1, 3, 1, 1);
- gtk_box_pack_end (GTK_BOX (box), bar, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (box), bar, FALSE, FALSE);
gtk_container_add (GTK_CONTAINER (window), box);
gtk_widget_show_all (window);
}
diff --git a/tests/testactions.c b/tests/testactions.c
index 32b6b4e..115b308 100644
--- a/tests/testactions.c
+++ b/tests/testactions.c
@@ -254,10 +254,10 @@ add_widget (GtkUIManager *merge,
GtkContainer *container)
{
- gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE);
gtk_widget_show (widget);
- if (GTK_IS_TOOLBAR (widget))
+ if (GTK_IS_TOOLBAR (widget))
{
toolbar = GTK_TOOLBAR (widget);
gtk_toolbar_set_show_arrow (toolbar, TRUE);
@@ -376,26 +376,26 @@ create_window (GtkActionGroup *action_group)
}
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_end (GTK_BOX (box), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (box), hbox, FALSE, FALSE);
gtk_widget_show (hbox);
-
+
spinbutton = gtk_spin_button_new_with_range (100, 10000, 100);
- gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE);
gtk_widget_show (spinbutton);
-
+
button = gtk_button_new_with_label ("Add");
- gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
gtk_widget_show (button);
-
+
g_object_set_data (G_OBJECT (button), "spinbutton", spinbutton);
g_signal_connect (button, "clicked", G_CALLBACK (add_cb), merge);
-
+
button = gtk_button_new_with_label ("Remove");
- gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
gtk_widget_show (button);
-
+
g_signal_connect (button, "clicked", G_CALLBACK (remove_cb), merge);
-
+
gtk_widget_show (window);
}
diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c
index 69b251b..62a2a4c 100644
--- a/tests/testadjustsize.c
+++ b/tests/testadjustsize.c
@@ -398,7 +398,7 @@ open_valigned_label_window (void)
label = gtk_label_new ("Both labels expand");
gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE);
label = gtk_label_new ("Some wrapping text with width-chars = 15 and max-width-chars = 35");
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
@@ -414,7 +414,7 @@ open_valigned_label_window (void)
gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE);
gtk_window_present (GTK_WINDOW (window));
}
diff --git a/tests/testanimation.c b/tests/testanimation.c
index 356b882..aa8ffd0 100644
--- a/tests/testanimation.c
+++ b/tests/testanimation.c
@@ -332,14 +332,14 @@ do_image (const char *filename)
str);
g_free (escaped);
g_free (str);
-
- 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_pixbuf (NULL);
gtk_container_add (GTK_CONTAINER (frame), image);
@@ -389,21 +389,21 @@ do_nonprogressive (const gchar *filename)
str);
g_free (escaped);
g_free (str);
-
- 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_file (filename);
gtk_container_add (GTK_CONTAINER (frame), image);
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_main_quit), NULL);
-
+
g_signal_connect (window, "delete_event",
G_CALLBACK (gtk_main_quit), NULL);
diff --git a/tests/testappchooserbutton.c b/tests/testappchooserbutton.c
index c4b2872..95def5a 100644
--- a/tests/testappchooserbutton.c
+++ b/tests/testappchooserbutton.c
@@ -77,22 +77,22 @@ main (int argc,
gtk_container_add (GTK_CONTAINER (toplevel), box);
combobox = gtk_app_chooser_button_new ("image/jpeg");
- gtk_box_pack_start (GTK_BOX (box), combobox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), combobox, TRUE, TRUE);
g_signal_connect (combobox, "changed",
G_CALLBACK (combo_changed_cb), NULL);
w = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (w), "<b>Selected app info</b>");
- gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE);
w = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
- gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE);
sel_image = gtk_image_new ();
- gtk_box_pack_start (GTK_BOX (w), sel_image, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (w), sel_image, TRUE, TRUE);
sel_name = gtk_label_new (NULL);
- gtk_box_pack_start (GTK_BOX (w), sel_name, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (w), sel_name, TRUE, TRUE);
gtk_app_chooser_button_set_heading (GTK_APP_CHOOSER_BUTTON (combobox), "Choose one, <i>not</i> two");
gtk_app_chooser_button_append_separator (GTK_APP_CHOOSER_BUTTON (combobox));
diff --git a/tests/testassistant.c b/tests/testassistant.c
index fec7f69..2e188ba 100644
--- a/tests/testassistant.c
+++ b/tests/testassistant.c
@@ -379,20 +379,20 @@ create_nonlinear_assistant (GtkWidget *widget)
page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
button = gtk_radio_button_new_with_label (NULL, "branch A");
- gtk_box_pack_start (GTK_BOX (page), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (page), button, FALSE, FALSE);
g_signal_connect (G_OBJECT (button), "toggled", G_CALLBACK (select_branch), GINT_TO_POINTER ('A'));
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-
+
button = gtk_radio_button_new_with_label (gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)),
"branch B");
- gtk_box_pack_start (GTK_BOX (page), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (page), button, FALSE, FALSE);
g_signal_connect (G_OBJECT (button), "toggled", G_CALLBACK (select_branch), GINT_TO_POINTER ('B'));
gtk_widget_show_all (page);
gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Page 1");
gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), page, TRUE);
-
+
page = get_test_page ("Page 2A");
gtk_widget_show (page);
gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
@@ -654,8 +654,7 @@ create_page_flipping_assistant (GtkWidget *widget)
gtk_box_pack_start (GTK_BOX (page),
get_test_page ("Page 2"),
TRUE,
- TRUE,
- 0);
+ TRUE);
gtk_widget_show_all (page);
gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Page 2");
@@ -727,7 +726,7 @@ main (int argc, gchar *argv[])
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (buttons[i].func), NULL);
- gtk_box_pack_start (GTK_BOX (box), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), button, TRUE, TRUE);
}
gtk_widget_show_all (window);
diff --git a/tests/testbaseline.c b/tests/testbaseline.c
index 3e6965b..220b197 100644
--- a/tests/testbaseline.c
+++ b/tests/testbaseline.c
@@ -93,14 +93,14 @@ main (int argc,
notebook = gtk_notebook_new ();
gtk_container_add (GTK_CONTAINER (window), notebook);
- vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
vbox, gtk_label_new ("hboxes"));
for (j = 0; j < 2; j++)
{
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 5);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
char *aligns_names[] = { "FILL", "BASELINE" };
GtkAlign aligns[] = { GTK_ALIGN_FILL, GTK_ALIGN_BASELINE};
@@ -136,7 +136,7 @@ main (int argc,
}
grid_hbox = hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
combo = gtk_combo_box_text_new ();
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), baseline_pos_str[0]);
@@ -148,7 +148,7 @@ main (int argc,
for (j = 0; j < 2; j++)
{
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
g_signal_connect (G_OBJECT (combo), "changed",
G_CALLBACK (baseline_position_changed), hbox);
@@ -226,7 +226,7 @@ main (int argc,
vbox, gtk_label_new ("grid"));
grid_hbox = hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
label = gtk_label_new ("Align me:");
gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
@@ -292,7 +292,7 @@ main (int argc,
gtk_container_add (GTK_CONTAINER (hbox), grid);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 5);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
adjustment = gtk_adjustment_new (0.0, -1.0, 5.0, 1.0, 1.0, 0.0);
spin = gtk_spin_button_new (adjustment, 1.0, 0);
@@ -317,7 +317,7 @@ main (int argc,
vbox, gtk_label_new ("button box"));
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 5);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
adjustment = gtk_adjustment_new (34.0, 1.0, 64.0, 1.0, 1.0, 0.0);
spin = gtk_spin_button_new (adjustment, 1.0, 0);
@@ -330,7 +330,7 @@ main (int argc,
for (j = 0; j < 3; j++)
{
hbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
gtk_box_set_baseline_position (GTK_BOX (hbox), j);
diff --git a/tests/testbbox.c b/tests/testbbox.c
index 8f2444d..502914f 100644
--- a/tests/testbbox.c
+++ b/tests/testbbox.c
@@ -117,57 +117,57 @@ main (int argc,
GtkWidget *window, *buttons[N_BUTTONS];
GtkWidget *vbox, *hbox, *combo_styles, *combo_types, *option;
int i;
-
+
gtk_init (&argc, &argv);
-
+
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
g_signal_connect (G_OBJECT (window), "delete-event", G_CALLBACK (gtk_main_quit), NULL);
-
- vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+
+ vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_container_add (GTK_CONTAINER (window), vbox);
-
+
/* GtkHButtonBox */
-
+
hbbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (vbox), hbbox, TRUE, TRUE, 5);
-
+ gtk_box_pack_start (GTK_BOX (vbox), hbbox, TRUE, TRUE);
+
for (i = 0; i < N_BUTTONS; i++) {
buttons[i] = gtk_button_new_with_label (strings[i]);
gtk_container_add (GTK_CONTAINER (hbbox), buttons[i]);
}
-
+
bbox = hbbox;
gtk_button_box_set_layout (GTK_BUTTON_BOX (hbbox), GTK_BUTTONBOX_SPREAD);
-
+
/* GtkVButtonBox */
vbbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
- gtk_box_pack_start (GTK_BOX (vbox), vbbox, TRUE, TRUE, 5);
-
+ gtk_box_pack_start (GTK_BOX (vbox), vbbox, TRUE, TRUE);
+
/* Options */
-
+
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+
combo_types = gtk_combo_box_text_new ();
populate_combo_with (GTK_COMBO_BOX_TEXT (combo_types), types);
g_signal_connect (G_OBJECT (combo_types), "changed", G_CALLBACK (combo_types_changed_cb), buttons);
- gtk_box_pack_start (GTK_BOX (hbox), combo_types, TRUE, TRUE, 0);
-
+ gtk_box_pack_start (GTK_BOX (hbox), combo_types, TRUE, TRUE);
+
combo_styles = gtk_combo_box_text_new ();
populate_combo_with (GTK_COMBO_BOX_TEXT (combo_styles), styles);
g_signal_connect (G_OBJECT (combo_styles), "changed", G_CALLBACK (combo_changed_cb), NULL);
- gtk_box_pack_start (GTK_BOX (hbox), combo_styles, TRUE, TRUE, 0);
-
+ gtk_box_pack_start (GTK_BOX (hbox), combo_styles, TRUE, TRUE);
+
option = gtk_check_button_new_with_label ("Help is secondary");
g_signal_connect (G_OBJECT (option), "toggled", G_CALLBACK (option_cb), buttons[N_BUTTONS - 1]);
-
- gtk_box_pack_start (GTK_BOX (hbox), option, FALSE, FALSE, 0);
-
+
+ gtk_box_pack_start (GTK_BOX (hbox), option, FALSE, FALSE);
+
gtk_widget_show_all (window);
gtk_widget_hide (vbbox);
-
+
gtk_main ();
-
+
return 0;
}
diff --git a/tests/testbox.c b/tests/testbox.c
index 693f032..6885f41 100644
--- a/tests/testbox.c
+++ b/tests/testbox.c
@@ -75,7 +75,7 @@ edit_widget (GtkWidget *button)
gtk_widget_set_halign (label, GTK_ALIGN_END);
check = gtk_check_button_new ();
gtk_box_query_child_packing (GTK_BOX (gtk_widget_get_parent (button)),
- button, &expand, NULL, NULL, NULL);
+ button, &expand, NULL, NULL);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), expand);
g_signal_connect (check, "toggled",
G_CALLBACK (expand_toggled), button);
@@ -86,13 +86,13 @@ edit_widget (GtkWidget *button)
gtk_widget_set_halign (label, GTK_ALIGN_END);
check = gtk_check_button_new ();
gtk_box_query_child_packing (GTK_BOX (gtk_widget_get_parent (button)),
- button, NULL, &fill, NULL, NULL);
+ button, NULL, &fill, NULL);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), fill);
g_signal_connect (check, "toggled",
G_CALLBACK (fill_toggled), button);
gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1);
gtk_grid_attach (GTK_GRID (grid), check, 1, 3, 1, 1);
-
+
gtk_widget_show_all (grid);
g_object_set_data (G_OBJECT (button), "dialog", dialog);
@@ -140,12 +140,12 @@ main (int argc, char *argv[])
gtk_container_add (GTK_CONTAINER (window), vbox);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (box), test_widget ("1"), FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (box), test_widget ("2"), FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (box), test_widget ("3"), FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (box), test_widget ("4"), FALSE, TRUE, 0);
- gtk_box_pack_end (GTK_BOX (box), test_widget ("5"), FALSE, TRUE, 0);
- gtk_box_pack_end (GTK_BOX (box), test_widget ("6"), FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), test_widget ("1"), FALSE, TRUE);
+ gtk_box_pack_start (GTK_BOX (box), test_widget ("2"), FALSE, TRUE);
+ gtk_box_pack_start (GTK_BOX (box), test_widget ("3"), FALSE, TRUE);
+ gtk_box_pack_start (GTK_BOX (box), test_widget ("4"), FALSE, TRUE);
+ gtk_box_pack_end (GTK_BOX (box), test_widget ("5"), FALSE, TRUE);
+ gtk_box_pack_end (GTK_BOX (box), test_widget ("6"), FALSE, TRUE);
gtk_box_set_center_widget (GTK_BOX (box), test_widget ("center"));
gtk_container_add (GTK_CONTAINER (vbox), box);
@@ -164,16 +164,16 @@ main (int argc, char *argv[])
gtk_widget_set_halign (b, GTK_ALIGN_CENTER);
label = gtk_label_new ("Spacing:");
gtk_widget_set_halign (label, GTK_ALIGN_END);
- gtk_box_pack_start (GTK_BOX (b), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (b), label, FALSE, TRUE);
spin = gtk_spin_button_new_with_range (0, 10, 1);
gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE);
gtk_widget_set_halign (spin, GTK_ALIGN_START);
g_signal_connect (spin, "value-changed",
G_CALLBACK (spacing_changed), box);
- gtk_box_pack_start (GTK_BOX (b), spin, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (b), spin, FALSE, TRUE);
gtk_container_add (GTK_CONTAINER (vbox), b);
-
+
gtk_widget_show_all (window);
gtk_main ();
diff --git a/tests/testboxcss.c b/tests/testboxcss.c
index 06290d9..bf19a79 100644
--- a/tests/testboxcss.c
+++ b/tests/testboxcss.c
@@ -173,15 +173,15 @@ main (gint argc, gchar **argv)
toolbar = gtk_toolbar_new ();
gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_TEXT);
- gtk_box_pack_start (GTK_BOX (main_box), toolbar, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (main_box), toolbar, FALSE, TRUE);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (main_box), box, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (main_box), box, FALSE, TRUE);
container = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_min_content_width (GTK_SCROLLED_WINDOW (container), 200);
gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (container), 200);
- gtk_box_pack_start (GTK_BOX (main_box), container, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (main_box), container, TRUE, TRUE);
child = gtk_text_view_new_with_buffer (css);
gtk_container_add (GTK_CONTAINER (container), child);
g_signal_connect (css,
@@ -197,28 +197,28 @@ main (gint argc, gchar **argv)
gtk_text_view_get_buffer (GTK_TEXT_VIEW (child)));
container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (main_box), container, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (main_box), container, FALSE, TRUE);
child = gtk_switch_new ();
gtk_switch_set_active (GTK_SWITCH (child), gtk_widget_get_default_direction () == GTK_TEXT_DIR_LTR);
g_signal_connect (child,
"notify::active",
G_CALLBACK (set_orientation),
NULL);
- gtk_box_pack_start (GTK_BOX (container), child, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (container), child, FALSE, FALSE);
child = gtk_label_new ("left-to-right");
- gtk_box_pack_start (GTK_BOX (container), child, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (container), child, FALSE, FALSE);
child = gtk_button_new_with_label ("Add button");
g_signal_connect_swapped (child,
"clicked",
G_CALLBACK (add_button),
box);
- gtk_box_pack_end (GTK_BOX (container), child, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (container), child, FALSE, FALSE);
child = gtk_button_new_with_label ("Add toolbutton");
g_signal_connect_swapped (child,
"clicked",
G_CALLBACK (add_toolbutton),
toolbar);
- gtk_box_pack_end (GTK_BOX (container), child, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (container), child, FALSE, FALSE);
add_toolbutton (GTK_TOOLBAR (toolbar));
add_toolbutton (GTK_TOOLBAR (toolbar));
diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index 16f04bf..3d6fab7 100644
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -496,7 +496,7 @@ create_calendar(void)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, DEF_PAD_SMALL);
frame = create_frame ("<b>Options</b>", vbox, GTK_ALIGN_FILL, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (rpane), frame, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (rpane), frame, FALSE, TRUE);
size = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
context = gtk_widget_get_style_context (calendar);
@@ -518,9 +518,9 @@ create_calendar(void)
gtk_size_group_add_widget (size, label);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
+ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
/* Build the width entry */
@@ -539,9 +539,9 @@ create_calendar(void)
gtk_size_group_add_widget (size, label);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
+ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
/* Build the height entry */
@@ -560,15 +560,15 @@ create_calendar(void)
gtk_size_group_add_widget (size, label);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
+ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
/* Build the right details frame */
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, DEF_PAD_SMALL);
frame = create_frame ("<b>Details</b>", vbox, GTK_ALIGN_FILL, GTK_ALIGN_FILL);
- gtk_box_pack_start (GTK_BOX (rpane), frame, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (rpane), frame, FALSE, TRUE);
details = gtk_text_view_new();
calendar_data.details_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (details));
@@ -586,12 +586,12 @@ create_calendar(void)
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start (GTK_BOX (vbox), scroller, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), scroller, FALSE, TRUE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL);
gtk_widget_set_halign (hbox, GTK_ALIGN_START);
gtk_widget_set_valign (hbox, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
button = gtk_button_new_with_mnemonic ("Demonstrate _Details");
@@ -600,7 +600,7 @@ create_calendar(void)
G_CALLBACK (demonstrate_details),
&calendar_data);
- gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE);
button = gtk_button_new_with_mnemonic ("_Reset Details");
@@ -609,24 +609,24 @@ create_calendar(void)
G_CALLBACK (reset_details),
&calendar_data);
- gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE);
toggle = gtk_check_button_new_with_mnemonic ("_Use Details");
g_signal_connect (toggle, "toggled",
G_CALLBACK(calendar_toggle_details),
&calendar_data);
- gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, TRUE, 0);
-
- /* Build the Right frame with the flags in */
+ gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, TRUE);
+
+ /* Build the Right frame with the flags in */
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
frame = create_expander ("<b>Flags</b>", vbox, GTK_ALIGN_FILL, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (rpane), frame, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (rpane), frame, TRUE, TRUE);
for (i = 0; i < G_N_ELEMENTS (calendar_data.settings); i++)
{
toggle = gtk_check_button_new_with_mnemonic(flags[i].label);
- gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, TRUE);
calendar_data.flag_checkboxes[i] = toggle;
g_signal_connect (toggle, "toggled",
@@ -643,27 +643,27 @@ create_calendar(void)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, DEF_PAD_SMALL);
gtk_box_set_homogeneous (GTK_BOX (vbox), TRUE);
frame = create_frame ("<b>Signal Events</b>", vbox, GTK_ALIGN_FILL, GTK_ALIGN_CENTER);
-
+
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
label = gtk_label_new ("Signal:");
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
calendar_data.last_sig = gtk_label_new ("");
- gtk_box_pack_start (GTK_BOX (hbox), calendar_data.last_sig, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), calendar_data.last_sig, FALSE, TRUE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
label = gtk_label_new ("Previous signal:");
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
calendar_data.prev_sig = gtk_label_new ("");
- gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev_sig, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev_sig, FALSE, TRUE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
label = gtk_label_new ("Second previous signal:");
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
calendar_data.prev2_sig = gtk_label_new ("");
- gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev2_sig, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev2_sig, FALSE, TRUE);
/*
* Glue everything together
@@ -679,15 +679,15 @@ create_calendar(void)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, DEF_PAD_SMALL);
gtk_box_pack_start (GTK_BOX (vbox), hpaned,
- TRUE, TRUE, 0);
+ TRUE, TRUE);
gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
- FALSE, TRUE, 0);
+ FALSE, TRUE);
gtk_box_pack_start (GTK_BOX (vbox), frame,
- FALSE, TRUE, 0);
+ FALSE, TRUE);
gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
- FALSE, TRUE, 0);
+ FALSE, TRUE);
gtk_box_pack_start (GTK_BOX (vbox), bbox,
- FALSE, TRUE, 0);
+ FALSE, TRUE);
gtk_container_add (GTK_CONTAINER (window), vbox);
diff --git a/tests/testcellarea.c b/tests/testcellarea.c
index 1c2a85a..7de3625 100644
--- a/tests/testcellarea.c
+++ b/tests/testcellarea.c
@@ -196,19 +196,19 @@ simple_cell_area (void)
gtk_container_add (GTK_CONTAINER (frame), iconview);
- gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE, TRUE);
/* Now add some controls */
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
gtk_widget_show (vbox);
- gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE);
widget = gtk_combo_box_text_new ();
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Horizontal");
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Vertical");
gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (orientation_changed), iconview);
@@ -216,16 +216,16 @@ simple_cell_area (void)
widget = gtk_check_button_new_with_label ("Align 2nd Cell");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+
g_signal_connect (G_OBJECT (widget), "toggled",
G_CALLBACK (align_cell_2_toggled), iconview);
widget = gtk_check_button_new_with_label ("Align 3rd Cell");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+
g_signal_connect (G_OBJECT (widget), "toggled",
G_CALLBACK (align_cell_3_toggled), iconview);
@@ -233,24 +233,24 @@ simple_cell_area (void)
widget = gtk_check_button_new_with_label ("Expand 1st Cell");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+
g_signal_connect (G_OBJECT (widget), "toggled",
G_CALLBACK (expand_cell_1_toggled), iconview);
widget = gtk_check_button_new_with_label ("Expand 2nd Cell");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+
g_signal_connect (G_OBJECT (widget), "toggled",
G_CALLBACK (expand_cell_2_toggled), iconview);
widget = gtk_check_button_new_with_label ("Expand 3rd Cell");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+
g_signal_connect (G_OBJECT (widget), "toggled",
G_CALLBACK (expand_cell_3_toggled), iconview);
@@ -441,19 +441,19 @@ focus_cell_area (void)
gtk_container_add (GTK_CONTAINER (frame), iconview);
- gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE, TRUE);
/* Now add some controls */
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
gtk_widget_show (vbox);
- gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE);
widget = gtk_combo_box_text_new ();
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Horizontal");
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Vertical");
gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (orientation_changed), iconview);
@@ -461,7 +461,7 @@ focus_cell_area (void)
widget = gtk_check_button_new_with_label ("Focus Sibling");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "toggled",
G_CALLBACK (focus_sibling_toggled), iconview);
@@ -531,7 +531,7 @@ background_area (void)
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_label_set_width_chars (GTK_LABEL (label), 40);
gtk_widget_show (label);
- gtk_box_pack_start (GTK_BOX (main_vbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (main_vbox), label, FALSE, FALSE);
iconview = focus_iconview (TRUE, NULL, NULL);
@@ -543,20 +543,20 @@ background_area (void)
gtk_container_add (GTK_CONTAINER (frame), iconview);
- gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE, TRUE);
/* Now add some controls */
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
gtk_widget_show (vbox);
- gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE);
widget = gtk_combo_box_text_new ();
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Horizontal");
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Vertical");
gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (orientation_changed), iconview);
@@ -567,9 +567,9 @@ background_area (void)
gtk_widget_show (hbox);
gtk_widget_show (label);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "value-changed",
G_CALLBACK (cell_spacing_changed), iconview);
@@ -582,9 +582,9 @@ background_area (void)
gtk_widget_show (hbox);
gtk_widget_show (label);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "value-changed",
G_CALLBACK (row_spacing_changed), iconview);
@@ -596,9 +596,9 @@ background_area (void)
gtk_widget_show (hbox);
gtk_widget_show (label);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "value-changed",
G_CALLBACK (item_padding_changed), iconview);
diff --git a/tests/testcellrenderertext.c b/tests/testcellrenderertext.c
index e57964e..842d813 100644
--- a/tests/testcellrenderertext.c
+++ b/tests/testcellrenderertext.c
@@ -267,18 +267,18 @@ main (int argc, char **argv)
/* LTR */
label = gtk_label_new ("Left to right");
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
tree = create_tree (FALSE);
- gtk_box_pack_start (GTK_BOX (vbox), tree, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), tree, TRUE, TRUE);
/* RTL */
label = gtk_label_new ("Right to left");
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
tree = create_tree (TRUE);
- gtk_box_pack_start (GTK_BOX (vbox), tree, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), tree, TRUE, TRUE);
gtk_widget_show_all (window);
gtk_main ();
diff --git a/tests/testclipboard.c b/tests/testclipboard.c
index 2c7ed73..4d6a804 100644
--- a/tests/testclipboard.c
+++ b/tests/testclipboard.c
@@ -118,9 +118,9 @@ main (int argc, char **argv)
NULL);
image = gtk_image_new ();
- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), image, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), image, FALSE, FALSE);
label = gtk_label_new ("No data found");
- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), label, FALSE, FALSE);
g_signal_connect (window, "response", G_CALLBACK (on_response), NULL);
diff --git a/tests/testcombo.c b/tests/testcombo.c
index 34864d1..7d2db0b 100644
--- a/tests/testcombo.c
+++ b/tests/testcombo.c
@@ -1087,7 +1087,7 @@ main (int argc, char **argv)
/* GtkCellView */
tmp = gtk_frame_new ("GtkCellView");
- gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
@@ -1109,7 +1109,7 @@ main (int argc, char **argv)
/* GtkComboBox list */
tmp = gtk_frame_new ("GtkComboBox (list)");
- gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
@@ -1143,14 +1143,14 @@ main (int argc, char **argv)
renderer,
set_sensitive,
NULL, NULL);
- gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combobox),
+ gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combobox),
is_separator, NULL, NULL);
-
+
gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0);
/* GtkComboBox dynamic list */
tmp = gtk_frame_new ("GtkComboBox (dynamic list)");
- gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
@@ -1187,14 +1187,14 @@ main (int argc, char **argv)
renderer,
set_sensitive,
NULL, NULL);
- gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combobox),
+ gtk_combo_box_set_row_separator_func (GTK_COMBO_BOX (combobox),
is_separator, NULL, NULL);
-
+
gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0);
/* GtkComboBox custom entry */
tmp = gtk_frame_new ("GtkComboBox (custom)");
- gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
@@ -1248,13 +1248,13 @@ main (int argc, char **argv)
color.alpha = 1.0;
gtk_cell_view_set_background_rgba (GTK_CELL_VIEW (tmp), &color);
displayed_row_changed (GTK_COMBO_BOX (combobox), GTK_CELL_VIEW (tmp));
- g_signal_connect (combobox, "changed", G_CALLBACK (displayed_row_changed), tmp);
-
+ g_signal_connect (combobox, "changed", G_CALLBACK (displayed_row_changed), tmp);
+
gtk_container_add (GTK_CONTAINER (combobox), tmp);
/* GtkComboBox tree */
tmp = gtk_frame_new ("GtkComboBox (tree)");
- gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
@@ -1298,19 +1298,19 @@ main (int argc, char **argv)
/* GtkComboBox (grid mode) */
tmp = gtk_frame_new ("GtkComboBox (grid mode)");
- gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
gtk_container_add (GTK_CONTAINER (tmp), boom);
comboboxgrid = create_combo_box_grid_demo ();
- gtk_box_pack_start (GTK_BOX (boom), comboboxgrid, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (boom), comboboxgrid, FALSE, FALSE);
/* GtkComboBoxEntry */
tmp = gtk_frame_new ("GtkComboBox with entry");
- gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
@@ -1323,7 +1323,7 @@ main (int argc, char **argv)
/* Phylogenetic tree */
tmp = gtk_frame_new ("What are you ?");
- gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
@@ -1341,12 +1341,12 @@ main (int argc, char **argv)
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combobox), renderer,
"text", 0,
NULL);
-
+
gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0);
/* Capitals */
tmp = gtk_frame_new ("Where are you ?");
- gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
@@ -1378,7 +1378,7 @@ main (int argc, char **argv)
/* Aligned Food */
tmp = gtk_frame_new ("Hungry ?");
- gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
@@ -1413,7 +1413,7 @@ main (int argc, char **argv)
/* Ellipsizing growing combos */
tmp = gtk_frame_new ("Unconstrained Menu");
- gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (boom), 5);
@@ -1433,7 +1433,7 @@ main (int argc, char **argv)
gtk_combo_box_set_popup_fixed_width (GTK_COMBO_BOX (combobox), FALSE);
tmp = gtk_frame_new ("Looong");
- gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
combobox = gtk_combo_box_text_new ();
for (i = 0; i < 200; i++)
{
diff --git a/tests/testcombochange.c b/tests/testcombochange.c
index fdd4772..9b5c1ec 100644
--- a/tests/testcombochange.c
+++ b/tests/testcombochange.c
@@ -248,29 +248,29 @@ main (int argc, char **argv)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
- gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE);
combo_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
- gtk_box_pack_start (GTK_BOX (hbox), combo_vbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), combo_vbox, FALSE, FALSE);
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label), "<b>Menu mode</b>");
- gtk_box_pack_start (GTK_BOX (combo_vbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (combo_vbox), label, FALSE, FALSE);
menu_combo = create_combo ("menu-combo", FALSE);
gtk_widget_set_margin_start (menu_combo, 12);
- gtk_box_pack_start (GTK_BOX (combo_vbox), menu_combo, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (combo_vbox), menu_combo, FALSE, FALSE);
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label), "<b>List mode</b>");
- gtk_box_pack_start (GTK_BOX (combo_vbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (combo_vbox), label, FALSE, FALSE);
list_combo = create_combo ("list-combo", TRUE);
gtk_widget_set_margin_start (list_combo, 12);
- gtk_box_pack_start (GTK_BOX (combo_vbox), list_combo, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (combo_vbox), list_combo, FALSE, FALSE);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
- gtk_box_pack_start (GTK_BOX (hbox), scrolled_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), scrolled_window, TRUE, TRUE);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -281,24 +281,24 @@ main (int argc, char **argv)
gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
- gtk_box_pack_start (GTK_BOX (hbox), button_vbox, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (hbox), button_vbox, FALSE, FALSE);
+
gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 300);
button = gtk_button_new_with_label ("Insert");
- gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE);
g_signal_connect (button, "clicked", G_CALLBACK (on_insert), NULL);
-
+
button = gtk_button_new_with_label ("Delete");
- gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE);
g_signal_connect (button, "clicked", G_CALLBACK (on_delete), NULL);
button = gtk_button_new_with_label ("Reorder");
- gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE);
g_signal_connect (button, "clicked", G_CALLBACK (on_reorder), NULL);
button = gtk_button_new_with_label ("Animate");
- gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE);
g_signal_connect (button, "clicked", G_CALLBACK (on_animate), NULL);
gtk_widget_show_all (dialog);
diff --git a/tests/testellipsise.c b/tests/testellipsise.c
index 6e78ff2..9d1397e 100644
--- a/tests/testellipsise.c
+++ b/tests/testellipsise.c
@@ -153,9 +153,9 @@ main (int argc, char *argv[])
gtk_widget_set_app_paintable (ebox, TRUE);
gtk_container_add (GTK_CONTAINER (ebox), label);
- gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), ebox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, TRUE);
+ gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, TRUE);
+ gtk_box_pack_start (GTK_BOX (vbox), ebox, TRUE, TRUE);
g_object_set_data (G_OBJECT (label), "combo", combo);
diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c
index 16f7f10..a45c2c9 100644
--- a/tests/testentrycompletion.c
+++ b/tests/testentrycompletion.c
@@ -310,7 +310,7 @@ main (int argc, char *argv[])
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for
example.");
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
/* Create our first entry */
entry = gtk_entry_new ();
@@ -395,23 +395,23 @@ main (int argc, char *argv[])
gdk_threads_add_timeout (1000, (GSourceFunc) animation_timer, completion);
/* Fourth entry */
- gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Model-less entry completion"), FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Model-less entry completion"), FALSE, FALSE);
entry = gtk_entry_new ();
/* Create the completion object */
completion = gtk_entry_completion_new ();
-
+
/* Assign the completion to the entry */
gtk_entry_set_completion (GTK_ENTRY (entry), completion);
g_object_unref (completion);
-
+
gtk_container_add (GTK_CONTAINER (vbox), entry);
gtk_widget_show_all (window);
gtk_main ();
-
+
return 0;
}
diff --git a/tests/testexpand.c b/tests/testexpand.c
index 3832070..028b64c 100644
--- a/tests/testexpand.c
+++ b/tests/testexpand.c
@@ -55,30 +55,30 @@ create_box_window (void)
gtk_box_pack_start (GTK_BOX (box1),
gtk_label_new ("VBox 1 Top"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (box1),
box2,
- FALSE, TRUE, 0);
+ FALSE, TRUE);
gtk_box_pack_end (GTK_BOX (box1),
gtk_label_new ("VBox 1 Bottom"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (box2),
gtk_label_new ("HBox 2 Left"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (box2),
box3,
- FALSE, TRUE, 0);
+ FALSE, TRUE);
gtk_box_pack_end (GTK_BOX (box2),
gtk_label_new ("HBox 2 Right"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (box3),
gtk_label_new ("VBox 3 Top"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
gtk_box_pack_end (GTK_BOX (box3),
gtk_label_new ("VBox 3 Bottom"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
colorbox = gtk_frame_new (NULL);
@@ -90,7 +90,7 @@ create_box_window (void)
G_CALLBACK (on_toggle_hexpand), NULL);
gtk_container_add (GTK_CONTAINER (colorbox), toggle);
- gtk_box_pack_start (GTK_BOX (box3), colorbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box3), colorbox, FALSE, TRUE);
colorbox = gtk_frame_new (NULL);
@@ -101,7 +101,7 @@ create_box_window (void)
g_signal_connect (G_OBJECT (toggle), "toggled",
G_CALLBACK (on_toggle_vexpand), NULL);
gtk_container_add (GTK_CONTAINER (colorbox), toggle);
- gtk_box_pack_start (GTK_BOX (box3), colorbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box3), colorbox, FALSE, TRUE);
gtk_container_add (GTK_CONTAINER (window), box1);
gtk_widget_show_all (window);
diff --git a/tests/testexpander.c b/tests/testexpander.c
index c0f6cfe..61329dc 100644
--- a/tests/testexpander.c
+++ b/tests/testexpander.c
@@ -72,7 +72,7 @@ main (int argc, char *argv[])
"resize the window. Do it already !", -1);
gtk_container_add (GTK_CONTAINER (sw), tv);
gtk_container_add (GTK_CONTAINER (expander), sw);
- gtk_box_pack_end (GTK_BOX (area), expander, TRUE, TRUE, 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), dialog);
diff --git a/tests/testfilechooserbutton.c b/tests/testfilechooserbutton.c
index 1a4b6b9..6a02d46 100644
--- a/tests/testfilechooserbutton.c
+++ b/tests/testfilechooserbutton.c
@@ -135,25 +135,25 @@ tests_button_clicked_cb (GtkButton *real_button,
button = gtk_button_new_with_label ("Print Selected Path");
g_signal_connect (button, "clicked",
G_CALLBACK (print_selected_path_clicked_cb), user_data);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
gtk_widget_show (button);
button = gtk_button_new_with_label ("Add $PWD's Parent as Shortcut");
g_signal_connect (button, "clicked",
G_CALLBACK (add_pwds_parent_as_shortcut_clicked_cb), user_data);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
gtk_widget_show (button);
button = gtk_button_new_with_label ("Remove $PWD's Parent as Shortcut");
g_signal_connect (button, "clicked",
G_CALLBACK (del_pwds_parent_as_shortcut_clicked_cb), user_data);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
gtk_widget_show (button);
button = gtk_button_new_with_label ("Unselect all");
g_signal_connect (button, "clicked",
G_CALLBACK (unselect_all_clicked_cb), user_data);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
gtk_widget_show (button);
g_signal_connect (tests, "delete-event", G_CALLBACK (delete_event_cb), NULL);
@@ -256,27 +256,27 @@ main (int argc,
frame = gtk_frame_new ("<b>GtkFileChooserButton</b>");
gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
gtk_label_set_use_markup (GTK_LABEL (gtk_frame_get_label_widget (GTK_FRAME (frame))), TRUE);
- gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
gtk_widget_set_halign (frame, GTK_ALIGN_FILL);
gtk_widget_set_valign (frame, GTK_ALIGN_FILL);
g_object_set (frame, "margin-top", 6, "margin-start", 12, NULL);
-
+
label_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
-
+
group_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
gtk_container_add (GTK_CONTAINER (frame), group_box);
/* OPEN */
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
- gtk_box_pack_start (GTK_BOX (group_box), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (group_box), hbox, FALSE, FALSE);
label = gtk_label_new_with_mnemonic ("_Open:");
gtk_size_group_add_widget (GTK_SIZE_GROUP (label_group), label);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
G_GNUC_END_IGNORE_DEPRECATIONS
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
chooser = gtk_file_chooser_button_new ("Select A File - testfilechooserbutton",
GTK_FILE_CHOOSER_ACTION_OPEN);
@@ -288,22 +288,22 @@ G_GNUC_END_IGNORE_DEPRECATIONS
g_signal_connect (chooser, "selection-changed", G_CALLBACK (chooser_selection_changed_cb), NULL);
g_signal_connect (chooser, "file-activated", G_CALLBACK (chooser_file_activated_cb), NULL);
g_signal_connect (chooser, "update-preview", G_CALLBACK (chooser_update_preview_cb), NULL);
- gtk_box_pack_start (GTK_BOX (hbox), chooser, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), chooser, TRUE, TRUE);
button = gtk_button_new_with_label ("Tests");
g_signal_connect (button, "clicked", G_CALLBACK (tests_button_clicked_cb), chooser);
- gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
/* SELECT_FOLDER */
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
- gtk_box_pack_start (GTK_BOX (group_box), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (group_box), hbox, FALSE, FALSE);
label = gtk_label_new_with_mnemonic ("Select _Folder:");
gtk_size_group_add_widget (GTK_SIZE_GROUP (label_group), label);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
G_GNUC_END_IGNORE_DEPRECATIONS
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
chooser = gtk_file_chooser_button_new ("Select A Folder - testfilechooserbutton",
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
@@ -316,11 +316,11 @@ G_GNUC_END_IGNORE_DEPRECATIONS
g_signal_connect (chooser, "selection-changed", G_CALLBACK (chooser_selection_changed_cb), NULL);
g_signal_connect (chooser, "file-activated", G_CALLBACK (chooser_file_activated_cb), NULL);
g_signal_connect (chooser, "update-preview", G_CALLBACK (chooser_update_preview_cb), NULL);
- gtk_box_pack_start (GTK_BOX (hbox), chooser, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), chooser, TRUE, TRUE);
button = gtk_button_new_with_label ("Tests");
g_signal_connect (button, "clicked", G_CALLBACK (tests_button_clicked_cb), chooser);
- gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
g_object_unref (label_group);
diff --git a/tests/testflowbox.c b/tests/testflowbox.c
index ad18121..3cccd6e 100644
--- a/tests/testflowbox.c
+++ b/tests/testflowbox.c
@@ -441,14 +441,14 @@ create_window (void)
gtk_widget_show (vbox);
gtk_widget_show (hbox);
gtk_container_add (GTK_CONTAINER (window), hbox);
- gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE);
swindow = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
gtk_widget_show (swindow);
- gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE, TRUE);
flowbox = gtk_flow_box_new ();
gtk_widget_set_halign (flowbox, GTK_ALIGN_END);
@@ -477,14 +477,14 @@ create_window (void)
gtk_widget_show (flowbox_cntl);
gtk_widget_show (expander);
gtk_container_add (GTK_CONTAINER (expander), flowbox_cntl);
- gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE);
widget = gtk_check_button_new_with_label ("Homogeneous");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
gtk_widget_show (widget);
gtk_widget_set_tooltip_text (widget, "Set whether the items should be displayed at the same size");
- gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "toggled",
G_CALLBACK (homogeneous_toggled), flowbox);
@@ -495,7 +495,7 @@ create_window (void)
flowbox, "activate-on-single-click",
G_BINDING_SYNC_CREATE);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
/* Add alignment controls */
widget = gtk_combo_box_text_new ();
@@ -507,7 +507,7 @@ create_window (void)
gtk_widget_show (widget);
gtk_widget_set_tooltip_text (widget, "Set the horizontal alignment policy");
- gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (horizontal_alignment_changed), flowbox);
@@ -521,7 +521,7 @@ create_window (void)
gtk_widget_show (widget);
gtk_widget_set_tooltip_text (widget, "Set the vertical alignment policy");
- gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (vertical_alignment_changed), flowbox);
@@ -534,7 +534,7 @@ create_window (void)
gtk_widget_show (widget);
gtk_widget_set_tooltip_text (widget, "Set the flowbox orientation");
- gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (orientation_changed), flowbox);
@@ -549,7 +549,7 @@ create_window (void)
gtk_widget_show (widget);
gtk_widget_set_tooltip_text (widget, "Set the selection mode");
- gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (selection_mode_changed), flowbox);
@@ -560,7 +560,7 @@ create_window (void)
gtk_widget_show (widget);
gtk_widget_set_tooltip_text (widget, "Set the minimum amount of items per line before wrapping");
- gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (line_length_changed), flowbox);
@@ -573,7 +573,7 @@ create_window (void)
gtk_widget_show (widget);
gtk_widget_set_tooltip_text (widget, "Set the natural amount of items per line ");
- gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (max_line_length_changed), flowbox);
@@ -586,42 +586,42 @@ create_window (void)
widget = gtk_label_new ("H Spacing");
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
widget = gtk_spin_button_new_with_range (0, 30, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), INITIAL_CSPACING);
gtk_widget_show (widget);
gtk_widget_set_tooltip_text (widget, "Set the horizontal spacing between children");
- gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (spacing_changed), GINT_TO_POINTER (GTK_ORIENTATION_HORIZONTAL));
g_signal_connect (G_OBJECT (widget), "value-changed",
G_CALLBACK (spacing_changed), GINT_TO_POINTER (GTK_ORIENTATION_HORIZONTAL));
- gtk_box_pack_start (GTK_BOX (flowbox_cntl), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (flowbox_cntl), hbox, FALSE, FALSE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
gtk_widget_show (hbox);
widget = gtk_label_new ("V Spacing");
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
widget = gtk_spin_button_new_with_range (0, 30, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), INITIAL_RSPACING);
gtk_widget_show (widget);
gtk_widget_set_tooltip_text (widget, "Set the vertical spacing between children");
- gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (spacing_changed), GINT_TO_POINTER (GTK_ORIENTATION_VERTICAL));
g_signal_connect (G_OBJECT (widget), "value-changed",
G_CALLBACK (spacing_changed), GINT_TO_POINTER (GTK_ORIENTATION_VERTICAL));
- gtk_box_pack_start (GTK_BOX (flowbox_cntl), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (flowbox_cntl), hbox, FALSE, FALSE);
/* filtering and sorting */
@@ -630,7 +630,7 @@ create_window (void)
gtk_widget_show (widget);
gtk_widget_set_tooltip_text (widget, "Set whether some items should be filtered out");
- gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "toggled",
G_CALLBACK (filter_toggled), flowbox);
@@ -640,7 +640,7 @@ create_window (void)
gtk_widget_show (widget);
gtk_widget_set_tooltip_text (widget, "Set whether items should be sorted");
- gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "toggled",
G_CALLBACK (sort_toggled), flowbox);
@@ -653,7 +653,7 @@ create_window (void)
gtk_widget_show (items_cntl);
gtk_widget_show (expander);
gtk_container_add (GTK_CONTAINER (expander), items_cntl);
- gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE);
/* Add Items control */
widget = gtk_combo_box_text_new ();
@@ -667,7 +667,7 @@ create_window (void)
gtk_widget_show (widget);
gtk_widget_set_tooltip_text (widget, "Set the item set to use");
- gtk_box_pack_start (GTK_BOX (items_cntl), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (items_cntl), widget, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (items_changed), flowbox);
@@ -681,7 +681,7 @@ create_window (void)
gtk_widget_show (widget);
gtk_widget_set_tooltip_text (widget, "Set the item's text orientation (cant be done for stock buttons)");
- gtk_box_pack_start (GTK_BOX (items_cntl), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (items_cntl), widget, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (text_orientation_changed), flowbox);
diff --git a/tests/testframe.c b/tests/testframe.c
index 0ab8a7a..22d4055 100644
--- a/tests/testframe.c
+++ b/tests/testframe.c
@@ -148,13 +148,13 @@ int main (int argc, char **argv)
gtk_container_add (GTK_CONTAINER (window), vbox);
frame = gtk_frame_new ("Testing");
- gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
button = gtk_button_new_with_label ("Hello!");
gtk_container_add (GTK_CONTAINER (frame), button);
grid = gtk_grid_new ();
- gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), grid, FALSE, FALSE);
context = gtk_widget_get_style_context (frame);
gtk_style_context_save (context);
diff --git a/tests/testgiconpixbuf.c b/tests/testgiconpixbuf.c
index 184bbe3..ab52c97 100644
--- a/tests/testgiconpixbuf.c
+++ b/tests/testgiconpixbuf.c
@@ -36,30 +36,30 @@ main (int argc,
gtk_container_add (GTK_CONTAINER (toplevel), hbox);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
- gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE);
image = gtk_image_new_from_gicon (G_ICON (pixbuf), GTK_ICON_SIZE_DIALOG);
- gtk_box_pack_start (GTK_BOX (vbox), image, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), image, FALSE, FALSE);
label = gtk_label_new (NULL);
str = g_strdup_printf ("Normal icon, hash %u", g_icon_hash (G_ICON (pixbuf)));
gtk_label_set_label (GTK_LABEL (label), str);
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
otherpix = gdk_pixbuf_new_from_file ("gnome-textfile.png", NULL);
emblem = g_emblem_new (G_ICON (otherpix));
emblemed = g_emblemed_icon_new (G_ICON (pixbuf), emblem);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
- gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE);
+
image2 = gtk_image_new_from_gicon (emblemed, GTK_ICON_SIZE_DIALOG);
- gtk_box_pack_start (GTK_BOX (vbox), image2, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), image2, FALSE, FALSE);
label = gtk_label_new (NULL);
str = g_strdup_printf ("Emblemed icon, hash %u", g_icon_hash (emblemed));
gtk_label_set_label (GTK_LABEL (label), str);
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
gtk_widget_show_all (toplevel);
diff --git a/tests/testgrid.c b/tests/testgrid.c
index aabb708..394caac 100644
--- a/tests/testgrid.c
+++ b/tests/testgrid.c
@@ -144,21 +144,21 @@ box_comparison (void)
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_add (GTK_CONTAINER (vbox), box);
- gtk_box_pack_start (GTK_BOX (box), test_widget ("1", "white"), FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), test_widget ("1", "white"), FALSE, FALSE);
label = gtk_label_new ("Some ellipsizing text");
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_label_set_width_chars (GTK_LABEL (label), 10);
- gtk_box_pack_start (GTK_BOX (box), label, TRUE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), label, TRUE, FALSE);
- gtk_box_pack_start (GTK_BOX (box), test_widget ("2", "green"), FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), test_widget ("2", "green"), FALSE, FALSE);
label = gtk_label_new ("Some text that may wrap if needed");
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_label_set_width_chars (GTK_LABEL (label), 10);
- gtk_box_pack_start (GTK_BOX (box), label, TRUE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), label, TRUE, FALSE);
- gtk_box_pack_start (GTK_BOX (box), test_widget ("3", "red"), FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), test_widget ("3", "red"), FALSE, FALSE);
grid = gtk_grid_new ();
gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_VERTICAL);
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 32a831a..9b5104c 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -217,12 +217,12 @@ build_alpha_widgets (void)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label), "<i>Entry: </i>");
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
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);
gtk_widget_set_hexpand (hbox, TRUE);
gtk_grid_attach (GTK_GRID (grid), hbox, 0, 3, 2, 1);
-
+
return grid;
}
@@ -280,32 +280,32 @@ create_alpha_window (GtkWidget *widget)
G_CALLBACK (on_alpha_window_draw), NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
+
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
gtk_box_pack_start (GTK_BOX (content_area), vbox,
- TRUE, TRUE, 0);
+ TRUE, TRUE);
label = gtk_label_new (NULL);
- gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE);
on_alpha_screen_changed (GTK_WINDOW (window), NULL, label);
g_signal_connect (window, "screen-changed",
G_CALLBACK (on_alpha_screen_changed), label);
-
+
label = gtk_label_new (NULL);
- gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE);
on_composited_changed (window, GTK_LABEL (label));
g_signal_connect (window, "composited_changed", G_CALLBACK (on_composited_changed), label);
-
- gtk_box_pack_start (GTK_BOX (vbox), build_alpha_widgets (), TRUE, TRUE, 0);
+
+ gtk_box_pack_start (GTK_BOX (vbox), build_alpha_widgets (), TRUE, TRUE);
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed),
&window);
-
+
g_signal_connect (window, "response",
G_CALLBACK (gtk_widget_destroy),
- NULL);
+ NULL);
}
if (!gtk_widget_get_visible (window))
@@ -588,7 +588,7 @@ create_big_windows (GtkWidget *widget)
content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
grid = gtk_grid_new ();
- gtk_box_pack_start (GTK_BOX (content_area), grid, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), grid, TRUE, TRUE);
darea = gtk_drawing_area_new ();
@@ -675,7 +675,7 @@ create_buttons (GtkWidget *widget)
gtk_grid_set_row_spacing (GTK_GRID (grid), 5);
gtk_grid_set_column_spacing (GTK_GRID (grid), 5);
gtk_container_set_border_width (GTK_CONTAINER (grid), 10);
- gtk_box_pack_start (GTK_BOX (box1), grid, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), grid, TRUE, TRUE);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
button[0] = gtk_button_new_with_label ("button1");
@@ -702,17 +702,17 @@ create_buttons (GtkWidget *widget)
}
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
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);
button[9] = gtk_button_new_with_label ("close");
g_signal_connect_swapped (button[9], "clicked",
G_CALLBACK (gtk_widget_destroy),
window);
- gtk_box_pack_start (GTK_BOX (box2), button[9], TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button[9], TRUE, TRUE);
gtk_widget_set_can_default (button[9], TRUE);
gtk_widget_grab_default (button[9]);
}
@@ -754,33 +754,33 @@ create_toggle_buttons (GtkWidget *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, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
button = gtk_toggle_button_new_with_label ("button1");
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
button = gtk_toggle_button_new_with_label ("button2");
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
button = gtk_toggle_button_new_with_label ("button3");
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
button = gtk_toggle_button_new_with_label ("inconsistent");
gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (button), TRUE);
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
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);
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);
}
@@ -877,30 +877,30 @@ create_check_buttons (GtkWidget *widget)
NULL);
box1 = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
+
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, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
button = gtk_check_button_new_with_mnemonic ("_button1");
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
button = gtk_check_button_new_with_label ("button2");
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
button = gtk_check_button_new_with_label ("button3");
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
button = gtk_check_button_new_with_label ("inconsistent");
gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (button), TRUE);
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
table = create_widget_grid (GTK_TYPE_CHECK_BUTTON);
gtk_container_set_border_width (GTK_CONTAINER (table), 10);
- gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE);
}
if (!gtk_widget_get_visible (window))
@@ -945,58 +945,58 @@ create_radio_buttons (GtkWidget *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, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
button = gtk_radio_button_new_with_label (NULL, "button1");
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
button = gtk_radio_button_new_with_label (
gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)),
"button2");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
button = gtk_radio_button_new_with_label (
gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)),
"button3");
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
button = gtk_radio_button_new_with_label (
gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)),
"inconsistent");
gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (button), TRUE);
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
-
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
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, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
button = gtk_radio_button_new_with_label (NULL, "button4");
gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
button = gtk_radio_button_new_with_label (
gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)),
"button5");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
button = gtk_radio_button_new_with_label (
gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)),
"button6");
gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (button), FALSE);
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
table = create_widget_grid (GTK_TYPE_RADIO_BUTTON);
gtk_container_set_border_width (GTK_CONTAINER (table), 10);
- gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE);
}
if (!gtk_widget_get_visible (window))
@@ -1070,60 +1070,64 @@ create_button_box (GtkWidget *widget)
main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
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);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
gtk_container_add (GTK_CONTAINER (frame_horz), vbox);
-
- gtk_box_pack_start (GTK_BOX (vbox),
+
+ gtk_box_pack_start (GTK_BOX (vbox),
create_bbox (TRUE, "Spread", 40, 85, 20, GTK_BUTTONBOX_SPREAD),
- TRUE, TRUE, 0);
-
- gtk_box_pack_start (GTK_BOX (vbox),
+ TRUE, TRUE);
+
+ gtk_box_pack_start (GTK_BOX (vbox),
create_bbox (TRUE, "Edge", 40, 85, 20, GTK_BUTTONBOX_EDGE),
- TRUE, TRUE, 5);
-
- gtk_box_pack_start (GTK_BOX (vbox),
+ TRUE, TRUE);
+
+ gtk_box_pack_start (GTK_BOX (vbox),
create_bbox (TRUE, "Start", 40, 85, 20, GTK_BUTTONBOX_START),
- TRUE, TRUE, 5);
-
- gtk_box_pack_start (GTK_BOX (vbox),
+ TRUE, TRUE);
+
+ gtk_box_pack_start (GTK_BOX (vbox),
create_bbox (TRUE, "End", 40, 85, 20, GTK_BUTTONBOX_END),
- TRUE, TRUE, 5);
-
+ TRUE, TRUE);
+
gtk_box_pack_start (GTK_BOX (vbox),
create_bbox (TRUE, "Center", 40, 85, 20, GTK_BUTTONBOX_CENTER),
- 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_widget_set_margin_top (frame_vert, 10);
+ gtk_widget_set_margin_bottom (frame_vert, 10);
+ gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE);
+
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
- gtk_box_pack_start (GTK_BOX (hbox),
+ gtk_box_pack_start (GTK_BOX (hbox),
create_bbox (FALSE, "Spread", 30, 85, 20, GTK_BUTTONBOX_SPREAD),
- TRUE, TRUE, 0);
-
- gtk_box_pack_start (GTK_BOX (hbox),
+ TRUE, TRUE);
+
+ gtk_box_pack_start (GTK_BOX (hbox),
create_bbox (FALSE, "Edge", 30, 85, 20, GTK_BUTTONBOX_EDGE),
- TRUE, TRUE, 5);
-
- gtk_box_pack_start (GTK_BOX (hbox),
+ TRUE, TRUE);
+
+ gtk_box_pack_start (GTK_BOX (hbox),
create_bbox (FALSE, "Start", 30, 85, 20, GTK_BUTTONBOX_START),
- TRUE, TRUE, 5);
-
- gtk_box_pack_start (GTK_BOX (hbox),
+ TRUE, TRUE);
+
+ gtk_box_pack_start (GTK_BOX (hbox),
create_bbox (FALSE, "End", 30, 85, 20, GTK_BUTTONBOX_END),
- TRUE, TRUE, 5);
-
+ TRUE, TRUE);
+
gtk_box_pack_start (GTK_BOX (hbox),
create_bbox (FALSE, "Center", 30, 85, 20, GTK_BUTTONBOX_CENTER),
- TRUE, TRUE, 5);
+ TRUE, TRUE);
}
if (!gtk_widget_get_visible (window))
@@ -1430,10 +1434,10 @@ create_statusbar (GtkWidget *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, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
statusbar = gtk_statusbar_new ();
- gtk_box_pack_end (GTK_BOX (box1), statusbar, TRUE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (box1), statusbar, TRUE, TRUE);
g_signal_connect (statusbar,
"text_popped",
G_CALLBACK (statusbar_popped),
@@ -1479,19 +1483,19 @@ create_statusbar (GtkWidget *widget)
NULL),
"signal_after::clicked", statusbar_push_long, statusbar,
NULL);
-
+
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
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);
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);
}
@@ -1543,64 +1547,64 @@ create_alpha_widgets (GtkWidget *widget)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_box_pack_start (GTK_BOX (main_hbox), vbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (main_hbox), vbox, FALSE, FALSE);
/* Plain button (no gdkwindows */
label = gtk_label_new ("non-window widget");
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
alpha1 = button = gtk_button_new_with_label ("A Button");
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
/* windowed container with both windowed and normal button */
label = gtk_label_new ("\nwindow widget");
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
alpha2 = event_box = gtk_event_box_new ();
- gtk_box_pack_start (GTK_BOX (vbox), event_box, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), event_box, FALSE, FALSE);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (event_box), vbox2);
button = gtk_button_new_with_label ("A Button");
- gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE);
event_box = gtk_event_box_new ();
button = gtk_button_new_with_label ("A Button (in window)");
gtk_container_add (GTK_CONTAINER (event_box), button);
- gtk_box_pack_start (GTK_BOX (vbox2), event_box, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), event_box, FALSE, FALSE);
/* non-windowed container with both windowed and normal button */
label = gtk_label_new ("\nnon-window widget with widget child");
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
alpha3 = vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE);
button = gtk_button_new_with_label ("A Button");
- gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE);
event_box = gtk_event_box_new ();
button = gtk_button_new_with_label ("A Button (in window)");
gtk_container_add (GTK_CONTAINER (event_box), button);
- gtk_box_pack_start (GTK_BOX (vbox2), event_box, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), event_box, FALSE, FALSE);
scale = gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL,
0, 100, 1);
- gtk_box_pack_start (GTK_BOX (main_hbox), scale, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (main_hbox), scale, FALSE, FALSE);
g_signal_connect (scale, "value_changed", G_CALLBACK (alpha_changed), alpha1);
gtk_range_set_value (GTK_RANGE (scale), 50);
scale = gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL,
0, 100, 1);
- gtk_box_pack_start (GTK_BOX (main_hbox), scale, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (main_hbox), scale, FALSE, FALSE);
g_signal_connect (scale, "value_changed", G_CALLBACK (alpha_changed), alpha2);
gtk_range_set_value (GTK_RANGE (scale), 50);
scale = gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL,
0, 100, 1);
- gtk_box_pack_start (GTK_BOX (main_hbox), scale, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (main_hbox), scale, FALSE, FALSE);
g_signal_connect (scale, "value_changed", G_CALLBACK (alpha_changed), alpha3);
gtk_range_set_value (GTK_RANGE (scale), 50);
@@ -1760,50 +1764,50 @@ void create_labels (GtkWidget *widget)
gtk_window_set_title (GTK_WINDOW (window), "Label");
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-
+
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_container_add (GTK_CONTAINER (window), vbox);
- gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE);
button = create_sensitivity_control (hbox);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
button = create_selectable_control (hbox);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-
- gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
+
+ gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE);
gtk_container_set_border_width (GTK_CONTAINER (window), 5);
frame = gtk_frame_new ("Normal Label");
label = gtk_label_new ("This is a Normal label");
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_START);
gtk_container_add (GTK_CONTAINER (frame), label);
- gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
frame = gtk_frame_new ("Multi-line Label");
label = gtk_label_new ("This is a Multi-line label.\nSecond line\nThird line");
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
gtk_container_add (GTK_CONTAINER (frame), label);
- gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
frame = gtk_frame_new ("Left Justified Label");
label = gtk_label_new ("This is a Left-Justified\nMulti-line label.\nThird line");
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_MIDDLE);
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_container_add (GTK_CONTAINER (frame), label);
- gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
frame = gtk_frame_new ("Right Justified Label");
gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_START);
label = gtk_label_new ("This is a Right-Justified\nMulti-line label.\nFourth line, (j/k)");
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
gtk_container_add (GTK_CONTAINER (frame), label);
- gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
frame = gtk_frame_new ("Internationalized Label");
label = gtk_label_new (NULL);
@@ -1816,13 +1820,13 @@ void create_labels (GtkWidget *widget)
"Japanese <span lang=\"ja\">\345\205\203\346\260\227
\351\226\213\347\231\272</span>");
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_container_add (GTK_CONTAINER (frame), label);
- gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
frame = gtk_frame_new ("Bidirection Label");
label = gtk_label_new ("\342\200\217Arabic \330\247\331\204\330\263\331\204\330\247\331\205
\330\271\331\204\331\212\331\203\331\205\n"
"\342\200\217Hebrew \327\251\327\234\327\225\327\235");
gtk_container_add (GTK_CONTAINER (frame), label);
- gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
frame = gtk_frame_new ("Links in a label");
label = gtk_label_new ("Some <a href=\"http://en.wikipedia.org/wiki/Text\" title=\"plain
text\">text</a> may be marked up\n"
@@ -1830,11 +1834,11 @@ void create_labels (GtkWidget *widget)
"or activated via <a href=\"keynav\">keynav</a>");
gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
gtk_container_add (GTK_CONTAINER (frame), label);
- gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
g_signal_connect (label, "activate-link", G_CALLBACK (activate_link), NULL);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
- gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE);
frame = gtk_frame_new ("Line wrapped label");
label = gtk_label_new ("This is an example of a line-wrapped label. It should not be taking "\
"up the entire "/* big space to test spacing */\
@@ -1846,7 +1850,7 @@ void create_labels (GtkWidget *widget)
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_container_add (GTK_CONTAINER (frame), label);
- gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
frame = gtk_frame_new ("Filled, wrapped label");
label = gtk_label_new ("This is an example of a line-wrapped, filled label. It should be taking "\
@@ -1859,7 +1863,7 @@ void create_labels (GtkWidget *widget)
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_FILL);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_container_add (GTK_CONTAINER (frame), label);
- gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
frame = gtk_frame_new ("Underlined label");
label = gtk_label_new ("This label is underlined!\n"
@@ -1867,7 +1871,7 @@ void create_labels (GtkWidget *widget)
gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
gtk_label_set_pattern (GTK_LABEL (label), "_________________________ _ _________ _ _____ _ __ __ ___
____ _____");
gtk_container_add (GTK_CONTAINER (frame), label);
- gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
frame = gtk_frame_new ("Markup label");
label = gtk_label_new (NULL);
@@ -1892,11 +1896,11 @@ void create_labels (GtkWidget *widget)
"<span underline=\"double\">We like <sup>superscript</sup> and
<sub>subscript</sub> too</span>");
g_assert (gtk_label_get_mnemonic_keyval (GTK_LABEL (label)) == GDK_KEY_s);
-
+
gtk_container_add (GTK_CONTAINER (frame), label);
- gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
}
-
+
if (!gtk_widget_get_visible (window))
gtk_widget_show_all (window);
else
@@ -1941,30 +1945,30 @@ create_rotated_label (GtkWidget *widget)
content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
- gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label), "Hello World\n<i>Rotate</i> <span underline='single'
foreground='blue'>me</span>");
- gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE);
scale_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (vbox), scale_hbox, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), scale_hbox, FALSE, FALSE);
+
scale_label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (scale_label), "<i>Angle: </i>");
- gtk_box_pack_start (GTK_BOX (scale_hbox), scale_label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (scale_hbox), scale_label, FALSE, FALSE);
hscale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
0, 360, 5);
g_signal_connect (hscale, "value-changed",
G_CALLBACK (on_angle_scale_changed), label);
-
+
gtk_range_set_value (GTK_RANGE (hscale), 45);
gtk_widget_set_size_request (hscale, 200, -1);
- gtk_box_pack_start (GTK_BOX (scale_hbox), hscale, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (scale_hbox), hscale, TRUE, TRUE);
}
-
+
if (!gtk_widget_get_visible (window))
gtk_widget_show_all (window);
else
@@ -2074,24 +2078,24 @@ create_rotated_text (GtkWidget *widget)
content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
drawing_area = gtk_drawing_area_new ();
- gtk_box_pack_start (GTK_BOX (content_area), drawing_area, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), drawing_area, TRUE, TRUE);
tile_pixbuf = gdk_pixbuf_new_from_file ("marble.xpm", NULL);
-
+
g_signal_connect (drawing_area, "draw",
G_CALLBACK (on_rotated_text_draw), tile_pixbuf);
g_signal_connect (drawing_area, "unrealize",
G_CALLBACK (on_rotated_text_unrealize), NULL);
gtk_widget_show_all (gtk_bin_get_child (GTK_BIN (window)));
-
+
gtk_widget_set_size_request (drawing_area, DEFAULT_TEXT_RADIUS * 2, DEFAULT_TEXT_RADIUS * 2);
gtk_widget_get_preferred_size ( (window),
&requisition, NULL);
gtk_widget_set_size_request (drawing_area, -1, -1);
gtk_window_resize (GTK_WINDOW (window), requisition.width, requisition.height);
}
-
+
if (!gtk_widget_get_visible (window))
gtk_widget_show (window);
else
@@ -2162,12 +2166,12 @@ create_reparent (GtkWidget *widget)
box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
- gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
label = gtk_label_new ("Hello World");
frame = gtk_frame_new ("Frame 1");
- gtk_box_pack_start (GTK_BOX (box2), frame, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), frame, TRUE, TRUE);
box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (box3), 5);
@@ -2175,22 +2179,22 @@ create_reparent (GtkWidget *widget)
button = gtk_button_new_with_label ("switch");
g_object_set_data (G_OBJECT (button), "user_data", label);
- gtk_box_pack_start (GTK_BOX (box3), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box3), button, FALSE, TRUE);
event_box = gtk_event_box_new ();
- gtk_box_pack_start (GTK_BOX (box3), event_box, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box3), event_box, FALSE, TRUE);
gtk_container_add (GTK_CONTAINER (event_box), label);
-
+
g_signal_connect (button, "clicked",
G_CALLBACK (reparent_label),
event_box);
-
+
g_signal_connect (label, "parent_set",
G_CALLBACK (set_parent_signal),
GINT_TO_POINTER (42));
frame = gtk_frame_new ("Frame 2");
- gtk_box_pack_start (GTK_BOX (box2), frame, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), frame, TRUE, TRUE);
box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (box3), 5);
@@ -2198,26 +2202,26 @@ create_reparent (GtkWidget *widget)
button = gtk_button_new_with_label ("switch");
g_object_set_data (G_OBJECT (button), "user_data", label);
- gtk_box_pack_start (GTK_BOX (box3), button, FALSE, TRUE, 0);
-
+ gtk_box_pack_start (GTK_BOX (box3), button, FALSE, TRUE);
+
event_box = gtk_event_box_new ();
- gtk_box_pack_start (GTK_BOX (box3), event_box, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box3), event_box, FALSE, TRUE);
g_signal_connect (button, "clicked",
G_CALLBACK (reparent_label),
event_box);
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
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);
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);
}
@@ -2312,30 +2316,30 @@ create_resize_grips (GtkWidget *widget)
gtk_widget_get_screen (widget));
gtk_window_set_title (GTK_WINDOW (window), "resize grips");
-
+
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed),
&window);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), vbox);
-
+
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
/* North west */
area = gtk_drawing_area_new ();
gtk_widget_add_events (area, GDK_BUTTON_PRESS_MASK);
- gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE);
g_signal_connect (area, "draw", G_CALLBACK (grippy_draw),
GINT_TO_POINTER (GDK_WINDOW_EDGE_NORTH_WEST));
g_signal_connect (area, "button_press_event", G_CALLBACK (grippy_button_press),
GINT_TO_POINTER (GDK_WINDOW_EDGE_NORTH_WEST));
-
+
/* North */
area = gtk_drawing_area_new ();
gtk_widget_add_events (area, GDK_BUTTON_PRESS_MASK);
- gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE);
g_signal_connect (area, "draw", G_CALLBACK (grippy_draw),
GINT_TO_POINTER (GDK_WINDOW_EDGE_NORTH));
g_signal_connect (area, "button_press_event", G_CALLBACK (grippy_button_press),
@@ -2344,19 +2348,19 @@ create_resize_grips (GtkWidget *widget)
/* North east */
area = gtk_drawing_area_new ();
gtk_widget_add_events (area, GDK_BUTTON_PRESS_MASK);
- gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE);
g_signal_connect (area, "draw", G_CALLBACK (grippy_draw),
GINT_TO_POINTER (GDK_WINDOW_EDGE_NORTH_EAST));
g_signal_connect (area, "button_press_event", G_CALLBACK (grippy_button_press),
GINT_TO_POINTER (GDK_WINDOW_EDGE_NORTH_EAST));
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
/* West */
area = gtk_drawing_area_new ();
gtk_widget_add_events (area, GDK_BUTTON_PRESS_MASK);
- gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE);
g_signal_connect (area, "draw", G_CALLBACK (grippy_draw),
GINT_TO_POINTER (GDK_WINDOW_EDGE_WEST));
g_signal_connect (area, "button_press_event", G_CALLBACK (grippy_button_press),
@@ -2364,12 +2368,12 @@ create_resize_grips (GtkWidget *widget)
/* Middle */
area = gtk_drawing_area_new ();
- gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE);
/* East */
area = gtk_drawing_area_new ();
gtk_widget_add_events (area, GDK_BUTTON_PRESS_MASK);
- gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE);
g_signal_connect (area, "draw", G_CALLBACK (grippy_draw),
GINT_TO_POINTER (GDK_WINDOW_EDGE_EAST));
g_signal_connect (area, "button_press_event", G_CALLBACK (grippy_button_press),
@@ -2377,12 +2381,12 @@ create_resize_grips (GtkWidget *widget)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
/* South west */
area = gtk_drawing_area_new ();
gtk_widget_add_events (area, GDK_BUTTON_PRESS_MASK);
- gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE);
g_signal_connect (area, "draw", G_CALLBACK (grippy_draw),
GINT_TO_POINTER (GDK_WINDOW_EDGE_SOUTH_WEST));
g_signal_connect (area, "button_press_event", G_CALLBACK (grippy_button_press),
@@ -2390,16 +2394,16 @@ create_resize_grips (GtkWidget *widget)
/* South */
area = gtk_drawing_area_new ();
gtk_widget_add_events (area, GDK_BUTTON_PRESS_MASK);
- gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE);
g_signal_connect (area, "draw", G_CALLBACK (grippy_draw),
GINT_TO_POINTER (GDK_WINDOW_EDGE_SOUTH));
g_signal_connect (area, "button_press_event", G_CALLBACK (grippy_button_press),
GINT_TO_POINTER (GDK_WINDOW_EDGE_SOUTH));
-
+
/* South east */
area = gtk_drawing_area_new ();
gtk_widget_add_events (area, GDK_BUTTON_PRESS_MASK);
- gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), area, TRUE, TRUE);
g_signal_connect (area, "draw", G_CALLBACK (grippy_draw),
GINT_TO_POINTER (GDK_WINDOW_EDGE_SOUTH_EAST));
g_signal_connect (area, "button_press_event", G_CALLBACK (grippy_button_press),
@@ -2475,7 +2479,7 @@ create_saved_position (GtkWidget *widget)
gtk_window_set_screen (GTK_WINDOW (window),
gtk_widget_get_screen (widget));
-
+
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed),
@@ -2504,48 +2508,48 @@ create_saved_position (GtkWidget *widget)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
label = gtk_label_new ("X Origin : ");
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
x_label = gtk_label_new ("");
- gtk_box_pack_start (GTK_BOX (hbox), x_label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), x_label, TRUE, TRUE);
g_object_set_data (G_OBJECT (window), "x", x_label);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
label = gtk_label_new ("Y Origin : ");
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
y_label = gtk_label_new ("");
- gtk_box_pack_start (GTK_BOX (hbox), y_label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), y_label, TRUE, TRUE);
g_object_set_data (G_OBJECT (window), "y", y_label);
any =
g_object_new (gtk_separator_get_type (),
"GtkWidget::visible", TRUE,
NULL);
- gtk_box_pack_start (GTK_BOX (main_vbox), any, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (main_vbox), any, FALSE, TRUE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
- gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE);
button = gtk_button_new_with_label ("Close");
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy),
window);
- gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
gtk_widget_set_can_default (button, TRUE);
gtk_widget_grab_default (button);
-
+
gtk_widget_show_all (window);
}
else
@@ -2589,10 +2593,10 @@ create_pixbuf (GtkWidget *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, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
button = gtk_button_new ();
- gtk_box_pack_start (GTK_BOX (box2), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, FALSE, FALSE);
gdk_window = gtk_widget_get_window (window);
@@ -2606,7 +2610,7 @@ create_pixbuf (GtkWidget *widget)
gtk_container_add (GTK_CONTAINER (button), box3);
button = gtk_button_new ();
- gtk_box_pack_start (GTK_BOX (box2), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, FALSE, FALSE);
pixbufwid = new_pixbuf ("test.xpm", gdk_window);
@@ -2618,19 +2622,19 @@ create_pixbuf (GtkWidget *widget)
gtk_container_add (GTK_CONTAINER (button), box3);
gtk_widget_set_sensitive (button, FALSE);
-
+
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
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);
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);
}
@@ -2671,15 +2675,15 @@ create_tooltips (GtkWidget *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, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
button = gtk_toggle_button_new_with_label ("button1");
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
gtk_widget_set_tooltip_text (button, "This is button 1");
button = gtk_toggle_button_new_with_label ("button2");
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
gtk_widget_set_tooltip_text (button,
"This is button 2. This is also a really long tooltip which probably "
@@ -2687,7 +2691,7 @@ create_tooltips (GtkWidget *widget)
"Hopefully the wrapping will work correctly.");
toggle = gtk_toggle_button_new_with_label ("Override TipsQuery Label");
- gtk_box_pack_start (GTK_BOX (box2), toggle, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), toggle, TRUE, TRUE);
gtk_widget_set_tooltip_text (toggle, "Toggle TipsQuery view.");
@@ -2706,9 +2710,9 @@ create_tooltips (GtkWidget *widget)
"visible", TRUE,
"parent", box3,
NULL);
- gtk_box_set_child_packing (GTK_BOX (box3), button, FALSE, FALSE, 0, GTK_PACK_START);
+ gtk_box_set_child_packing (GTK_BOX (box3), button, FALSE, FALSE, GTK_PACK_START);
gtk_widget_set_tooltip_text (button, "Start the Tooltips Inspector");
-
+
frame = g_object_new (gtk_frame_get_type (),
"label", "ToolTips Inspector",
"label_xalign", (double) 0.5,
@@ -2717,20 +2721,20 @@ create_tooltips (GtkWidget *widget)
"parent", box2,
"child", box3,
NULL);
- gtk_box_set_child_packing (GTK_BOX (box2), frame, TRUE, TRUE, 10, GTK_PACK_START);
+ gtk_box_set_child_packing (GTK_BOX (box2), frame, TRUE, TRUE, GTK_PACK_START);
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
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);
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);
@@ -2754,11 +2758,11 @@ pack_image (GtkWidget *box,
{
gtk_box_pack_start (GTK_BOX (box),
gtk_label_new (text),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
gtk_box_pack_start (GTK_BOX (box),
image,
- TRUE, TRUE, 0);
+ TRUE, TRUE);
}
static void
@@ -3263,7 +3267,7 @@ create_menus (GtkWidget *widget)
gtk_widget_show (box1);
menubar = gtk_menu_bar_new ();
- 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 (screen, 2, 50);
@@ -3298,23 +3302,23 @@ create_menus (GtkWidget *widget)
gtk_widget_set_halign (menuitem, GTK_ALIGN_END);
gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
gtk_widget_show (menuitem);
-
+
menubar = gtk_menu_bar_new ();
- 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 (screen, 2, 10);
-
+
menuitem = gtk_menu_item_new_with_label ("Second menu bar");
gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), menu);
gtk_menu_shell_append (GTK_MENU_SHELL (menubar), menuitem);
gtk_widget_show (menuitem);
-
+
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, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
gtk_widget_show (box2);
-
+
menu = create_menu (screen, 1, 5);
gtk_menu_set_accel_group (GTK_MENU (menu), accel_group);
@@ -3354,23 +3358,23 @@ create_menus (GtkWidget *widget)
optionmenu = gtk_combo_box_text_new ();
gtk_combo_box_set_active (GTK_COMBO_BOX (optionmenu), 3);
- gtk_box_pack_start (GTK_BOX (box2), optionmenu, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), optionmenu, TRUE, TRUE);
gtk_widget_show (optionmenu);
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
gtk_widget_show (separator);
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 ("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);
@@ -3431,39 +3435,39 @@ create_key_lookup (GtkWidget *widget)
/* We have to expand it so the accel labels will draw their labels
*/
gtk_window_set_default_size (GTK_WINDOW (window), 300, -1);
-
+
gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
+
button = gtk_button_new_with_mnemonic ("Button 1 (_a)");
- gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
button = gtk_button_new_with_mnemonic ("Button 2 (_A)");
- gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
button = gtk_button_new_with_mnemonic ("Button 3 (_\321\204)");
- gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
button = gtk_button_new_with_mnemonic ("Button 4 (_\320\244)");
- gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
button = gtk_button_new_with_mnemonic ("Button 6 (_b)");
- gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
button = accel_button_new (accel_group, "Button 7", "<Alt><Shift>b");
- gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
button = accel_button_new (accel_group, "Button 8", "<Alt>d");
- gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
button = accel_button_new (accel_group, "Button 9", "<Alt>Cyrillic_ve");
- gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
button = gtk_button_new_with_mnemonic ("Button 10 (_1)");
- gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
button = gtk_button_new_with_mnemonic ("Button 11 (_!)");
- gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
button = accel_button_new (accel_group, "Button 12", "<Super>a");
- gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
button = accel_button_new (accel_group, "Button 13", "<Hyper>a");
- gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
button = accel_button_new (accel_group, "Button 14", "<Meta>a");
- gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
button = accel_button_new (accel_group, "Button 15", "<Shift><Mod4>b");
- gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
window_ptr = &window;
g_object_add_weak_pointer (G_OBJECT (window), window_ptr);
@@ -3564,23 +3568,23 @@ create_modal_window (GtkWidget *widget)
/* Init widgets */
gtk_container_set_border_width (GTK_CONTAINER (box1), 3);
gtk_container_set_border_width (GTK_CONTAINER (box2), 3);
-
+
/* Pack widgets */
gtk_container_add (GTK_CONTAINER (window), box1);
- gtk_box_pack_start (GTK_BOX (box1), frame1, TRUE, TRUE, 4);
+ gtk_box_pack_start (GTK_BOX (box1), frame1, TRUE, TRUE);
gtk_container_add (GTK_CONTAINER (frame1), box2);
- gtk_box_pack_start (GTK_BOX (box2), btnColor, FALSE, FALSE, 4);
- gtk_box_pack_start (GTK_BOX (box2), btnFile, FALSE, FALSE, 4);
- gtk_box_pack_start (GTK_BOX (box1), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE, 4);
- gtk_box_pack_start (GTK_BOX (box1), btnClose, FALSE, FALSE, 4);
-
+ gtk_box_pack_start (GTK_BOX (box2), btnColor, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (box2), btnFile, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (box1), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (box1), btnClose, FALSE, FALSE);
+
/* connect signals */
g_signal_connect_swapped (btnClose, "clicked",
G_CALLBACK (gtk_widget_destroy), window);
g_signal_connect (window, "destroy",
G_CALLBACK (cmw_destroy_cb), NULL);
-
+
g_signal_connect (btnColor, "clicked",
G_CALLBACK (cmw_color), window);
g_signal_connect (btnFile, "clicked",
@@ -3754,7 +3758,7 @@ create_scrolled_windows (GtkWidget *widget)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start (GTK_BOX (content_area), scrolled_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), scrolled_window, TRUE, TRUE);
gtk_widget_show (scrolled_window);
grid = gtk_grid_new ();
@@ -3912,15 +3916,15 @@ create_entry (GtkWidget *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, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_pack_start (GTK_BOX (box2), hbox, TRUE, TRUE, 0);
-
+ gtk_box_pack_start (GTK_BOX (box2), hbox, TRUE, TRUE);
+
entry = gtk_entry_new ();
gtk_entry_set_text (GTK_ENTRY (entry), "hello world \330\247\331\204\330\263\331\204\330\247\331\205
\330\271\331\204\331\212\331\203\331\205");
gtk_editable_select_region (GTK_EDITABLE (entry), 0, 5);
- gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE);
cb = GTK_COMBO_BOX_TEXT (gtk_combo_box_text_new_with_entry ());
@@ -3939,42 +3943,42 @@ create_entry (GtkWidget *widget)
cb_entry = gtk_bin_get_child (GTK_BIN (cb));
gtk_entry_set_text (GTK_ENTRY (cb_entry), "hello world \n\n\n foo");
gtk_editable_select_region (GTK_EDITABLE (cb_entry), 0, -1);
- gtk_box_pack_start (GTK_BOX (box2), GTK_WIDGET (cb), TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), GTK_WIDGET (cb), TRUE, TRUE);
sensitive_check = gtk_check_button_new_with_label("Sensitive");
- gtk_box_pack_start (GTK_BOX (box2), sensitive_check, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), sensitive_check, FALSE, TRUE);
g_signal_connect (sensitive_check, "toggled",
G_CALLBACK (entry_toggle_sensitive), entry);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sensitive_check), TRUE);
has_frame_check = gtk_check_button_new_with_label("Has Frame");
- gtk_box_pack_start (GTK_BOX (box2), has_frame_check, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), has_frame_check, FALSE, TRUE);
g_signal_connect (has_frame_check, "toggled",
G_CALLBACK (entry_toggle_frame), entry);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (has_frame_check), TRUE);
progress_check = gtk_check_button_new_with_label("Show Progress");
- gtk_box_pack_start (GTK_BOX (box2), progress_check, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), progress_check, FALSE, TRUE);
g_signal_connect (progress_check, "toggled",
G_CALLBACK (entry_toggle_progress), entry);
progress_check = gtk_check_button_new_with_label("Pulse Progress");
- gtk_box_pack_start (GTK_BOX (box2), progress_check, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), progress_check, FALSE, TRUE);
g_signal_connect (progress_check, "toggled",
G_CALLBACK (entry_toggle_pulse), entry);
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
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);
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);
}
@@ -3998,26 +4002,26 @@ create_expander (GtkWidget *widget)
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_screen (GTK_WINDOW (window),
gtk_widget_get_screen (widget));
-
+
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed),
&window);
-
+
gtk_window_set_title (GTK_WINDOW (window), "expander");
gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
+
box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), box1);
-
+
expander = gtk_expander_new ("The Hidden");
-
- gtk_box_pack_start (GTK_BOX (box1), expander, TRUE, TRUE, 0);
-
+
+ gtk_box_pack_start (GTK_BOX (box1), expander, TRUE, TRUE);
+
hidden = gtk_label_new ("Revealed!");
-
+
gtk_container_add (GTK_CONTAINER (expander), hidden);
}
-
+
if (!gtk_widget_get_visible (window))
gtk_widget_show_all (window);
else
@@ -4107,10 +4111,10 @@ create_event_box (GtkWidget *widget)
gtk_container_add (GTK_CONTAINER (window), box1);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (box1), hbox, TRUE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (box1), hbox, TRUE, FALSE);
+
event_box = gtk_event_box_new ();
- gtk_box_pack_start (GTK_BOX (hbox), event_box, TRUE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), event_box, TRUE, FALSE);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (event_box), vbox);
@@ -4120,41 +4124,41 @@ create_event_box (GtkWidget *widget)
g_signal_connect (event_box, "draw",
G_CALLBACK (event_box_draw),
NULL);
-
+
label = gtk_label_new ("Click on this label");
- gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE);
button = gtk_button_new_with_label ("button in eventbox");
- gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, FALSE);
g_signal_connect (button, "clicked",
G_CALLBACK (event_box_button_clicked),
NULL);
-
+
visible_window_check = gtk_check_button_new_with_label("Visible Window");
- gtk_box_pack_start (GTK_BOX (box1), visible_window_check, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), visible_window_check, FALSE, TRUE);
g_signal_connect (visible_window_check, "toggled",
G_CALLBACK (event_box_toggle_visible_window), event_box);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (visible_window_check), TRUE);
-
+
above_child_check = gtk_check_button_new_with_label("Above Child");
- gtk_box_pack_start (GTK_BOX (box1), above_child_check, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), above_child_check, FALSE, TRUE);
g_signal_connect (above_child_check, "toggled",
G_CALLBACK (event_box_toggle_above_child), event_box);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (above_child_check), FALSE);
-
+
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
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);
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);
}
@@ -4223,7 +4227,7 @@ create_size_group_window (GdkScreen *screen,
content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
grid = gtk_grid_new ();
- gtk_box_pack_start (GTK_BOX (content_area), grid, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), grid, TRUE, TRUE);
gtk_grid_set_row_spacing (GTK_GRID (grid), 5);
gtk_grid_set_column_spacing (GTK_GRID (grid), 5);
@@ -4283,19 +4287,19 @@ create_size_group_window (GdkScreen *screen,
g_object_unref (hgroup2);
g_object_unref (vgroup1);
g_object_unref (vgroup2);
-
+
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
- gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE);
+
spin_button = gtk_spin_button_new_with_range (1, 100, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin_button), SIZE_GROUP_INITIAL_SIZE);
- gtk_box_pack_start (GTK_BOX (hbox), spin_button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), spin_button, TRUE, TRUE);
g_signal_connect (spin_button, "value_changed",
G_CALLBACK (size_group_hsize_changed), main_button);
spin_button = gtk_spin_button_new_with_range (1, 100, 1);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin_button), SIZE_GROUP_INITIAL_SIZE);
- gtk_box_pack_start (GTK_BOX (hbox), spin_button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), spin_button, TRUE, TRUE);
g_signal_connect (spin_button, "value_changed",
G_CALLBACK (size_group_vsize_changed), main_button);
@@ -4535,36 +4539,36 @@ create_spins (GtkWidget *widget)
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
gtk_window_set_screen (GTK_WINDOW (window),
gtk_widget_get_screen (widget));
-
+
g_signal_connect (window, "destroy",
G_CALLBACK (gtk_widget_destroyed),
&window);
-
+
gtk_window_set_title (GTK_WINDOW (window), "GtkSpinButton");
-
+
main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 10);
gtk_container_add (GTK_CONTAINER (window), main_vbox);
-
+
frame = gtk_frame_new ("Not accelerated");
- gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
-
+ gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE);
+
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
gtk_container_add (GTK_CONTAINER (frame), vbox);
-
+
/* Time, month, hex spinners */
-
+
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 5);
-
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
-
+ gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE);
+
label = gtk_label_new ("Time :");
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE);
adjustment = gtk_adjustment_new (0, 0, 1410, 30, 60, 0);
spinner = gtk_spin_button_new (adjustment, 0, 0);
@@ -4575,15 +4579,15 @@ create_spins (GtkWidget *widget)
NULL);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
gtk_entry_set_width_chars (GTK_ENTRY (spinner), 5);
- gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
-
+ gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE);
+
label = gtk_label_new ("Month :");
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE);
adjustment = gtk_adjustment_new (1.0, 1.0, 12.0, 1.0,
5.0, 0.0);
@@ -4600,15 +4604,15 @@ create_spins (GtkWidget *widget)
NULL);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
gtk_entry_set_width_chars (GTK_ENTRY (spinner), 9);
- gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE);
+
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE);
label = gtk_label_new ("Hex :");
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE);
adjustment = gtk_adjustment_new (0, 0, 255, 1, 16, 0);
spinner = gtk_spin_button_new (adjustment, 0, 0);
@@ -4623,110 +4627,110 @@ create_spins (GtkWidget *widget)
NULL);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
gtk_entry_set_width_chars (GTK_ENTRY (spinner), 4);
- gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE);
frame = gtk_frame_new ("Accelerated");
- gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
-
+ gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE);
+
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
gtk_container_add (GTK_CONTAINER (frame), vbox);
-
+
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5);
-
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
+
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 5);
-
+ gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE);
+
label = gtk_label_new ("Value :");
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE);
adjustment = gtk_adjustment_new (0.0, -10000.0, 10000.0,
0.5, 100.0, 0.0);
spinner1 = gtk_spin_button_new (adjustment, 1.0, 2);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
- gtk_box_pack_start (GTK_BOX (vbox2), spinner1, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), spinner1, FALSE, TRUE);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 5);
+ gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE);
label = gtk_label_new ("Digits :");
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE);
adjustment = gtk_adjustment_new (2, 1, 15, 1, 1, 0);
spinner2 = gtk_spin_button_new (adjustment, 0.0, 0);
g_signal_connect (adjustment, "value_changed",
G_CALLBACK (change_digits),
spinner2);
- gtk_box_pack_start (GTK_BOX (vbox2), spinner2, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), spinner2, FALSE, TRUE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 5);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
button = gtk_check_button_new_with_label ("Snap to 0.5-ticks");
g_signal_connect (button, "clicked",
G_CALLBACK (toggle_snap),
spinner1);
- gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
button = gtk_check_button_new_with_label ("Numeric only input mode");
g_signal_connect (button, "clicked",
G_CALLBACK (toggle_numeric),
spinner1);
- gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
val_label = gtk_label_new ("");
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
button = gtk_button_new_with_label ("Value as Int");
g_object_set_data (G_OBJECT (button), "user_data", val_label);
g_signal_connect (button, "clicked",
G_CALLBACK (get_value),
GINT_TO_POINTER (1));
- gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
button = gtk_button_new_with_label ("Value as Float");
g_object_set_data (G_OBJECT (button), "user_data", val_label);
g_signal_connect (button, "clicked",
G_CALLBACK (get_value),
GINT_TO_POINTER (2));
- gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
- gtk_box_pack_start (GTK_BOX (vbox), val_label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), val_label, TRUE, TRUE);
gtk_label_set_text (GTK_LABEL (val_label), "0");
frame = gtk_frame_new ("Using Convenience Constructor");
- gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
-
+ gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE);
+
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
gtk_container_add (GTK_CONTAINER (frame), hbox);
-
+
val_label = gtk_label_new ("0.0");
spinner = gtk_spin_button_new_with_range (0.0, 10.0, 0.009);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (spinner), 0.0);
g_signal_connect (spinner, "value_changed",
G_CALLBACK (get_spin_value), val_label);
- gtk_box_pack_start (GTK_BOX (hbox), spinner, TRUE, TRUE, 5);
- gtk_box_pack_start (GTK_BOX (hbox), val_label, TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (hbox), spinner, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (hbox), val_label, TRUE, TRUE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE, 0);
-
+ gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE);
+
button = gtk_button_new_with_label ("Close");
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy),
window);
- gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
}
if (!gtk_widget_get_visible (window))
@@ -5033,21 +5037,21 @@ create_cursors (GtkWidget *widget)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
label = gtk_label_new ("Cursor Theme:");
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
entry = gtk_entry_new ();
gtk_entry_set_text (GTK_ENTRY (entry), "default");
- gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, TRUE);
gdk_display_get_maximal_cursor_size (gtk_widget_get_display (vbox), &w, &h);
size = gtk_spin_button_new_with_range (1.0, MIN (w, h), 1.0);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (size), 24.0);
- gtk_box_pack_start (GTK_BOX (hbox), size, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), size, TRUE, TRUE);
g_signal_connect (entry, "changed",
G_CALLBACK (change_cursor_theme), hbox);
@@ -5057,12 +5061,12 @@ create_cursors (GtkWidget *widget)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
label = gtk_label_new ("Cursor Name:");
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
entry = gtk_entry_new ();
completion = gtk_entry_completion_new ();
@@ -5071,7 +5075,7 @@ create_cursors (GtkWidget *widget)
gtk_entry_completion_set_text_column (completion, 0);
gtk_entry_set_completion (GTK_ENTRY (entry), completion);
g_object_unref (model);
- gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE);
frame =
g_object_new (gtk_frame_get_type (),
@@ -5099,17 +5103,17 @@ create_cursors (GtkWidget *widget)
any = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (main_vbox), any, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (main_vbox), any, FALSE, TRUE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 10);
- gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE);
button = gtk_button_new_with_label ("Close");
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy),
window);
- gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
gtk_widget_show_all (window);
@@ -5268,7 +5272,7 @@ create_flipping (GtkWidget *widget)
check_button = gtk_check_button_new_with_label ("Right-to-left global direction");
gtk_container_set_border_width (GTK_CONTAINER (check_button), 10);
- gtk_box_pack_start (GTK_BOX (content_area), check_button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), check_button, TRUE, TRUE);
if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
@@ -5278,27 +5282,27 @@ create_flipping (GtkWidget *widget)
check_button = gtk_check_button_new_with_label ("Toggle orientation of all boxes");
gtk_container_set_border_width (GTK_CONTAINER (check_button), 10);
- gtk_box_pack_start (GTK_BOX (content_area), check_button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), check_button, TRUE, TRUE);
g_signal_connect (check_button, "toggled",
G_CALLBACK (flipping_orientation_toggled_cb), NULL);
gtk_box_pack_start (GTK_BOX (content_area),
create_forward_back ("Default", GTK_TEXT_DIR_NONE),
- TRUE, TRUE, 0);
+ TRUE, TRUE);
gtk_box_pack_start (GTK_BOX (content_area),
create_forward_back ("Left-to-Right", GTK_TEXT_DIR_LTR),
- TRUE, TRUE, 0);
+ TRUE, TRUE);
gtk_box_pack_start (GTK_BOX (content_area),
create_forward_back ("Right-to-Left", GTK_TEXT_DIR_RTL),
- TRUE, TRUE, 0);
+ TRUE, TRUE);
gtk_dialog_add_button (GTK_DIALOG (window), "Close", GTK_RESPONSE_CLOSE);
g_signal_connect (window, "response", G_CALLBACK (gtk_widget_destroy), NULL);
}
-
+
if (!gtk_widget_get_visible (window))
gtk_widget_show_all (window);
else
@@ -5375,13 +5379,13 @@ create_focus (GtkWidget *widget)
NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
-
+
gtk_window_set_title (GTK_WINDOW (window), "Keyboard Focus Navigation");
frame = gtk_frame_new ("Weird tab focus chain");
- gtk_box_pack_start (GTK_BOX (content_area), frame, TRUE, TRUE, 0);
-
+ gtk_box_pack_start (GTK_BOX (content_area), frame, TRUE, TRUE);
+
table = make_focus_table (&list);
gtk_container_add (GTK_CONTAINER (frame), table);
@@ -5390,19 +5394,19 @@ create_focus (GtkWidget *widget)
list);
g_list_free (list);
-
+
frame = gtk_frame_new ("Default tab focus chain");
- gtk_box_pack_start (GTK_BOX (content_area), frame, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), frame, TRUE, TRUE);
list = NULL;
table = make_focus_table (&list);
g_list_free (list);
-
- gtk_container_add (GTK_CONTAINER (frame), table);
+
+ gtk_container_add (GTK_CONTAINER (frame), table);
}
-
+
if (!gtk_widget_get_visible (window))
gtk_widget_show_all (window);
else
@@ -5483,14 +5487,14 @@ dialog_response_cb (GtkWidget *widget, gint response, gpointer unused)
if (l == NULL)
{
GtkWidget *label;
-
+
label = gtk_label_new ("Dialog Test");
g_object_set (label, "margin", 10, NULL);
gtk_box_pack_start (GTK_BOX (content_area),
- label, TRUE, TRUE, 0);
+ label, TRUE, TRUE);
gtk_widget_show (label);
}
-
+
g_list_free (children);
}
}
@@ -5746,7 +5750,7 @@ create_event_watcher (GtkWidget *widget)
G_CALLBACK (event_watcher_toggle),
NULL);
gtk_container_set_border_width (GTK_CONTAINER (button), 10);
- gtk_box_pack_start (GTK_BOX (content_area), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), button, TRUE, TRUE);
gtk_widget_show (button);
gtk_dialog_add_button (GTK_DIALOG (dialog_window), "Close", GTK_RESPONSE_CLOSE);
@@ -5806,7 +5810,7 @@ create_range_controls (GtkWidget *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, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
gtk_widget_show (box2);
@@ -5816,11 +5820,11 @@ create_range_controls (GtkWidget *widget)
gtk_widget_set_size_request (GTK_WIDGET (scale), 150, -1);
gtk_scale_set_digits (GTK_SCALE (scale), 1);
gtk_scale_set_draw_value (GTK_SCALE (scale), TRUE);
- gtk_box_pack_start (GTK_BOX (box2), scale, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), scale, TRUE, TRUE);
gtk_widget_show (scale);
scrollbar = gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (adjustment));
- gtk_box_pack_start (GTK_BOX (box2), scrollbar, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), scrollbar, TRUE, TRUE);
gtk_widget_show (scrollbar);
scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (adjustment));
@@ -5829,16 +5833,16 @@ create_range_controls (GtkWidget *widget)
"format_value",
G_CALLBACK (reformat_value),
NULL);
- gtk_box_pack_start (GTK_BOX (box2), scale, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), scale, TRUE, TRUE);
gtk_widget_show (scale);
-
+
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
scale = gtk_scale_new (GTK_ORIENTATION_VERTICAL, GTK_ADJUSTMENT (adjustment));
gtk_widget_set_size_request (scale, -1, 200);
gtk_scale_set_digits (GTK_SCALE (scale), 2);
gtk_scale_set_draw_value (GTK_SCALE (scale), TRUE);
- gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE);
gtk_widget_show (scale);
scale = gtk_scale_new (GTK_ORIENTATION_VERTICAL, GTK_ADJUSTMENT (adjustment));
@@ -5846,7 +5850,7 @@ create_range_controls (GtkWidget *widget)
gtk_scale_set_digits (GTK_SCALE (scale), 2);
gtk_scale_set_draw_value (GTK_SCALE (scale), TRUE);
gtk_range_set_inverted (GTK_RANGE (scale), TRUE);
- gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE);
gtk_widget_show (scale);
scale = gtk_scale_new (GTK_ORIENTATION_VERTICAL, GTK_ADJUSTMENT (adjustment));
@@ -5855,21 +5859,21 @@ create_range_controls (GtkWidget *widget)
"format_value",
G_CALLBACK (reformat_value),
NULL);
- gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE);
gtk_widget_show (scale);
-
- gtk_box_pack_start (GTK_BOX (box2), hbox, TRUE, TRUE, 0);
+
+ gtk_box_pack_start (GTK_BOX (box2), hbox, TRUE, TRUE);
gtk_widget_show (hbox);
-
+
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
gtk_widget_show (separator);
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);
@@ -5877,7 +5881,7 @@ create_range_controls (GtkWidget *widget)
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy),
window);
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 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);
@@ -6037,21 +6041,21 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
button = gtk_check_button_new_with_label ("Fill Tab");
- gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
g_signal_connect (button, "toggled",
G_CALLBACK (tab_fill), child);
button = gtk_check_button_new_with_label ("Expand Tab");
- gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
g_signal_connect (button, "toggled",
G_CALLBACK (tab_expand), child);
button = gtk_button_new_with_label ("Hide Page");
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 5);
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_hide),
child);
@@ -6061,28 +6065,28 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
label_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
pixwid = gtk_image_new_from_pixbuf (book_closed);
g_object_set_data (G_OBJECT (child), "tab_pixmap", pixwid);
-
- gtk_box_pack_start (GTK_BOX (label_box), pixwid, FALSE, TRUE, 0);
+
+ gtk_box_pack_start (GTK_BOX (label_box), pixwid, FALSE, TRUE);
gtk_widget_set_margin_start (pixwid, 3);
gtk_widget_set_margin_end (pixwid, 3);
gtk_widget_set_margin_bottom (pixwid, 1);
gtk_widget_set_margin_top (pixwid, 1);
label = gtk_label_new_with_mnemonic (accel_buffer);
- gtk_box_pack_start (GTK_BOX (label_box), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (label_box), label, FALSE, TRUE);
gtk_widget_show_all (label_box);
-
-
+
+
menu_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
pixwid = gtk_image_new_from_pixbuf (book_closed);
g_object_set_data (G_OBJECT (child), "menu_pixmap", pixwid);
-
- gtk_box_pack_start (GTK_BOX (menu_box), pixwid, FALSE, TRUE, 0);
+
+ gtk_box_pack_start (GTK_BOX (menu_box), pixwid, FALSE, TRUE);
gtk_widget_set_margin_start (pixwid, 3);
gtk_widget_set_margin_end (pixwid, 3);
gtk_widget_set_margin_bottom (pixwid, 1);
gtk_widget_set_margin_top (pixwid, 1);
label = gtk_label_new (buffer);
- gtk_box_pack_start (GTK_BOX (menu_box), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (menu_box), label, FALSE, TRUE);
gtk_widget_show_all (menu_box);
gtk_notebook_append_page_menu (notebook, child, label_box, menu_box);
@@ -6209,80 +6213,80 @@ create_notebook (GtkWidget *widget)
g_signal_connect (sample_notebook, "switch_page",
G_CALLBACK (page_switch), NULL);
gtk_notebook_set_tab_pos (GTK_NOTEBOOK (sample_notebook), GTK_POS_TOP);
- gtk_box_pack_start (GTK_BOX (box1), sample_notebook, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), sample_notebook, TRUE, TRUE);
gtk_container_set_border_width (GTK_CONTAINER (sample_notebook), 10);
gtk_widget_realize (sample_notebook);
if (!book_open)
book_open = gdk_pixbuf_new_from_xpm_data (book_open_xpm);
-
+
if (!book_closed)
book_closed = gdk_pixbuf_new_from_xpm_data (book_closed_xpm);
create_pages (GTK_NOTEBOOK (sample_notebook), 1, 5);
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 10);
-
+ gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
+
box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
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);
button = gtk_check_button_new_with_label ("popup menu");
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, FALSE);
g_signal_connect (button, "clicked",
G_CALLBACK (notebook_popup),
sample_notebook);
box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
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);
label = gtk_label_new ("Notebook Style :");
- gtk_box_pack_start (GTK_BOX (box2), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), label, FALSE, TRUE);
omenu = build_option_menu (items, G_N_ELEMENTS (items), 0,
notebook_type_changed,
sample_notebook);
- gtk_box_pack_start (GTK_BOX (box2), omenu, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), omenu, FALSE, TRUE);
button = gtk_button_new_with_label ("Show all Pages");
- gtk_box_pack_start (GTK_BOX (box2), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, FALSE, TRUE);
g_signal_connect (button, "clicked",
G_CALLBACK (show_all_pages), sample_notebook);
box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
gtk_box_set_homogeneous (GTK_BOX (box2), TRUE);
gtk_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);
button = gtk_button_new_with_label ("prev");
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_notebook_prev_page),
sample_notebook);
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
button = gtk_button_new_with_label ("next");
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_notebook_next_page),
sample_notebook);
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
button = gtk_button_new_with_label ("rotate");
g_signal_connect (button, "clicked",
G_CALLBACK (rotate_notebook), sample_notebook);
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 5);
+ gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
button = gtk_button_new_with_label ("close");
gtk_container_set_border_width (GTK_CONTAINER (button), 5);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy),
window);
- gtk_box_pack_start (GTK_BOX (box1), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), button, FALSE, FALSE);
gtk_widget_set_can_default (button, TRUE);
gtk_widget_grab_default (button);
}
@@ -6405,9 +6409,9 @@ create_panes (GtkWidget *widget)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
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);
@@ -6438,14 +6442,14 @@ create_panes (GtkWidget *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);
}
@@ -6500,13 +6504,13 @@ paned_keyboard_window1 (GtkWidget *widget)
gtk_container_add (GTK_CONTAINER (frame1), vbox1);
button7 = gtk_button_new_with_label ("button7");
- gtk_box_pack_start (GTK_BOX (vbox1), button7, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox1), button7, FALSE, FALSE);
button8 = gtk_button_new_with_label ("button8");
- gtk_box_pack_start (GTK_BOX (vbox1), button8, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox1), button8, FALSE, FALSE);
button9 = gtk_button_new_with_label ("button9");
- gtk_box_pack_start (GTK_BOX (vbox1), button9, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox1), button9, FALSE, FALSE);
vpaned1 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
gtk_paned_pack2 (GTK_PANED (hpaned1), vpaned1, TRUE, TRUE);
@@ -6522,10 +6526,10 @@ paned_keyboard_window1 (GtkWidget *widget)
gtk_container_add (GTK_CONTAINER (frame5), hbox1);
button5 = gtk_button_new_with_label ("button5");
- gtk_box_pack_start (GTK_BOX (hbox1), button5, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox1), button5, FALSE, FALSE);
button6 = gtk_button_new_with_label ("button6");
- gtk_box_pack_start (GTK_BOX (hbox1), button6, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox1), button6, FALSE, FALSE);
frame3 = gtk_frame_new (NULL);
gtk_paned_pack2 (GTK_PANED (vpaned1), frame3, TRUE, TRUE);
@@ -6589,7 +6593,7 @@ paned_keyboard_window2 (GtkWidget *widget)
gtk_paned_pack2 (GTK_PANED (hpaned2), hbox2, TRUE, TRUE);
vpaned2 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
- gtk_box_pack_start (GTK_BOX (hbox2), vpaned2, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox2), vpaned2, TRUE, TRUE);
frame7 = gtk_frame_new (NULL);
gtk_paned_pack1 (GTK_PANED (vpaned2), frame7, FALSE, TRUE);
@@ -6606,7 +6610,7 @@ paned_keyboard_window2 (GtkWidget *widget)
gtk_container_add (GTK_CONTAINER (frame8), button11);
button10 = gtk_button_new_with_label ("button10");
- gtk_box_pack_start (GTK_BOX (hbox2), button10, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox2), button10, FALSE, FALSE);
return window2;
}
@@ -6633,18 +6637,18 @@ paned_keyboard_window3 (GtkWidget *widget)
g_object_set_data (G_OBJECT (window3), "window3", window3);
gtk_window_set_title (GTK_WINDOW (window3), "Nested panes");
- gtk_window_set_screen (GTK_WINDOW (window3),
+ gtk_window_set_screen (GTK_WINDOW (window3),
gtk_widget_get_screen (widget));
-
+
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window3), vbox2);
label1 = gtk_label_new ("Three panes nested inside each other");
- gtk_box_pack_start (GTK_BOX (vbox2), label1, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), label1, FALSE, FALSE);
hpaned3 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (vbox2), hpaned3, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), hpaned3, TRUE, TRUE);
frame9 = gtk_frame_new (NULL);
gtk_paned_pack1 (GTK_PANED (hpaned3), frame9, FALSE, TRUE);
@@ -6708,18 +6712,18 @@ paned_keyboard_window4 (GtkWidget *widget)
g_object_set_data (G_OBJECT (window4), "window4", window4);
gtk_window_set_title (GTK_WINDOW (window4), "window4");
- gtk_window_set_screen (GTK_WINDOW (window4),
+ gtk_window_set_screen (GTK_WINDOW (window4),
gtk_widget_get_screen (widget));
vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window4), vbox3);
label2 = gtk_label_new ("Widget tree:\n\nhpaned \n - vpaned\n - hbox\n - vpaned\n - vpaned\n -
vpaned\n");
- gtk_box_pack_start (GTK_BOX (vbox3), label2, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox3), label2, FALSE, FALSE);
gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_LEFT);
hpaned6 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (vbox3), hpaned6, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox3), hpaned6, TRUE, TRUE);
vpaned3 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
gtk_paned_pack1 (GTK_PANED (hpaned6), vpaned3, FALSE, TRUE);
@@ -6734,7 +6738,7 @@ paned_keyboard_window4 (GtkWidget *widget)
gtk_paned_pack2 (GTK_PANED (hpaned6), hbox3, TRUE, TRUE);
vpaned4 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
- gtk_box_pack_start (GTK_BOX (hbox3), vpaned4, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox3), vpaned4, TRUE, TRUE);
button21 = gtk_button_new_with_label ("button21");
gtk_paned_pack1 (GTK_PANED (vpaned4), button21, FALSE, TRUE);
@@ -6743,7 +6747,7 @@ paned_keyboard_window4 (GtkWidget *widget)
gtk_paned_pack2 (GTK_PANED (vpaned4), button20, TRUE, TRUE);
vpaned5 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
- gtk_box_pack_start (GTK_BOX (hbox3), vpaned5, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox3), vpaned5, TRUE, TRUE);
button23 = gtk_button_new_with_label ("button23");
gtk_paned_pack1 (GTK_PANED (vpaned5), button23, FALSE, TRUE);
@@ -6752,7 +6756,7 @@ paned_keyboard_window4 (GtkWidget *widget)
gtk_paned_pack2 (GTK_PANED (vpaned5), button22, TRUE, TRUE);
vpaned6 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
- gtk_box_pack_start (GTK_BOX (hbox3), vpaned6, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox3), vpaned6, TRUE, TRUE);
button25 = gtk_button_new_with_label ("button25");
gtk_paned_pack1 (GTK_PANED (vpaned6), button25, FALSE, TRUE);
@@ -7101,33 +7105,33 @@ create_wmhints (GtkWidget *widget)
list = g_list_prepend (NULL, pixbuf);
gdk_window_set_icon_list (gdk_window, list);
-
+
g_list_free (list);
g_object_unref (pixbuf);
gdk_window_set_icon_name (gdk_window, "WMHints Test Icon");
-
+
gdk_window_set_decorations (gdk_window, GDK_DECOR_ALL | GDK_DECOR_MENU);
gdk_window_set_functions (gdk_window, GDK_FUNC_ALL | GDK_FUNC_RESIZE);
-
+
box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), box1);
gtk_widget_show (box1);
label = gtk_label_new ("Try iconizing me!");
gtk_widget_set_size_request (label, 150, 50);
- gtk_box_pack_start (GTK_BOX (box1), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), label, TRUE, TRUE);
gtk_widget_show (label);
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
gtk_widget_show (separator);
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);
@@ -7137,7 +7141,7 @@ create_wmhints (GtkWidget *widget)
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);
@@ -7200,11 +7204,11 @@ tracking_label (GtkWidget *window)
G_CALLBACK (gtk_widget_destroy),
window,
G_CONNECT_SWAPPED);
-
+
label = gtk_label_new ("<no window state events received>");
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
+
g_signal_connect (window,
"window_state_event",
G_CALLBACK (window_state_callback),
@@ -7216,7 +7220,7 @@ tracking_label (GtkWidget *window)
G_CALLBACK (gtk_window_deiconify),
window,
G_CONNECT_SWAPPED);
- gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE);
button = gtk_button_new_with_label ("Iconify");
g_signal_connect_object (button,
@@ -7224,7 +7228,7 @@ tracking_label (GtkWidget *window)
G_CALLBACK (gtk_window_iconify),
window,
G_CONNECT_SWAPPED);
- gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE);
button = gtk_button_new_with_label ("Fullscreen");
g_signal_connect_object (button,
@@ -7232,7 +7236,7 @@ tracking_label (GtkWidget *window)
G_CALLBACK (gtk_window_fullscreen),
window,
G_CONNECT_SWAPPED);
- gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE);
button = gtk_button_new_with_label ("Unfullscreen");
g_signal_connect_object (button,
@@ -7240,15 +7244,15 @@ tracking_label (GtkWidget *window)
G_CALLBACK (gtk_window_unfullscreen),
window,
G_CONNECT_SWAPPED);
- gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
-
+ gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE);
+
button = gtk_button_new_with_label ("Present");
g_signal_connect_object (button,
"clicked",
G_CALLBACK (gtk_window_present),
window,
G_CONNECT_SWAPPED);
- gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE);
button = gtk_button_new_with_label ("Show");
g_signal_connect_object (button,
@@ -7256,10 +7260,10 @@ tracking_label (GtkWidget *window)
G_CALLBACK (gtk_widget_show),
window,
G_CONNECT_SWAPPED);
- gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE, 0);
-
+ gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE);
+
gtk_widget_show_all (hbox);
-
+
return hbox;
}
@@ -7297,14 +7301,14 @@ get_state_controls (GtkWidget *window)
GtkWidget *button_below;
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-
+
button = gtk_button_new_with_label ("Stick");
g_signal_connect_object (button,
"clicked",
G_CALLBACK (gtk_window_stick),
window,
G_CONNECT_SWAPPED);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
button = gtk_button_new_with_label ("Unstick");
g_signal_connect_object (button,
@@ -7312,15 +7316,15 @@ get_state_controls (GtkWidget *window)
G_CALLBACK (gtk_window_unstick),
window,
G_CONNECT_SWAPPED);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+
button = gtk_button_new_with_label ("Maximize");
g_signal_connect_object (button,
"clicked",
G_CALLBACK (gtk_window_maximize),
window,
G_CONNECT_SWAPPED);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
button = gtk_button_new_with_label ("Unmaximize");
g_signal_connect_object (button,
@@ -7328,7 +7332,7 @@ get_state_controls (GtkWidget *window)
G_CALLBACK (gtk_window_unmaximize),
window,
G_CONNECT_SWAPPED);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
button = gtk_button_new_with_label ("Iconify");
g_signal_connect_object (button,
@@ -7336,7 +7340,7 @@ get_state_controls (GtkWidget *window)
G_CALLBACK (gtk_window_iconify),
window,
G_CONNECT_SWAPPED);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
button = gtk_button_new_with_label ("Fullscreen");
g_signal_connect_object (button,
@@ -7344,7 +7348,7 @@ get_state_controls (GtkWidget *window)
G_CALLBACK (gtk_window_fullscreen),
window,
G_CONNECT_SWAPPED);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
button = gtk_button_new_with_label ("Unfullscreen");
g_signal_connect_object (button,
@@ -7352,21 +7356,21 @@ get_state_controls (GtkWidget *window)
G_CALLBACK (gtk_window_unfullscreen),
window,
G_CONNECT_SWAPPED);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
button_above = gtk_toggle_button_new_with_label ("Keep above");
g_signal_connect (button_above,
"toggled",
G_CALLBACK (keep_window_above),
window);
- gtk_box_pack_start (GTK_BOX (vbox), button_above, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button_above, FALSE, FALSE);
button_below = gtk_toggle_button_new_with_label ("Keep below");
g_signal_connect (button_below,
"toggled",
G_CALLBACK (keep_window_below),
window);
- gtk_box_pack_start (GTK_BOX (vbox), button_below, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button_below, FALSE, FALSE);
g_object_set_data (G_OBJECT (button_above), "radio", button_below);
g_object_set_data (G_OBJECT (button_below), "radio", button_above);
@@ -7377,8 +7381,8 @@ get_state_controls (GtkWidget *window)
G_CALLBACK (gtk_widget_hide),
window,
G_CONNECT_SWAPPED);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+
gtk_widget_show_all (vbox);
return vbox;
@@ -7864,12 +7868,12 @@ window_controls (GtkWidget *window)
G_CONNECT_SWAPPED);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-
+
gtk_container_add (GTK_CONTAINER (control_window), vbox);
-
+
label = gtk_label_new ("<no configure events>");
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+
g_signal_connect (window,
"configure_event",
G_CALLBACK (configure_event_callback),
@@ -7878,19 +7882,19 @@ window_controls (GtkWidget *window)
adjustment = gtk_adjustment_new (10.0, -2000.0, 2000.0, 1.0, 5.0, 0.0);
spin = gtk_spin_button_new (adjustment, 0, 0);
- gtk_box_pack_start (GTK_BOX (vbox), spin, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), spin, FALSE, FALSE);
g_object_set_data (G_OBJECT (control_window), "spin1", spin);
adjustment = gtk_adjustment_new (10.0, -2000.0, 2000.0, 1.0, 5.0, 0.0);
spin = gtk_spin_button_new (adjustment, 0, 0);
- gtk_box_pack_start (GTK_BOX (vbox), spin, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), spin, FALSE, FALSE);
g_object_set_data (G_OBJECT (control_window), "spin2", spin);
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);
g_signal_connect (entry, "changed",
G_CALLBACK (set_geometry_callback),
@@ -7901,7 +7905,7 @@ window_controls (GtkWidget *window)
"clicked",
G_CALLBACK (do_gravity_test),
control_window);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
button = gtk_button_new_with_label ("Reshow with initial size");
@@ -7910,65 +7914,65 @@ window_controls (GtkWidget *window)
G_CALLBACK (gtk_window_reshow_with_initial_size),
window,
G_CONNECT_SWAPPED);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
G_GNUC_END_IGNORE_DEPRECATIONS;
-
+
button = gtk_button_new_with_label ("Queue resize");
g_signal_connect_object (button,
"clicked",
G_CALLBACK (gtk_widget_queue_resize),
window,
G_CONNECT_SWAPPED);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
+
button = gtk_button_new_with_label ("Resize");
g_signal_connect (button,
"clicked",
G_CALLBACK (set_size_callback),
control_window);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
button = gtk_button_new_with_label ("Set default size");
g_signal_connect (button,
"clicked",
G_CALLBACK (set_default_size_callback),
control_window);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
button = gtk_button_new_with_label ("Unset default size");
g_signal_connect (button,
"clicked",
G_CALLBACK (unset_default_size_callback),
control_window);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
+
button = gtk_button_new_with_label ("Set size request");
g_signal_connect (button,
"clicked",
G_CALLBACK (set_size_request_callback),
control_window);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
button = gtk_button_new_with_label ("Unset size request");
g_signal_connect (button,
"clicked",
G_CALLBACK (unset_size_request_callback),
control_window);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
+
button = gtk_button_new_with_label ("Move");
g_signal_connect (button,
"clicked",
G_CALLBACK (set_location_callback),
control_window);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
button = gtk_button_new_with_label ("Move to current position");
g_signal_connect (button,
"clicked",
G_CALLBACK (move_to_position_callback),
control_window);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
button = gtk_check_button_new_with_label ("Allow resize");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
@@ -7976,15 +7980,15 @@ window_controls (GtkWidget *window)
"toggled",
G_CALLBACK (resizable_callback),
control_window);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
+
button = gtk_button_new_with_mnemonic ("_Show");
g_signal_connect_object (button,
"clicked",
G_CALLBACK (gtk_widget_show),
window,
G_CONNECT_SWAPPED);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
button = gtk_button_new_with_mnemonic ("_Hide");
g_signal_connect_object (button,
@@ -7992,7 +7996,7 @@ window_controls (GtkWidget *window)
G_CALLBACK (gtk_widget_hide),
window,
G_CONNECT_SWAPPED);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
om = gtk_combo_box_text_new ();
i = 0;
@@ -8017,13 +8021,13 @@ window_controls (GtkWidget *window)
++i;
}
-
+
g_signal_connect (om,
"changed",
G_CALLBACK (gravity_selected),
control_window);
- gtk_box_pack_end (GTK_BOX (vbox), om, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), om, FALSE, FALSE);
om = gtk_combo_box_text_new ();
@@ -8050,10 +8054,10 @@ window_controls (GtkWidget *window)
G_CALLBACK (pos_selected),
control_window);
- gtk_box_pack_end (GTK_BOX (vbox), om, FALSE, FALSE, 0);
-
+ gtk_box_pack_end (GTK_BOX (vbox), om, FALSE, FALSE);
+
gtk_widget_show_all (vbox);
-
+
return control_window;
}
@@ -8290,10 +8294,10 @@ create_progress_bar (GtkWidget *widget)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
- gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE, TRUE);
frame = gtk_frame_new ("Progress");
- gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_container_add (GTK_CONTAINER (frame), vbox2);
@@ -8303,19 +8307,19 @@ create_progress_bar (GtkWidget *widget)
PANGO_ELLIPSIZE_MIDDLE);
gtk_widget_set_halign (pdata->pbar, GTK_ALIGN_CENTER);
gtk_widget_set_valign (pdata->pbar, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (vbox2), pdata->pbar, FALSE, FALSE, 5);
+ gtk_box_pack_start (GTK_BOX (vbox2), pdata->pbar, FALSE, FALSE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
gtk_widget_set_halign (hbox, GTK_ALIGN_CENTER);
gtk_widget_set_valign (hbox, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 5);
- label = gtk_label_new ("Label updated by user :");
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE);
+ label = gtk_label_new ("Label updated by user :");
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
pdata->label = gtk_label_new ("");
- gtk_box_pack_start (GTK_BOX (hbox), pdata->label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), pdata->label, FALSE, TRUE);
frame = gtk_frame_new ("Options");
- gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE);
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_container_add (GTK_CONTAINER (frame), vbox2);
@@ -8323,7 +8327,7 @@ create_progress_bar (GtkWidget *widget)
grid = gtk_grid_new ();
gtk_grid_set_row_spacing (GTK_GRID (grid), 10);
gtk_grid_set_column_spacing (GTK_GRID (grid), 10);
- gtk_box_pack_start (GTK_BOX (vbox2), grid, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), grid, FALSE, TRUE);
label = gtk_label_new ("Orientation :");
gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
@@ -8352,14 +8356,14 @@ create_progress_bar (GtkWidget *widget)
gtk_grid_attach (GTK_GRID (grid), hbox, 1, 2, 1, 1);
label = gtk_label_new ("Text: ");
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
pdata->entry = gtk_entry_new ();
gtk_widget_set_hexpand (pdata->entry, TRUE);
g_signal_connect (pdata->entry, "changed",
G_CALLBACK (entry_changed),
pdata);
- gtk_box_pack_start (GTK_BOX (hbox), pdata->entry, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), pdata->entry, TRUE, TRUE);
gtk_widget_set_size_request (pdata->entry, 100, -1);
label = gtk_label_new ("Ellipsize text :");
@@ -8681,16 +8685,16 @@ create_snapshot (GtkWidget *widget)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
gtk_container_add (GTK_CONTAINER (window), vbox);
-
+
button = gtk_button_new_with_label ("Snapshot widget");
- gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE);
g_signal_connect (button, "clicked",
G_CALLBACK (snapshot_widget),
data);
-
+
button = gtk_button_new_with_label ("Snapshot toplevel");
data->toplevel_button = button;
- gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE);
g_signal_connect (button, "clicked",
G_CALLBACK (snapshot_widget),
data);
@@ -8807,16 +8811,16 @@ create_selection_test (GtkWidget *widget)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
- gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE);
label = gtk_label_new ("Gets available targets for current selection");
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
scrolled_win = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
- GTK_POLICY_AUTOMATIC,
+ GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start (GTK_BOX (vbox), scrolled_win, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), scrolled_win, TRUE, TRUE);
gtk_widget_set_size_request (scrolled_win, 100, 200);
store = gtk_list_store_new (1, G_TYPE_STRING);
@@ -8959,12 +8963,12 @@ create_scroll_test (GtkWidget *widget)
gtk_container_set_border_width (GTK_CONTAINER (window), 0);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE);
gtk_widget_show (hbox);
drawing_area = gtk_drawing_area_new ();
gtk_widget_set_size_request (drawing_area, 200, 200);
- gtk_box_pack_start (GTK_BOX (hbox), drawing_area, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), drawing_area, TRUE, TRUE);
gtk_widget_show (drawing_area);
gtk_widget_set_events (drawing_area, GDK_EXPOSURE_MASK | GDK_SCROLL_MASK);
@@ -8973,7 +8977,7 @@ create_scroll_test (GtkWidget *widget)
scroll_test_pos = 0.0;
scrollbar = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, adjustment);
- gtk_box_pack_start (GTK_BOX (hbox), scrollbar, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), scrollbar, FALSE, FALSE);
gtk_widget_show (scrollbar);
g_signal_connect (drawing_area, "draw",
@@ -9094,7 +9098,7 @@ create_timeout_test (GtkWidget *widget)
label = gtk_label_new ("count: 0");
g_object_set (label, "margin", 10, NULL);
- gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE);
gtk_widget_show (label);
button = gtk_button_new_with_label ("close");
@@ -9102,7 +9106,7 @@ create_timeout_test (GtkWidget *widget)
G_CALLBACK (gtk_widget_destroy),
window);
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE);
gtk_widget_grab_default (button);
gtk_widget_show (button);
@@ -9111,7 +9115,7 @@ create_timeout_test (GtkWidget *widget)
G_CALLBACK(start_timeout_test),
label);
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE);
gtk_widget_show (button);
button = gtk_button_new_with_label ("stop");
@@ -9119,7 +9123,7 @@ create_timeout_test (GtkWidget *widget)
G_CALLBACK (stop_timeout_test),
NULL);
gtk_widget_set_can_default (button, TRUE);
- gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE);
gtk_widget_show (button);
}
@@ -9165,7 +9169,7 @@ create_mainloop (GtkWidget *widget)
label = gtk_label_new ("In recursive main loop...");
g_object_set (label, "margin", 20, NULL);
- gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE);
gtk_widget_show (label);
gtk_dialog_add_button (GTK_DIALOG (window),
@@ -9596,7 +9600,7 @@ create_native_dialogs (GtkWidget *widget)
gtk_container_add (GTK_CONTAINER (window), box);
label = gtk_label_new ("");
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 4);
+ gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE);
combo = gtk_combo_box_text_new ();
@@ -9609,7 +9613,7 @@ create_native_dialogs (GtkWidget *widget)
g_signal_connect (combo, "changed",
G_CALLBACK (native_action_changed), native);
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), GTK_FILE_CHOOSER_ACTION_OPEN);
- gtk_box_pack_start (GTK_BOX (box), combo, FALSE, FALSE, 4);
+ gtk_box_pack_start (GTK_BOX (box), combo, FALSE, FALSE);
combo = gtk_combo_box_text_new ();
@@ -9620,34 +9624,34 @@ create_native_dialogs (GtkWidget *widget)
g_signal_connect (combo, "changed",
G_CALLBACK (native_filter_changed), native);
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
- gtk_box_pack_start (GTK_BOX (box), combo, FALSE, FALSE, 4);
+ gtk_box_pack_start (GTK_BOX (box), combo, FALSE, FALSE);
check_button = gtk_check_button_new_with_label ("Modal");
g_signal_connect (check_button, "toggled",
G_CALLBACK (native_modal_toggle), native);
- gtk_box_pack_start (GTK_BOX (box), check_button, FALSE, FALSE, 4);
+ gtk_box_pack_start (GTK_BOX (box), check_button, FALSE, FALSE);
check_button = gtk_check_button_new_with_label ("Multiple select");
g_signal_connect (check_button, "toggled",
G_CALLBACK (native_multi_select_toggle), native);
- gtk_box_pack_start (GTK_BOX (box), check_button, FALSE, FALSE, 4);
+ gtk_box_pack_start (GTK_BOX (box), check_button, FALSE, FALSE);
check_button = gtk_check_button_new_with_label ("Confirm overwrite");
g_signal_connect (check_button, "toggled",
G_CALLBACK (native_overwrite_confirmation_toggle), native);
- gtk_box_pack_start (GTK_BOX (box), check_button, FALSE, FALSE, 4);
+ gtk_box_pack_start (GTK_BOX (box), check_button, FALSE, FALSE);
check_button = gtk_check_button_new_with_label ("Extra widget");
g_signal_connect (check_button, "toggled",
G_CALLBACK (native_extra_widget_toggle), native);
- gtk_box_pack_start (GTK_BOX (box), check_button, FALSE, FALSE, 4);
+ gtk_box_pack_start (GTK_BOX (box), check_button, FALSE, FALSE);
show_button = gtk_button_new_with_label ("Show");
hide_button = gtk_button_new_with_label ("Hide");
gtk_widget_set_sensitive (hide_button, FALSE);
- gtk_box_pack_start (GTK_BOX (box), show_button, FALSE, FALSE, 4);
- gtk_box_pack_start (GTK_BOX (box), hide_button, FALSE, FALSE, 4);
+ gtk_box_pack_start (GTK_BOX (box), show_button, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (box), hide_button, FALSE, FALSE);
/* connect signals */
g_signal_connect (native, "response",
@@ -9798,7 +9802,7 @@ create_main_window (void)
gtk_get_minor_version ());
label = gtk_label_new (buffer);
- gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE);
gtk_widget_set_name (label, "testgtk-version-label");
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
@@ -9806,7 +9810,7 @@ create_main_window (void)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_NEVER,
GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start (GTK_BOX (box1), scrolled_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), scrolled_window, TRUE, TRUE);
box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (box2), 10);
@@ -9819,27 +9823,27 @@ create_main_window (void)
{
button = gtk_button_new_with_label (buttons[i].label);
if (buttons[i].func)
- g_signal_connect (button,
- "clicked",
+ g_signal_connect (button,
+ "clicked",
G_CALLBACK(buttons[i].func),
NULL);
else
gtk_widget_set_sensitive (button, FALSE);
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
}
separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
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);
button = gtk_button_new_with_mnemonic ("_Close");
g_signal_connect (button, "clicked",
G_CALLBACK (do_exit),
window);
- gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
gtk_widget_set_can_default (button, TRUE);
gtk_widget_grab_default (button);
diff --git a/tests/testheaderbar.c b/tests/testheaderbar.c
index d2b1a5f..26a4d72 100644
--- a/tests/testheaderbar.c
+++ b/tests/testheaderbar.c
@@ -92,10 +92,10 @@ change_header (GtkButton *button, gpointer data)
g_object_set (box, "margin", 10, NULL);
gtk_container_add (GTK_CONTAINER (header), box);
label = gtk_label_new ("Label");
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), label, FALSE, TRUE);
widget = gtk_level_bar_new ();
gtk_level_bar_set_value (GTK_LEVEL_BAR (widget), 0.4);
- gtk_box_pack_start (GTK_BOX (box), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), widget, TRUE, TRUE);
gtk_widget_show_all (header);
}
else
@@ -161,12 +161,12 @@ main (int argc, char *argv[])
button = gtk_button_new_with_label ("Fullscreen");
gtk_action_bar_pack_end (GTK_ACTION_BAR (footer), button);
g_signal_connect (button, "clicked", G_CALLBACK (toggle_fullscreen), window);
- gtk_box_pack_end (GTK_BOX (box), footer, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (box), footer, FALSE, FALSE);
content = gtk_image_new_from_icon_name ("start-here-symbolic", GTK_ICON_SIZE_DIALOG);
gtk_image_set_pixel_size (GTK_IMAGE (content), 512);
- gtk_box_pack_start (GTK_BOX (box), content, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), content, FALSE, TRUE);
gtk_widget_show_all (window);
diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c
index fe47ed3..4c03675 100644
--- a/tests/testheightforwidth.c
+++ b/tests/testheightforwidth.c
@@ -956,7 +956,7 @@ create_window (void)
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (test_clicked), &interfaces[i]);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
gtk_widget_show (button);
}
diff --git a/tests/testiconview.c b/tests/testiconview.c
index 010109a..9cb5498 100644
--- a/tests/testiconview.c
+++ b/tests/testiconview.c
@@ -433,7 +433,7 @@ main (gint argc, gchar **argv)
gtk_container_add (GTK_CONTAINER (window), vbox);
paned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_box_pack_start (GTK_BOX (vbox), paned, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), paned, TRUE, TRUE);
icon_list = gtk_icon_view_new ();
gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_list), GTK_SELECTION_MULTIPLE);
@@ -553,43 +553,43 @@ main (gint argc, gchar **argv)
bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START);
- gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE);
button = gtk_button_new_with_label ("Add some");
g_signal_connect (button, "clicked", G_CALLBACK (add_some), icon_list);
- gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE);
button = gtk_button_new_with_label ("Add many");
g_signal_connect (button, "clicked", G_CALLBACK (add_many), icon_list);
- gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE);
button = gtk_button_new_with_label ("Add large");
g_signal_connect (button, "clicked", G_CALLBACK (add_large), icon_list);
- gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE);
button = gtk_button_new_with_label ("Remove selected");
g_signal_connect (button, "clicked", G_CALLBACK (foreach_selected_remove), icon_list);
- gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE);
button = gtk_button_new_with_label ("Swap");
g_signal_connect (button, "clicked", G_CALLBACK (swap_rows), icon_list);
- gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE);
bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START);
- gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE);
button = gtk_button_new_with_label ("Select all");
g_signal_connect (button, "clicked", G_CALLBACK (select_all), icon_list);
- gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE);
button = gtk_button_new_with_label ("Unselect all");
g_signal_connect (button, "clicked", G_CALLBACK (unselect_all), icon_list);
- gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE);
button = gtk_button_new_with_label ("Select nonexisting");
g_signal_connect (button, "clicked", G_CALLBACK (select_nonexisting), icon_list);
- gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE);
icon_list = gtk_icon_view_new ();
diff --git a/tests/testinput.c b/tests/testinput.c
index 57a9e4f..15789c8 100644
--- a/tests/testinput.c
+++ b/tests/testinput.c
@@ -321,7 +321,7 @@ main (int argc, char *argv[])
drawing_area = gtk_drawing_area_new ();
gtk_widget_set_size_request (drawing_area, 200, 200);
- gtk_box_pack_start (GTK_BOX (vbox), drawing_area, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), drawing_area, TRUE, TRUE);
gtk_widget_show (drawing_area);
@@ -373,7 +373,7 @@ main (int argc, char *argv[])
/* .. And create some buttons */
button = gtk_button_new_with_label ("Quit");
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy),
diff --git a/tests/testmerge.c b/tests/testmerge.c
index ee0b38f..e719081 100644
--- a/tests/testmerge.c
+++ b/tests/testmerge.c
@@ -224,7 +224,7 @@ add_widget (GtkUIManager *merge,
GtkWidget *widget,
GtkBox *box)
{
- gtk_box_pack_start (box, widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (box, widget, FALSE, FALSE);
gtk_widget_show (widget);
}
@@ -613,35 +613,35 @@ main (int argc, char **argv)
frame = gtk_frame_new ("Menus and Toolbars");
gtk_grid_attach (GTK_GRID (grid), frame, 0, 1, 2, 1);
-
+
menu_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_set_border_width (GTK_CONTAINER (menu_box), 2);
gtk_container_add (GTK_CONTAINER (frame), menu_box);
statusbar = gtk_statusbar_new ();
- gtk_box_pack_end (GTK_BOX (menu_box), statusbar, FALSE, FALSE, 0);
-
+ gtk_box_pack_end (GTK_BOX (menu_box), statusbar, FALSE, FALSE);
+
area = gtk_drawing_area_new ();
gtk_widget_set_events (area, GDK_BUTTON_PRESS_MASK);
gtk_widget_set_size_request (area, -1, 40);
- gtk_box_pack_end (GTK_BOX (menu_box), area, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (menu_box), area, FALSE, FALSE);
gtk_widget_show (area);
button = gtk_button_new ();
- gtk_box_pack_end (GTK_BOX (menu_box), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (menu_box), button, FALSE, FALSE);
gtk_activatable_set_related_action (GTK_ACTIVATABLE (button),
gtk_action_group_get_action (action_group, "AboutAction"));
gtk_widget_show (button);
button = gtk_check_button_new ();
- gtk_box_pack_end (GTK_BOX (menu_box), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (menu_box), button, FALSE, FALSE);
gtk_activatable_set_related_action (GTK_ACTIVATABLE (button),
gtk_action_group_get_action (action_group, "BoldAction"));
gtk_widget_show (button);
box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
- gtk_box_pack_end (GTK_BOX (menu_box), box, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (menu_box), box, FALSE, FALSE);
gtk_container_add (GTK_CONTAINER (box), gtk_label_new ("Bold:"));
button = gtk_switch_new ();
gtk_container_add (GTK_CONTAINER (box), button);
@@ -673,33 +673,33 @@ main (int argc, char **argv)
button = gtk_check_button_new_with_label (merge_ids[i].filename);
g_object_set_data (G_OBJECT (button), "mergenum", GINT_TO_POINTER (i));
g_signal_connect (button, "toggled", G_CALLBACK (toggle_merge), merge);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
}
button = gtk_check_button_new_with_label ("Tearoffs");
g_signal_connect (button, "clicked", G_CALLBACK (toggle_tearoffs), merge);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
button = gtk_check_button_new_with_label ("Dynamic");
g_signal_connect (button, "clicked", G_CALLBACK (toggle_dynamic), merge);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
button = gtk_button_new_with_label ("Activate path");
g_signal_connect (button, "clicked", G_CALLBACK (activate_path), merge);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
button = gtk_button_new_with_label ("Dump Tree");
g_signal_connect (button, "clicked", G_CALLBACK (dump_tree), merge);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
button = gtk_button_new_with_label ("Dump Toplevels");
g_signal_connect (button, "clicked", G_CALLBACK (dump_toplevels), merge);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
button = gtk_button_new_with_label ("Dump Accels");
g_signal_connect (button, "clicked", G_CALLBACK (dump_accels), NULL);
- gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
view = create_tree_view (merge);
gtk_widget_set_hexpand (view, TRUE);
diff --git a/tests/testmultidisplay.c b/tests/testmultidisplay.c
index 5c56137..5b8412b 100644
--- a/tests/testmultidisplay.c
+++ b/tests/testmultidisplay.c
@@ -79,9 +79,9 @@ make_selection_dialog (GdkScreen * screen,
"border_width", 5,
"orientation", GTK_ORIENTATION_VERTICAL,
NULL);
- gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE, FALSE);
- gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE);
gtk_widget_grab_focus (entry);
gtk_dialog_add_buttons (GTK_DIALOG (window),
diff --git a/tests/testoffscreen.c b/tests/testoffscreen.c
index b76df4c..113376b 100644
--- a/tests/testoffscreen.c
+++ b/tests/testoffscreen.c
@@ -87,7 +87,7 @@ create_layout (GtkWidget *vbox)
gtk_scrolled_window_set_placement (GTK_SCROLLED_WINDOW (scrolledwindow),
GTK_CORNER_TOP_RIGHT);
- gtk_box_pack_start (GTK_BOX (vbox), scrolledwindow, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), scrolledwindow, TRUE, TRUE);
layout_widget = gtk_layout_new (NULL, NULL);
layout = GTK_LAYOUT (layout_widget);
@@ -152,7 +152,7 @@ create_treeview (GtkWidget *vbox)
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow),
GTK_SHADOW_IN);
- gtk_box_pack_start (GTK_BOX (vbox), scrolledwindow, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), scrolledwindow, TRUE, TRUE);
store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
@@ -198,16 +198,16 @@ create_widgets (void)
main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (main_vbox), main_hbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (main_vbox), main_hbox, TRUE, TRUE);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
- gtk_box_pack_start (GTK_BOX (main_hbox), vbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (main_hbox), vbox, TRUE, TRUE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
label = gtk_label_new ("This label may be ellipsized\nto make it fit.");
- gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
combo = gtk_combo_box_text_new ();
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "NONE");
@@ -215,7 +215,7 @@ create_widgets (void)
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "MIDDLE");
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), "END");
gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
- gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), combo, TRUE, TRUE);
g_signal_connect (combo, "changed",
G_CALLBACK (combo_changed_cb),
@@ -223,17 +223,17 @@ create_widgets (void)
entry = gtk_entry_new ();
gtk_entry_set_text (GTK_ENTRY (entry), "an entry - lots of text.... lots of text.... lots of text.... lots
of text.... ");
- gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE);
label = gtk_label_new ("Label after entry.");
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
- gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE);
button = gtk_button_new_with_label ("Button");
- gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE);
button = gtk_check_button_new_with_mnemonic ("_Check button");
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
cb = gtk_combo_box_text_new ();
entry = gtk_entry_new ();
@@ -248,14 +248,14 @@ create_widgets (void)
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (cb), "item2");
gtk_entry_set_text (GTK_ENTRY (entry), "hello world ♥ foo");
gtk_editable_select_region (GTK_EDITABLE (entry), 0, -1);
- gtk_box_pack_start (GTK_BOX (vbox), cb, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), cb, TRUE, TRUE);
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
text_view = gtk_text_view_new ();
- gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE);
gtk_container_add (GTK_CONTAINER (sw), text_view);
create_layout (vbox);
@@ -310,10 +310,10 @@ main (int argc,
scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
0, G_PI * 2, 0.01);
- gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE);
button = gtk_button_new_with_label ("Remove child 2");
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
if (use_offscreen)
{
@@ -328,7 +328,7 @@ main (int argc,
offscreen = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
}
- gtk_box_pack_start (GTK_BOX (vbox), offscreen, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), offscreen, TRUE, TRUE);
widget = create_widgets ();
if (use_offscreen)
@@ -343,7 +343,7 @@ main (int argc,
GtkWidget *widget2, *box2, *offscreen2;
offscreen2 = gtk_offscreen_box_new ();
- gtk_box_pack_start (GTK_BOX (widget), offscreen2, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (widget), offscreen2, FALSE, FALSE);
g_signal_connect (scale, "value_changed",
G_CALLBACK (scale_changed),
@@ -353,11 +353,11 @@ main (int argc,
gtk_offscreen_box_add2 (GTK_OFFSCREEN_BOX (offscreen2), box2);
widget2 = gtk_button_new_with_label ("Offscreen in offscreen");
- gtk_box_pack_start (GTK_BOX (box2), widget2, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), widget2, FALSE, FALSE);
widget2 = gtk_entry_new ();
gtk_entry_set_text (GTK_ENTRY (widget2), "Offscreen in offscreen");
- gtk_box_pack_start (GTK_BOX (box2), widget2, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box2), widget2, FALSE, FALSE);
}
if (use_offscreen)
diff --git a/tests/testorientable.c b/tests/testorientable.c
index d81b612..e778eac 100644
--- a/tests/testorientable.c
+++ b/tests/testorientable.c
@@ -64,13 +64,13 @@ main (int argc, char **argv)
gtk_grid_attach (GTK_GRID (grid), box, 0, 1, 1, 1);
gtk_box_pack_start (GTK_BOX (box),
gtk_button_new_with_label ("GtkBox 1"),
- TRUE, TRUE, 0);
+ TRUE, TRUE);
gtk_box_pack_start (GTK_BOX (box),
gtk_button_new_with_label ("GtkBox 2"),
- TRUE, TRUE, 0);
+ TRUE, TRUE);
gtk_box_pack_start (GTK_BOX (box),
gtk_button_new_with_label ("GtkBox 3"),
- TRUE, TRUE, 0);
+ TRUE, TRUE);
/* GtkButtonBox */
box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
@@ -78,13 +78,13 @@ main (int argc, char **argv)
gtk_grid_attach (GTK_GRID (grid), box, 1, 1, 1, 1);
gtk_box_pack_start (GTK_BOX (box),
gtk_button_new_with_label ("GtkButtonBox 1"),
- TRUE, TRUE, 0);
+ TRUE, TRUE);
gtk_box_pack_start (GTK_BOX (box),
gtk_button_new_with_label ("GtkButtonBox 2"),
- TRUE, TRUE, 0);
+ TRUE, TRUE);
gtk_box_pack_start (GTK_BOX (box),
gtk_button_new_with_label ("GtkButtonBox 3"),
- TRUE, TRUE, 0);
+ TRUE, TRUE);
/* GtkSeparator */
box = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
diff --git a/tests/testoverlay.c b/tests/testoverlay.c
index 5f0ec47..de33d0b 100644
--- a/tests/testoverlay.c
+++ b/tests/testoverlay.c
@@ -448,10 +448,14 @@ test_input_stacking (void)
label = gtk_label_new ("This is some overlaid text\n"
"It does not get input\n"
"But the entry does");
- 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);
entry = gtk_entry_new ();
- 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 (win), overlay);
diff --git a/tests/testpixbuf-save.c b/tests/testpixbuf-save.c
index 35ef367..be95c03 100644
--- a/tests/testpixbuf-save.c
+++ b/tests/testpixbuf-save.c
@@ -377,12 +377,12 @@ main (int argc, char **argv)
g_signal_connect (drawing_area, "configure_event",
G_CALLBACK (configure_cb), NULL);
- g_signal_connect (window, "key_press_event",
- G_CALLBACK (keypress_check), drawing_area);
+ g_signal_connect (window, "key_press_event",
+ G_CALLBACK (keypress_check), drawing_area);
g_object_set_data_full (G_OBJECT (drawing_area), "pixbuf", pixbuf,
(GDestroyNotify) g_object_unref);
- gtk_box_pack_start (GTK_BOX (vbox), drawing_area, TRUE, TRUE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), drawing_area, TRUE, TRUE);
+
gtk_widget_show_all (window);
gtk_main ();
return 0;
diff --git a/tests/testpixbuf-scale.c b/tests/testpixbuf-scale.c
index f15c2cb..da58dcc 100644
--- a/tests/testpixbuf-scale.c
+++ b/tests/testpixbuf-scale.c
@@ -108,23 +108,23 @@ main(int argc, char **argv)
g_signal_connect (combo_box, "changed",
G_CALLBACK (set_interp_type),
NULL);
-
+
gtk_widget_set_halign (combo_box, GTK_ALIGN_START);
- gtk_box_pack_start (GTK_BOX (vbox), combo_box, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), combo_box, FALSE, FALSE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
label = gtk_label_new ("Overall Alpha:");
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
adjustment = gtk_adjustment_new (overall_alpha, 0, 255, 1, 10, 0);
g_signal_connect (adjustment, "value_changed",
G_CALLBACK (overall_changed_cb), NULL);
-
+
hscale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adjustment);
gtk_scale_set_digits (GTK_SCALE (hscale), 0);
- gtk_box_pack_start (GTK_BOX (hbox), hscale, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), hscale, TRUE, TRUE);
gtk_widget_show_all (vbox);
@@ -133,7 +133,7 @@ main(int argc, char **argv)
&scratch_requisition, NULL);
darea = gtk_drawing_area_new ();
- gtk_box_pack_start (GTK_BOX (vbox), darea, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), darea, TRUE, TRUE);
g_signal_connect (darea, "draw",
G_CALLBACK (draw_cb), NULL);
diff --git a/tests/testrecentchoosermenu.c b/tests/testrecentchoosermenu.c
index ad04ed5..0c644b9 100644
--- a/tests/testrecentchoosermenu.c
+++ b/tests/testrecentchoosermenu.c
@@ -161,13 +161,13 @@ main (int argc, char *argv[])
accel_group = gtk_accel_group_new ();
gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
-
+
box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
gtk_container_add (GTK_CONTAINER (window), box);
gtk_widget_show (box);
menubar = gtk_menu_bar_new ();
- gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE);
gtk_widget_show (menubar);
menu = create_file_menu (accel_group);
@@ -183,14 +183,14 @@ main (int argc, char *argv[])
gtk_widget_show (menuitem);
label = gtk_label_new ("No recent item selected");
- gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE);
gtk_widget_show (label);
button = gtk_button_new_with_label ("Close");
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy),
window);
- gtk_box_pack_end (GTK_BOX (box), button, TRUE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (box), button, TRUE, TRUE);
gtk_widget_set_can_default (button, TRUE);
gtk_widget_grab_default (button);
gtk_widget_show (button);
diff --git a/tests/testscale.c b/tests/testscale.c
index 17c676f..a8294ca 100755
--- a/tests/testscale.c
+++ b/tests/testscale.c
@@ -130,7 +130,7 @@ int main (int argc, char *argv[])
scales = g_slist_prepend (scales, scale);
gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
gtk_container_add (GTK_CONTAINER (frame), scale);
- gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE);
frame = gtk_frame_new ("With fill level");
scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1);
@@ -139,7 +139,7 @@ int main (int argc, char *argv[])
gtk_range_set_show_fill_level (GTK_RANGE (scale), TRUE);
gtk_range_set_fill_level (GTK_RANGE (scale), 50);
gtk_container_add (GTK_CONTAINER (frame), scale);
- gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE);
frame = gtk_frame_new ("Simple marks");
extra_scale = scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1);
@@ -149,7 +149,7 @@ int main (int argc, char *argv[])
gtk_scale_add_mark (GTK_SCALE (scale), marks[1], GTK_POS_BOTTOM, NULL);
gtk_scale_add_mark (GTK_SCALE (scale), marks[2], GTK_POS_BOTTOM, NULL);
gtk_container_add (GTK_CONTAINER (frame), scale);
- gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE);
frame = gtk_frame_new ("Simple marks up");
scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1);
@@ -159,7 +159,7 @@ int main (int argc, char *argv[])
gtk_scale_add_mark (GTK_SCALE (scale), marks[1], GTK_POS_TOP, NULL);
gtk_scale_add_mark (GTK_SCALE (scale), marks[2], GTK_POS_TOP, NULL);
gtk_container_add (GTK_CONTAINER (frame), scale);
- gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE);
frame = gtk_frame_new ("Labeled marks");
box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
@@ -171,7 +171,7 @@ int main (int argc, char *argv[])
gtk_scale_add_mark (GTK_SCALE (scale), marks[1], GTK_POS_BOTTOM, labels[1]);
gtk_scale_add_mark (GTK_SCALE (scale), marks[2], GTK_POS_BOTTOM, labels[2]);
gtk_container_add (GTK_CONTAINER (frame), scale);
- gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE);
frame = gtk_frame_new ("Some labels");
scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1);
@@ -181,7 +181,7 @@ int main (int argc, char *argv[])
gtk_scale_add_mark (GTK_SCALE (scale), marks[1], GTK_POS_TOP, NULL);
gtk_scale_add_mark (GTK_SCALE (scale), marks[2], GTK_POS_TOP, labels[2]);
gtk_container_add (GTK_CONTAINER (frame), scale);
- gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE);
frame = gtk_frame_new ("Above and below");
scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1);
@@ -192,7 +192,7 @@ int main (int argc, char *argv[])
gtk_scale_add_mark (GTK_SCALE (scale), bath_marks[2], GTK_POS_BOTTOM, bath_labels[2]);
gtk_scale_add_mark (GTK_SCALE (scale), bath_marks[3], GTK_POS_TOP, bath_labels[3]);
gtk_container_add (GTK_CONTAINER (frame), scale);
- gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE);
frame = gtk_frame_new ("Positions");
scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1);
@@ -203,7 +203,7 @@ int main (int argc, char *argv[])
gtk_scale_add_mark (GTK_SCALE (scale), pos_marks[2], GTK_POS_TOP, pos_labels[2]);
gtk_scale_add_mark (GTK_SCALE (scale), pos_marks[3], GTK_POS_BOTTOM, pos_labels[3]);
gtk_container_add (GTK_CONTAINER (frame), scale);
- gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE);
box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_container_add (GTK_CONTAINER (box1), box2);
diff --git a/tests/testscrolledwindow.c b/tests/testscrolledwindow.c
index 47677d3..9941cb1 100644
--- a/tests/testscrolledwindow.c
+++ b/tests/testscrolledwindow.c
@@ -106,16 +106,16 @@ scrollable_policy (void)
gtk_widget_show (vbox);
gtk_widget_show (hbox);
gtk_container_add (GTK_CONTAINER (window), hbox);
- gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE);
frame = gtk_frame_new ("Scrolled Window");
gtk_widget_show (frame);
- gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE);
swindow = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-
+
gtk_widget_show (swindow);
gtk_container_add (GTK_CONTAINER (frame), swindow);
@@ -144,7 +144,7 @@ scrollable_policy (void)
gtk_widget_show (cntl);
gtk_widget_show (expander);
gtk_container_add (GTK_CONTAINER (expander), cntl);
- gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE);
/* Add Horizontal policy control here */
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
@@ -152,7 +152,7 @@ scrollable_policy (void)
widget = gtk_label_new ("hscroll-policy");
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
widget = gtk_combo_box_text_new ();
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Minimum");
@@ -160,8 +160,8 @@ scrollable_policy (void)
gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (horizontal_policy_changed), viewport);
@@ -172,7 +172,7 @@ scrollable_policy (void)
widget = gtk_label_new ("vscroll-policy");
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
widget = gtk_combo_box_text_new ();
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Minimum");
@@ -180,8 +180,8 @@ scrollable_policy (void)
gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (vertical_policy_changed), viewport);
@@ -191,11 +191,11 @@ scrollable_policy (void)
widget = gtk_label_new ("min-content-width");
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
widget = gtk_spin_button_new_with_range (100.0, 1000.0, 10.0);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE);
gtk_widget_show (widget);
gtk_widget_show (hbox);
@@ -206,11 +206,11 @@ scrollable_policy (void)
widget = gtk_label_new ("min-content-height");
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
widget = gtk_spin_button_new_with_range (100.0, 1000.0, 10.0);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE);
gtk_widget_show (widget);
gtk_widget_show (hbox);
@@ -223,7 +223,7 @@ scrollable_policy (void)
widget = gtk_label_new ("label-flip");
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
widget = gtk_combo_box_text_new ();
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Horizontal");
@@ -231,8 +231,8 @@ scrollable_policy (void)
gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (label_flip_changed), label);
@@ -240,7 +240,7 @@ scrollable_policy (void)
/* Add Kinetic scrolling control here */
widget = gtk_check_button_new_with_label ("Kinetic scrolling");
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (cntl), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (cntl), widget, TRUE, TRUE);
g_signal_connect (G_OBJECT (widget), "toggled",
G_CALLBACK (kinetic_scrolling_changed), swindow);
@@ -252,7 +252,7 @@ scrollable_policy (void)
widget = gtk_menu_button_new ();
gtk_menu_button_set_popover (GTK_MENU_BUTTON (widget), popover);
gtk_container_add (GTK_CONTAINER (widget), gtk_label_new ("Popover"));
- gtk_box_pack_start (GTK_BOX (cntl), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (cntl), widget, FALSE, FALSE);
gtk_widget_show_all (widget);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
@@ -264,7 +264,7 @@ scrollable_policy (void)
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_box_pack_end (GTK_BOX (vbox), swindow, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), swindow, FALSE, FALSE);
gtk_widget_show (swindow);
gtk_widget_show (hbox);
@@ -278,10 +278,10 @@ scrollable_policy (void)
widget = gtk_label_new ("min-content-width");
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
widget = gtk_spin_button_new_with_range (0.0, 150.0, 10.0);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
gtk_widget_show (widget);
gtk_widget_show (hbox);
@@ -293,12 +293,12 @@ scrollable_policy (void)
widget = gtk_label_new ("min-content-height");
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
widget = gtk_spin_button_new_with_range (0.0, 150.0, 10.0);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
gtk_widget_show (widget);
gtk_widget_show (hbox);
@@ -313,10 +313,10 @@ scrollable_policy (void)
widget = gtk_label_new ("max-content-width");
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
widget = gtk_spin_button_new_with_range (250.0, 1000.0, 10.0);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
gtk_widget_show (widget);
gtk_widget_show (hbox);
@@ -328,11 +328,11 @@ scrollable_policy (void)
widget = gtk_label_new ("max-content-height");
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
widget = gtk_spin_button_new_with_range (250.0, 1000.0, 10.0);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
gtk_widget_show (widget);
gtk_widget_show (hbox);
@@ -347,14 +347,14 @@ scrollable_policy (void)
widget = gtk_button_new_with_label ("Remove");
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
g_signal_connect (widget, "clicked",
G_CALLBACK (remove_row), listbox);
widget = gtk_button_new_with_label ("Add");
- gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
gtk_widget_show (widget);
gtk_widget_show (hbox);
diff --git a/tests/testselection.c b/tests/testselection.c
index 35d8887..3fb0756 100644
--- a/tests/testselection.c
+++ b/tests/testselection.c
@@ -420,9 +420,9 @@ main (int argc, char *argv[])
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 10);
- gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE);
gtk_widget_show (vbox);
-
+
selection_button = gtk_toggle_button_new_with_label ("Claim Selection");
gtk_container_add (GTK_CONTAINER (vbox), selection_button);
gtk_widget_show (selection_button);
@@ -451,11 +451,11 @@ main (int argc, char *argv[])
gtk_widget_show (hbox);
label = gtk_label_new ("Target:");
- gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE);
gtk_widget_show (label);
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);
gtk_widget_show (entry);
/* .. And create some buttons */
diff --git a/tests/testsensitive.c b/tests/testsensitive.c
index 3a54f56..b7c8f63 100644
--- a/tests/testsensitive.c
+++ b/tests/testsensitive.c
@@ -65,15 +65,15 @@ int main (int argc, char *argv[])
gtk_container_add (GTK_CONTAINER (window), box);
w = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 15);
- gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (w), gtk_entry_new (), TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (w), gtk_entry_new (), TRUE, TRUE);
bu = gtk_button_new_with_label ("Bu");
- gtk_box_pack_start (GTK_BOX (w), bu, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (w), bu, TRUE, TRUE);
c = gtk_switch_new ();
gtk_switch_set_active (GTK_SWITCH (c), TRUE);
gtk_widget_set_halign (c, GTK_ALIGN_CENTER);
gtk_widget_set_valign (c, GTK_ALIGN_CENTER);
- gtk_box_pack_start (GTK_BOX (box), c, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), c, TRUE, TRUE);
g_signal_connect (bu, "clicked", G_CALLBACK (set_insensitive), w);
g_signal_connect (bu, "state-changed", G_CALLBACK (state_changed), NULL);
diff --git a/tests/testsocket.c b/tests/testsocket.c
index b250f10..4d1456a 100644
--- a/tests/testsocket.c
+++ b/tests/testsocket.c
@@ -93,20 +93,20 @@ static Socket *
create_socket (void)
{
GtkWidget *label;
-
+
Socket *socket = g_new (Socket, 1);
-
+
socket->box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
socket->socket = gtk_socket_new ();
-
- gtk_box_pack_start (GTK_BOX (socket->box), socket->socket, TRUE, TRUE, 0);
-
+
+ gtk_box_pack_start (GTK_BOX (socket->box), socket->socket, TRUE, TRUE);
+
socket->frame = gtk_frame_new (NULL);
gtk_frame_set_shadow_type (GTK_FRAME (socket->frame), GTK_SHADOW_IN);
- gtk_box_pack_start (GTK_BOX (socket->box), socket->frame, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (socket->box), socket->frame, TRUE, TRUE);
gtk_widget_show (socket->frame);
-
+
label = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label), "<span color=\"red\">Empty</span>");
gtk_container_add (GTK_CONTAINER (socket->frame), label);
@@ -157,9 +157,9 @@ child_read_watch (GIOChannel *channel, GIOCondition cond, gpointer data)
else
{
Socket *socket = create_socket ();
- gtk_box_pack_start (GTK_BOX (box), socket->box, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), socket->box, TRUE, TRUE);
gtk_widget_show (socket->box);
-
+
gtk_socket_add_id (GTK_SOCKET (socket->socket), xid);
}
g_free (line);
@@ -194,12 +194,12 @@ add_child (GtkWidget *window,
if (active)
{
socket = create_socket ();
- gtk_box_pack_start (GTK_BOX (box), socket->box, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), socket->box, TRUE, TRUE);
gtk_widget_show (socket->box);
sprintf(buffer, "%#lx", (gulong) gtk_socket_get_id (GTK_SOCKET (socket->socket)));
argv[1] = buffer;
}
-
+
if (!g_spawn_async_with_pipes (NULL, argv, NULL, 0, NULL, NULL, NULL, NULL, &out_fd, NULL, &error))
{
fprintf (stderr, "Can't exec testsocket_child: %s\n", error->message);
@@ -238,7 +238,7 @@ add_local_active_child (GtkWidget *window)
Socket *socket;
socket = create_socket ();
- gtk_box_pack_start (GTK_BOX (box), socket->box, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), socket->box, TRUE, TRUE);
gtk_widget_show (socket->box);
create_child_plug (gtk_socket_get_id (GTK_SOCKET (socket->socket)), TRUE);
@@ -251,7 +251,7 @@ add_local_passive_child (GtkWidget *window)
Window xid;
socket = create_socket ();
- gtk_box_pack_start (GTK_BOX (box), socket->box, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), socket->box, TRUE, TRUE);
gtk_widget_show (socket->box);
xid = create_child_plug (0, TRUE);
@@ -338,56 +338,56 @@ main (int argc, char *argv[])
accel_group = gtk_accel_group_new ();
gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
- gtk_box_pack_start (GTK_BOX (vbox), menubar, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), menubar, FALSE, FALSE);
button = gtk_button_new_with_label ("Add Active Child");
- gtk_box_pack_start (GTK_BOX(vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(vbox), button, FALSE, FALSE);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (add_active_child), vbox);
button = gtk_button_new_with_label ("Add Passive Child");
- gtk_box_pack_start (GTK_BOX(vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(vbox), button, FALSE, FALSE);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (add_passive_child), vbox);
button = gtk_button_new_with_label ("Add Local Active Child");
- gtk_box_pack_start (GTK_BOX(vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(vbox), button, FALSE, FALSE);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (add_local_active_child), vbox);
button = gtk_button_new_with_label ("Add Local Passive Child");
- gtk_box_pack_start (GTK_BOX(vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(vbox), button, FALSE, FALSE);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (add_local_passive_child), vbox);
button = gtk_button_new_with_label ("Remove Last Child");
- gtk_box_pack_start (GTK_BOX(vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(vbox), button, FALSE, FALSE);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (remove_child), vbox);
checkbutton = gtk_check_button_new_with_label ("Grab keyboard");
- gtk_box_pack_start (GTK_BOX (vbox), checkbutton, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), checkbutton, FALSE, FALSE);
g_signal_connect (checkbutton, "toggled",
G_CALLBACK (grab_window_toggled),
window);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(vbox), hbox, FALSE, FALSE);
entry = gtk_entry_new ();
- gtk_box_pack_start (GTK_BOX(hbox), entry, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(hbox), entry, FALSE, FALSE);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
box = hbox;
-
+
gtk_widget_show_all (window);
gtk_main ();
diff --git a/tests/testsocket_common.c b/tests/testsocket_common.c
index a526321..980ff32 100644
--- a/tests/testsocket_common.c
+++ b/tests/testsocket_common.c
@@ -111,7 +111,7 @@ add_buttons (GtkWidget *widget, GtkWidget *box)
GtkWidget *remove_button;
add_button = gtk_button_new_with_mnemonic ("_Add");
- gtk_box_pack_start (GTK_BOX (box), add_button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), add_button, TRUE, TRUE);
gtk_widget_show (add_button);
g_signal_connect (add_button, "clicked",
@@ -119,7 +119,7 @@ add_buttons (GtkWidget *widget, GtkWidget *box)
box);
remove_button = gtk_button_new_with_mnemonic ("_Remove");
- gtk_box_pack_start (GTK_BOX (box), remove_button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), remove_button, TRUE, TRUE);
gtk_widget_show (remove_button);
g_signal_connect (remove_button, "clicked",
@@ -220,33 +220,33 @@ create_content (GtkWindow *window, gboolean local)
gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
gtk_container_add (GTK_CONTAINER (frame), vbox);
-
+
/* Combo */
- gtk_box_pack_start (GTK_BOX (vbox), create_combo(), TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), create_combo(), TRUE, TRUE);
/* Entry */
- gtk_box_pack_start (GTK_BOX (vbox), gtk_entry_new(), TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), gtk_entry_new(), TRUE, TRUE);
/* Close Button */
button = gtk_button_new_with_mnemonic ("_Close");
- gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE);
g_signal_connect_swapped (button, "clicked",
G_CALLBACK (gtk_widget_destroy), window);
/* Blink Button */
button = gtk_button_new_with_mnemonic ("_Blink");
- gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE);
g_signal_connect (button, "clicked",
G_CALLBACK (blink),
window);
/* Menubar */
gtk_box_pack_start (GTK_BOX (vbox), create_menubar (GTK_WINDOW (window)),
- TRUE, TRUE, 0);
+ TRUE, TRUE);
/* Combo Box */
- gtk_box_pack_start (GTK_BOX (vbox), create_combo_box (), TRUE, TRUE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), create_combo_box (), TRUE, TRUE);
+
add_buttons (NULL, vbox);
return frame;
diff --git a/tests/testspinbutton.c b/tests/testspinbutton.c
index 9f8ada4..686de06 100644
--- a/tests/testspinbutton.c
+++ b/tests/testspinbutton.c
@@ -56,8 +56,8 @@ prepare_window_for_orientation (GtkOrientation orientation)
gtk_orientable_set_orientation (GTK_ORIENTABLE (spin), orientation);
gtk_widget_set_halign (GTK_WIDGET (spin), GTK_ALIGN_CENTER);
- GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
- gtk_box_pack_start (GTK_BOX (hbox), spin, FALSE, FALSE, 2);
+ GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+ gtk_box_pack_start (GTK_BOX (hbox), spin, FALSE, FALSE);
gtk_container_add (GTK_CONTAINER (mainbox), hbox);
}
diff --git a/tests/teststack.c b/tests/teststack.c
index 07890e1..9e0dcf8 100644
--- a/tests/teststack.c
+++ b/tests/teststack.c
@@ -127,7 +127,7 @@ main (gint argc,
gtk_container_add (GTK_CONTAINER (window), box);
switcher = gtk_stack_switcher_new ();
- gtk_box_pack_start (GTK_BOX (box), switcher, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), switcher, FALSE, FALSE);
stack = gtk_stack_new ();
@@ -141,8 +141,8 @@ main (gint argc,
sidebar = gtk_stack_sidebar_new ();
gtk_stack_sidebar_set_stack (GTK_STACK_SIDEBAR (sidebar), GTK_STACK (stack));
layout = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (layout), sidebar, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (layout), stack, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (layout), sidebar, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (layout), stack, TRUE, TRUE);
gtk_container_add (GTK_CONTAINER (box), layout);
diff --git a/tests/teststatusicon.c b/tests/teststatusicon.c
index d9506f1..7725173 100755
--- a/tests/teststatusicon.c
+++ b/tests/teststatusicon.c
@@ -150,29 +150,29 @@ icon_activated (GtkStatusIcon *icon)
g_object_set_data_full (G_OBJECT (icon), "test-status-icon-dialog",
dialog, (GDestroyNotify) gtk_widget_destroy);
- g_signal_connect (dialog, "response",
+ g_signal_connect (dialog, "response",
G_CALLBACK (gtk_widget_hide), NULL);
- g_signal_connect (dialog, "delete_event",
+ g_signal_connect (dialog, "delete_event",
G_CALLBACK (gtk_widget_hide_on_delete), NULL);
content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
toggle = gtk_toggle_button_new_with_mnemonic ("_Show the icon");
- gtk_box_pack_end (GTK_BOX (content_area), toggle, TRUE, TRUE, 6);
+ gtk_box_pack_end (GTK_BOX (content_area), toggle, TRUE, TRUE);
gtk_widget_show (toggle);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
gtk_status_icon_get_visible (icon));
- g_signal_connect (toggle, "toggled",
+ g_signal_connect (toggle, "toggled",
G_CALLBACK (visible_toggle_toggled), NULL);
toggle = gtk_toggle_button_new_with_mnemonic ("_Change images");
- gtk_box_pack_end (GTK_BOX (content_area), toggle, TRUE, TRUE, 6);
+ gtk_box_pack_end (GTK_BOX (content_area), toggle, TRUE, TRUE);
gtk_widget_show (toggle);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (toggle),
timeout != 0);
- g_signal_connect (toggle, "toggled",
+ g_signal_connect (toggle, "toggled",
G_CALLBACK (timeout_toggle_toggled), NULL);
}
diff --git a/tests/teststockbuttonmenu.c b/tests/teststockbuttonmenu.c
index 1095028..8ebfbd3 100644
--- a/tests/teststockbuttonmenu.c
+++ b/tests/teststockbuttonmenu.c
@@ -90,7 +90,7 @@ int main (int argc, char **argv)
gtk_widget_add_accelerator (item, "activate", accel_group,
GDK_KEY_x, GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE);
gtk_accel_label_set_accel_widget (GTK_ACCEL_LABEL (label), item);
- gtk_box_pack_end (GTK_BOX (box), label, TRUE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (box), label, TRUE, TRUE);
gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
/* GtkAction-backed menuitem */
diff --git a/tests/testswitch.c b/tests/testswitch.c
index 1e3b483..c348ba9 100644
--- a/tests/testswitch.c
+++ b/tests/testswitch.c
@@ -26,12 +26,12 @@ make_switch (gboolean is_on,
sw = gtk_switch_new ();
gtk_switch_set_active (GTK_SWITCH (sw), is_on);
- gtk_box_pack_start (GTK_BOX (hbox), sw, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), sw, FALSE, FALSE);
gtk_widget_set_sensitive (sw, is_sensitive);
gtk_widget_show (sw);
label = gtk_label_new (is_on ? "Enabled" : "Disabled");
- gtk_box_pack_end (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), label, TRUE, TRUE);
gtk_widget_show (label);
g_object_bind_property_full (sw, "active",
@@ -117,26 +117,26 @@ make_delayed_switch (gboolean is_on,
sw = gtk_switch_new ();
gtk_switch_set_active (GTK_SWITCH (sw), is_on);
- gtk_box_pack_start (GTK_BOX (hbox), sw, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), sw, FALSE, FALSE);
gtk_widget_set_sensitive (sw, is_sensitive);
gtk_widget_show (sw);
g_signal_connect (sw, "state-set", G_CALLBACK (set_state), NULL);
spinner = gtk_spinner_new ();
- gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, TRUE);
gtk_widget_set_opacity (spinner, 0.0);
gtk_widget_show (spinner);
-
+
check = gtk_check_button_new ();
- gtk_box_pack_end (GTK_BOX (hbox), check, FALSE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), check, FALSE, TRUE);
gtk_widget_show (check);
g_object_bind_property (sw, "state",
check, "active",
G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
label = gtk_label_new (is_on ? "Enabled" : "Disabled");
- gtk_box_pack_end (GTK_BOX (hbox), label, TRUE, TRUE, 0);
+ gtk_box_pack_end (GTK_BOX (hbox), label, TRUE, TRUE);
gtk_widget_show (label);
g_object_bind_property_full (sw, "active",
diff --git a/tests/testtoolbar.c b/tests/testtoolbar.c
index 51d4dd5..dc1522b 100644
--- a/tests/testtoolbar.c
+++ b/tests/testtoolbar.c
@@ -511,35 +511,35 @@ main (gint argc, gchar **argv)
gtk_grid_attach (GTK_GRID (grid), hbox2, 1, 2, 1, 1);
checkbox = gtk_check_button_new_with_mnemonic("_Vertical");
- gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE, FALSE);
g_signal_connect (checkbox, "toggled",
G_CALLBACK (change_orientation), toolbar);
checkbox = gtk_check_button_new_with_mnemonic("_Show Arrow");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), TRUE);
- gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE, FALSE);
g_signal_connect (checkbox, "toggled",
G_CALLBACK (change_show_arrow), toolbar);
checkbox = gtk_check_button_new_with_mnemonic("_Set Toolbar Style:");
g_signal_connect (checkbox, "toggled", G_CALLBACK (set_toolbar_style_toggled), toolbar);
- gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE, FALSE);
option_menu = gtk_combo_box_text_new ();
- gtk_widget_set_sensitive (option_menu, FALSE);
+ gtk_widget_set_sensitive (option_menu, FALSE);
g_object_set_data (G_OBJECT (checkbox), "option-menu", option_menu);
-
+
for (i = 0; i < G_N_ELEMENTS (toolbar_styles); i++)
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (option_menu), toolbar_styles[i]);
gtk_combo_box_set_active (GTK_COMBO_BOX (option_menu),
gtk_toolbar_get_style (GTK_TOOLBAR (toolbar)));
- gtk_box_pack_start (GTK_BOX (hbox2), option_menu, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox2), option_menu, FALSE, FALSE);
g_signal_connect (option_menu, "changed",
G_CALLBACK (change_toolbar_style), toolbar);
- checkbox = gtk_check_button_new_with_mnemonic("_Set Icon Size:");
+ checkbox = gtk_check_button_new_with_mnemonic("_Set Icon Size:");
g_signal_connect (checkbox, "toggled", G_CALLBACK (set_icon_size_toggled), toolbar);
- gtk_box_pack_start (GTK_BOX (hbox2), checkbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox2), checkbox, FALSE, FALSE);
option_menu = gtk_combo_box_text_new ();
g_object_set_data (G_OBJECT (checkbox), "option-menu", option_menu);
@@ -547,10 +547,10 @@ main (gint argc, gchar **argv)
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (option_menu), "small toolbar");
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (option_menu), "large toolbar");
- gtk_box_pack_start (GTK_BOX (hbox2), option_menu, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox2), option_menu, FALSE, FALSE);
g_signal_connect (option_menu, "changed",
G_CALLBACK (icon_size_history_changed), toolbar);
-
+
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -698,13 +698,13 @@ main (gint argc, gchar **argv)
gtk_grid_attach (GTK_GRID (grid), hbox, 1, 4, 1, 1);
button = gtk_button_new_with_label ("Drag me to the toolbar");
- gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
label = gtk_label_new ("Drop index:");
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
label = gtk_label_new ("");
- gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
checkbox = gtk_check_button_new_with_mnemonic("_Right to left");
if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL)
@@ -713,8 +713,8 @@ main (gint argc, gchar **argv)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), FALSE);
g_signal_connect (checkbox, "toggled", G_CALLBACK (rtl_toggled), NULL);
- gtk_box_pack_end (GTK_BOX (hbox), checkbox, FALSE, FALSE, 0);
-
+ gtk_box_pack_end (GTK_BOX (hbox), checkbox, FALSE, FALSE);
+
gtk_drag_source_set (button, GDK_BUTTON1_MASK,
target_table, G_N_ELEMENTS (target_table),
GDK_ACTION_MOVE);
diff --git a/tests/testtooltips.c b/tests/testtooltips.c
index 853239e..027bdac 100644
--- a/tests/testtooltips.c
+++ b/tests/testtooltips.c
@@ -292,7 +292,7 @@ main (int argc, char *argv[])
/* A check button using the tooltip-markup property */
button = gtk_check_button_new_with_label ("This one uses the tooltip-markup property");
gtk_widget_set_tooltip_text (button, "Hello, I am a static tooltip.");
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
text = gtk_widget_get_tooltip_text (button);
markup = gtk_widget_get_tooltip_markup (button);
@@ -305,13 +305,13 @@ main (int argc, char *argv[])
g_object_set (button, "has-tooltip", TRUE, NULL);
g_signal_connect (button, "query-tooltip",
G_CALLBACK (query_tooltip_cb), NULL);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
/* A label */
button = gtk_label_new ("I am just a label");
gtk_label_set_selectable (GTK_LABEL (button), FALSE);
gtk_widget_set_tooltip_text (button, "Label & and tooltip");
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
text = gtk_widget_get_tooltip_text (button);
markup = gtk_widget_get_tooltip_markup (button);
@@ -323,7 +323,7 @@ main (int argc, char *argv[])
button = gtk_label_new ("I am a selectable label");
gtk_label_set_selectable (GTK_LABEL (button), TRUE);
gtk_widget_set_tooltip_markup (button, "<b>Another</b> Label tooltip");
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
text = gtk_widget_get_tooltip_text (button);
markup = gtk_widget_get_tooltip_markup (button);
@@ -333,7 +333,7 @@ main (int argc, char *argv[])
/* Another one, with a custom tooltip window */
button = gtk_check_button_new_with_label ("This one has a custom tooltip window!");
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
tooltip_window = gtk_window_new (GTK_WINDOW_POPUP);
tooltip_button = gtk_label_new ("blaat!");
@@ -354,7 +354,7 @@ main (int argc, char *argv[])
button = gtk_button_new_with_label ("This one is insensitive");
gtk_widget_set_sensitive (button, FALSE);
g_object_set (button, "tooltip-text", "Insensitive!", NULL);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
/* Testcases from Kris without a tree view don't exist. */
tree_view = gtk_tree_view_new_with_model (create_model ());
@@ -377,7 +377,7 @@ main (int argc, char *argv[])
gtk_tree_view_column_set_clickable (column, TRUE);
g_object_set (gtk_tree_view_column_get_button (column), "tooltip-text", "Header", NULL);
- gtk_box_pack_start (GTK_BOX (box), tree_view, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), tree_view, FALSE, FALSE);
/* And a text view for Matthias */
buffer = gtk_text_buffer_new (NULL);
@@ -401,7 +401,7 @@ main (int argc, char *argv[])
g_signal_connect (text_view, "query-tooltip",
G_CALLBACK (query_tooltip_text_view_cb), tag);
- gtk_box_pack_start (GTK_BOX (box), text_view, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), text_view, FALSE, FALSE);
/* Drawing area */
drawing_area = gtk_drawing_area_new ();
@@ -411,7 +411,7 @@ main (int argc, char *argv[])
G_CALLBACK (drawing_area_draw), NULL);
g_signal_connect (drawing_area, "query-tooltip",
G_CALLBACK (query_tooltip_drawing_area_cb), NULL);
- gtk_box_pack_start (GTK_BOX (box), drawing_area, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), drawing_area, FALSE, FALSE);
button = gtk_label_new ("Custom tooltip I");
label = gtk_label_new ("See, custom");
@@ -419,13 +419,13 @@ main (int argc, char *argv[])
g_object_set (button, "has-tooltip", TRUE, NULL);
g_signal_connect (button, "query-tooltip",
G_CALLBACK (query_tooltip_label_cb), label);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
button = gtk_label_new ("Custom tooltip II");
label = gtk_label_new ("See, custom, too");
g_object_ref_sink (label);
g_object_set (button, "has-tooltip", TRUE, NULL);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE, 2);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
g_signal_connect (button, "query-tooltip",
G_CALLBACK (query_tooltip_label_cb), label);
diff --git a/tests/testtoplevelembed.c b/tests/testtoplevelembed.c
index 0956d28..31561b8 100644
--- a/tests/testtoplevelembed.c
+++ b/tests/testtoplevelembed.c
@@ -21,8 +21,8 @@ create_tab_label (GtkWidget *toplevel)
GtkWidget *image = gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_MENU);
gtk_container_add (GTK_CONTAINER (button), image);
- gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE);
g_signal_connect (button, "clicked",
G_CALLBACK (remove_notebook_page), toplevel);
diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c
index 4c1d87f..67257d6 100644
--- a/tests/testtreecolumns.c
+++ b/tests/testtreecolumns.c
@@ -762,14 +762,14 @@ main (int argc, char *argv[])
/* Set up the main window */
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
+ g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
gtk_window_set_default_size (GTK_WINDOW (window), 500, 300);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
gtk_container_add (GTK_CONTAINER (window), vbox);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
/* Left Pane */
cell = gtk_cell_renderer_text_new ();
@@ -786,52 +786,52 @@ main (int argc, char *argv[])
gtk_tree_view_append_column (GTK_TREE_VIEW (left_tree_view), column);
gtk_tree_view_column_set_cell_data_func (column, cell, get_visible, NULL, NULL);
- gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE, TRUE);
/* Middle Pane */
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
- gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE);
+
bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD);
- gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE, TRUE);
button = gtk_button_new_with_mnemonic ("<< (_Q)");
gtk_widget_set_sensitive (button, FALSE);
g_signal_connect (button, "clicked", G_CALLBACK (add_left_clicked), top_right_tree_view);
g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (top_right_tree_view)),
"changed", G_CALLBACK (selection_changed), button);
- gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE);
button = gtk_button_new_with_mnemonic (">> (_W)");
gtk_widget_set_sensitive (button, FALSE);
g_signal_connect (button, "clicked", G_CALLBACK (add_right_clicked), top_right_tree_view);
g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (left_tree_view)),
"changed", G_CALLBACK (selection_changed), button);
- gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE);
bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD);
- gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE, TRUE);
button = gtk_button_new_with_mnemonic ("<< (_E)");
gtk_widget_set_sensitive (button, FALSE);
g_signal_connect (button, "clicked", G_CALLBACK (add_left_clicked), bottom_right_tree_view);
g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (bottom_right_tree_view)),
"changed", G_CALLBACK (selection_changed), button);
- gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE);
button = gtk_button_new_with_mnemonic (">> (_R)");
gtk_widget_set_sensitive (button, FALSE);
g_signal_connect (button, "clicked", G_CALLBACK (add_right_clicked), bottom_right_tree_view);
g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (left_tree_view)),
"changed", G_CALLBACK (selection_changed), button);
- gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE);
+
-
/* Right Pane */
vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
- gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE);
swindow = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -846,7 +846,7 @@ main (int argc, char *argv[])
gtk_tree_view_append_column (GTK_TREE_VIEW (top_right_tree_view), column);
gtk_container_add (GTK_CONTAINER (swindow), top_right_tree_view);
- gtk_box_pack_start (GTK_BOX (vbox2), swindow, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), swindow, TRUE, TRUE);
swindow = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -860,9 +860,9 @@ main (int argc, char *argv[])
gtk_tree_view_column_set_cell_data_func (column, cell, get_visible, NULL, NULL);
gtk_tree_view_append_column (GTK_TREE_VIEW (bottom_right_tree_view), column);
gtk_container_add (GTK_CONTAINER (swindow), bottom_right_tree_view);
- gtk_box_pack_start (GTK_BOX (vbox2), swindow, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox2), swindow, TRUE, TRUE);
+
-
/* Drag and Drop */
gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (left_tree_view),
GDK_BUTTON1_MASK,
@@ -896,13 +896,13 @@ main (int argc, char *argv[])
gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
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 ("_Add new Column");
g_signal_connect (button, "clicked", G_CALLBACK (add_clicked), left_tree_model);
- gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
gtk_widget_show_all (window);
gtk_main ();
diff --git a/tests/testtreecolumnsizing.c b/tests/testtreecolumnsizing.c
index 2ba5631..c152c0f 100644
--- a/tests/testtreecolumnsizing.c
+++ b/tests/testtreecolumnsizing.c
@@ -191,14 +191,14 @@ main (int argc, char **argv)
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), BORDER_EXPAND);
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), ALL_EXPAND);
- gtk_box_pack_start (GTK_BOX (vbox), combo_box, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), combo_box, FALSE, FALSE);
/* Scrolled window and tree view */
sw = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE);
tree_view = gtk_tree_view_new_with_model (create_model ());
gtk_container_add (GTK_CONTAINER (sw), tree_view);
@@ -221,7 +221,7 @@ main (int argc, char **argv)
button = gtk_toggle_button_new_with_label ("Toggle long content row");
g_signal_connect (button, "toggled",
G_CALLBACK (toggle_long_content_row), tree_view);
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
/* Set up option menu callback and default item */
g_signal_connect (combo_box, "changed",
diff --git a/tests/testtreeedit.c b/tests/testtreeedit.c
index ff25735..676ec72 100644
--- a/tests/testtreeedit.c
+++ b/tests/testtreeedit.c
@@ -211,7 +211,7 @@ create_control (GtkWidget *box, gint number, gint cntl, CallbackData *data)
checkbutton = gtk_check_button_new_with_label (name);
gtk_widget_show (checkbutton);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), cntl == CNTL_FIXED);
- gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE, FALSE);
g_signal_connect (G_OBJECT (checkbutton), "toggled", callback, data);
g_free (name);
@@ -245,9 +245,9 @@ main (gint argc, gchar **argv)
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_ETCHED_IN);
- gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
+ gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE);
tree_model = create_model ();
tree_view = gtk_tree_view_new_with_model (tree_model);
@@ -345,18 +345,18 @@ main (gint argc, gchar **argv)
NULL);
gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
-
+
gtk_window_set_default_size (GTK_WINDOW (window),
800, 250);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
gtk_widget_show (hbox);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
/* Alignment controls */
cntl_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
gtk_widget_show (cntl_vbox);
- gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE, FALSE);
create_control (cntl_vbox, 1, CNTL_ALIGN, &callback[0]);
create_control (cntl_vbox, 2, CNTL_ALIGN, &callback[1]);
@@ -366,7 +366,7 @@ main (gint argc, gchar **argv)
/* Expand controls */
cntl_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
gtk_widget_show (cntl_vbox);
- gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE, FALSE);
create_control (cntl_vbox, 1, CNTL_EXPAND, &callback[0]);
create_control (cntl_vbox, 2, CNTL_EXPAND, &callback[1]);
@@ -376,7 +376,7 @@ main (gint argc, gchar **argv)
/* Fixed controls */
cntl_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
gtk_widget_show (cntl_vbox);
- gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE, FALSE);
create_control (cntl_vbox, 1, CNTL_FIXED, &callback[0]);
create_control (cntl_vbox, 2, CNTL_FIXED, &callback[1]);
diff --git a/tests/testtreeflow.c b/tests/testtreeflow.c
index b243bc5..e7bab70 100644
--- a/tests/testtreeflow.c
+++ b/tests/testtreeflow.c
@@ -135,14 +135,14 @@ main (int argc, char *argv[])
g_signal_connect (window, "destroy", gtk_main_quit, NULL);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
- gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Incremental Reflow Test"), FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Incremental Reflow Test"), FALSE, FALSE);
gtk_container_add (GTK_CONTAINER (window), vbox);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE);
+
initialize_model ();
tree_view = gtk_tree_view_new_with_model (model);
gtk_tree_view_scroll_to_cell (GTK_TREE_VIEW (tree_view), path, NULL, TRUE, 0.5, 0.0);
@@ -157,9 +157,9 @@ main (int argc, char *argv[])
NULL);
gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
button = gtk_button_new_with_mnemonic ("<b>_Futz!!</b>");
- gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
gtk_label_set_use_markup (GTK_LABEL (gtk_bin_get_child (GTK_BIN (button))), TRUE);
g_signal_connect (button, "clicked", G_CALLBACK (futz), NULL);
g_signal_connect (button, "realize", G_CALLBACK (gtk_widget_grab_focus), NULL);
diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c
index 024b1bd..f760775 100644
--- a/tests/testtreefocus.c
+++ b/tests/testtreefocus.c
@@ -353,13 +353,13 @@ main (int argc, char *argv[])
g_signal_connect (window, "destroy", gtk_main_quit, NULL);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
- gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Jonathan's Holiday Card Planning Sheet"), FALSE,
FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Jonathan's Holiday Card Planning Sheet"), FALSE,
FALSE);
gtk_container_add (GTK_CONTAINER (window), vbox);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE);
model = make_model ();
tree_view = gtk_tree_view_new_with_model (model);
@@ -468,13 +468,13 @@ main (int argc, char *argv[])
g_signal_connect (window, "destroy", gtk_main_quit, NULL);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
- gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("The model revealed"), FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("The model revealed"), FALSE, FALSE);
gtk_container_add (GTK_CONTAINER (window), vbox);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE);
tree_view = gtk_tree_view_new_with_model (model);
diff --git a/tests/testtreemenu.c b/tests/testtreemenu.c
index f9a62fb..1368084 100644
--- a/tests/testtreemenu.c
+++ b/tests/testtreemenu.c
@@ -458,7 +458,7 @@ tree_menu (void)
g_signal_connect (menu, "menu-activate", G_CALLBACK (menu_activated_cb), NULL);
- gtk_box_pack_start (GTK_BOX (vbox), menubar, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), menubar, FALSE, FALSE);
#endif
/* Add a combo box with the same menu ! */
@@ -466,7 +466,7 @@ tree_menu (void)
gtk_combo_box_set_model (GTK_COMBO_BOX (widget), store);
gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
gtk_widget_show (widget);
- gtk_box_pack_end (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+ gtk_box_pack_end (GTK_BOX (vbox), widget, FALSE, FALSE);
/* Now add some controls */
widget = gtk_combo_box_text_new ();
@@ -474,7 +474,7 @@ tree_menu (void)
gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Vertical");
gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
g_signal_connect (G_OBJECT (widget), "changed",
G_CALLBACK (orientation_changed), area);
@@ -482,40 +482,40 @@ tree_menu (void)
widget = gtk_check_button_new_with_label ("Align 2nd Cell");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+
g_signal_connect (G_OBJECT (widget), "toggled",
G_CALLBACK (align_cell_2_toggled), area);
widget = gtk_check_button_new_with_label ("Align 3rd Cell");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+
g_signal_connect (G_OBJECT (widget), "toggled",
G_CALLBACK (align_cell_3_toggled), area);
widget = gtk_check_button_new_with_label ("Expand 1st Cell");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+
g_signal_connect (G_OBJECT (widget), "toggled",
G_CALLBACK (expand_cell_1_toggled), area);
widget = gtk_check_button_new_with_label ("Expand 2nd Cell");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+
g_signal_connect (G_OBJECT (widget), "toggled",
G_CALLBACK (expand_cell_2_toggled), area);
widget = gtk_check_button_new_with_label ("Expand 3rd Cell");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+
g_signal_connect (G_OBJECT (widget), "toggled",
G_CALLBACK (expand_cell_3_toggled), area);
@@ -523,16 +523,16 @@ tree_menu (void)
widget = gtk_check_button_new_with_label ("Submenu Headers");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+
g_signal_connect (G_OBJECT (widget), "toggled",
G_CALLBACK (submenu_headers_toggled), menu);
widget = gtk_check_button_new_with_label ("Tearoff menu");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
gtk_widget_show (widget);
- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
-
+ gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+
g_signal_connect (G_OBJECT (widget), "toggled",
G_CALLBACK (tearoff_toggled), menu);
#endif
diff --git a/tests/testtreesort.c b/tests/testtreesort.c
index c276c6d..2bf0253 100644
--- a/tests/testtreesort.c
+++ b/tests/testtreesort.c
@@ -123,19 +123,19 @@ main (int argc, char *argv[])
g_signal_connect (window, "destroy", gtk_main_quit, NULL);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
- gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Jonathan and Kristian's list of cool words. (And
Anders' cool list of numbers) \n\nThis is just a GtkTreeStore"), FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Jonathan and Kristian's list of cool words. (And
Anders' cool list of numbers) \n\nThis is just a GtkTreeStore"), FALSE, FALSE);
gtk_container_add (GTK_CONTAINER (window), vbox);
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);
button = gtk_button_new_with_label ("Switch search method");
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
scrolled_window = gtk_scrolled_window_new (NULL, NULL);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_ETCHED_IN);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE);
model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_INT);
@@ -253,7 +253,7 @@ main (int argc, char *argv[])
gtk_container_set_border_width (GTK_CONTAINER (vbox2), 8);
gtk_box_pack_start (GTK_BOX (vbox2),
gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort
wrapping the GtkTreeStore of window 1"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
gtk_container_add (GTK_CONTAINER (window2), vbox2);
scrolled_window2 = gtk_scrolled_window_new (NULL, NULL);
@@ -262,9 +262,9 @@ main (int argc, char *argv[])
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window2),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start (GTK_BOX (vbox2), scrolled_window2, TRUE, TRUE, 0);
-
-
+ gtk_box_pack_start (GTK_BOX (vbox2), scrolled_window2, TRUE, TRUE);
+
+
tree_view2 = gtk_tree_view_new_with_model (smodel);
renderer = gtk_cell_renderer_text_new ();
@@ -323,7 +323,7 @@ main (int argc, char *argv[])
gtk_container_set_border_width (GTK_CONTAINER (vbox3), 8);
gtk_box_pack_start (GTK_BOX (vbox3),
gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort
wrapping the GtkTreeModelSort of window 2"),
- FALSE, FALSE, 0);
+ FALSE, FALSE);
gtk_container_add (GTK_CONTAINER (window3), vbox3);
scrolled_window3 = gtk_scrolled_window_new (NULL, NULL);
@@ -332,9 +332,9 @@ main (int argc, char *argv[])
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window3),
GTK_POLICY_AUTOMATIC,
GTK_POLICY_AUTOMATIC);
- gtk_box_pack_start (GTK_BOX (vbox3), scrolled_window3, TRUE, TRUE, 0);
-
-
+ gtk_box_pack_start (GTK_BOX (vbox3), scrolled_window3, TRUE, TRUE);
+
+
tree_view3 = gtk_tree_view_new_with_model (ssmodel);
renderer = gtk_cell_renderer_text_new ();
diff --git a/tests/testwindows.c b/tests/testwindows.c
index de5d0d8..353b558 100644
--- a/tests/testwindows.c
+++ b/tests/testwindows.c
@@ -457,15 +457,14 @@ manual_clicked (GtkWidget *button,
GTK_DIALOG_MODAL,
"_OK", GTK_RESPONSE_OK,
NULL);
-
+
grid = gtk_grid_new ();
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
grid,
- FALSE, FALSE,
- 2);
+ FALSE, FALSE);
+
-
label = gtk_label_new ("x:");
gtk_widget_set_halign (label, GTK_ALIGN_START);
gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
@@ -824,25 +823,24 @@ main (int argc, char **argv)
g_signal_connect (G_OBJECT (window), "delete-event", gtk_main_quit, NULL);
- hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
+ hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
gtk_container_add (GTK_CONTAINER (window), hbox);
gtk_widget_show (hbox);
frame = gtk_frame_new ("GdkWindows");
gtk_box_pack_start (GTK_BOX (hbox),
frame,
- FALSE, FALSE,
- 5);
+ FALSE, FALSE);
gtk_widget_show (frame);
darea = gtk_drawing_area_new ();
gtk_widget_add_events (darea, GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK);
gtk_widget_set_size_request (darea, 500, 500);
- g_signal_connect (darea, "button_release_event",
- G_CALLBACK (darea_button_release_event),
+ g_signal_connect (darea, "button_release_event",
+ G_CALLBACK (darea_button_release_event),
NULL);
-
+
gtk_container_add (GTK_CONTAINER (frame), darea);
gtk_widget_realize (darea);
gtk_widget_show (darea);
@@ -851,12 +849,11 @@ main (int argc, char **argv)
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
gtk_box_pack_start (GTK_BOX (hbox),
vbox,
- FALSE, FALSE,
- 5);
+ FALSE, FALSE);
gtk_widget_show (vbox);
window_store = gtk_tree_store_new (1, GDK_TYPE_WINDOW);
-
+
treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (window_store));
gtk_tree_selection_set_mode (gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview)),
GTK_SELECTION_MULTIPLE);
@@ -877,26 +874,24 @@ main (int argc, char **argv)
gtk_container_add (GTK_CONTAINER (scrolled), treeview);
gtk_box_pack_start (GTK_BOX (vbox),
scrolled,
- FALSE, FALSE,
- 5);
+ FALSE, FALSE);
gtk_widget_show (scrolled);
gtk_widget_show (treeview);
-
+
grid = gtk_grid_new ();
gtk_grid_set_row_homogeneous (GTK_GRID (grid), TRUE);
gtk_grid_set_column_homogeneous (GTK_GRID (grid), TRUE);
gtk_box_pack_start (GTK_BOX (vbox),
grid,
- FALSE, FALSE,
- 2);
+ FALSE, FALSE);
gtk_widget_show (grid);
button = gtk_button_new ();
gtk_button_set_image (GTK_BUTTON (button),
gtk_image_new_from_icon_name ("go-previous-symbolic",
GTK_ICON_SIZE_BUTTON));
- g_signal_connect (button, "clicked",
- G_CALLBACK (move_window_clicked),
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (move_window_clicked),
GINT_TO_POINTER (GTK_DIR_LEFT));
gtk_grid_attach (GTK_GRID (grid), button, 0, 1, 1, 1);
gtk_widget_show (button);
@@ -905,8 +900,8 @@ main (int argc, char **argv)
gtk_button_set_image (GTK_BUTTON (button),
gtk_image_new_from_icon_name ("go-up-symbolic",
GTK_ICON_SIZE_BUTTON));
- g_signal_connect (button, "clicked",
- G_CALLBACK (move_window_clicked),
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (move_window_clicked),
GINT_TO_POINTER (GTK_DIR_UP));
gtk_grid_attach (GTK_GRID (grid), button, 1, 0, 1, 1);
gtk_widget_show (button);
@@ -915,8 +910,8 @@ main (int argc, char **argv)
gtk_button_set_image (GTK_BUTTON (button),
gtk_image_new_from_icon_name ("go-next-symbolic",
GTK_ICON_SIZE_BUTTON));
- g_signal_connect (button, "clicked",
- G_CALLBACK (move_window_clicked),
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (move_window_clicked),
GINT_TO_POINTER (GTK_DIR_RIGHT));
gtk_grid_attach (GTK_GRID (grid), button, 2, 1, 1, 1);
gtk_widget_show (button);
@@ -1027,44 +1022,40 @@ main (int argc, char **argv)
button = gtk_button_new_with_label ("Add window");
gtk_box_pack_start (GTK_BOX (vbox),
button,
- FALSE, FALSE,
- 2);
+ FALSE, FALSE);
gtk_widget_show (button);
- g_signal_connect (button, "clicked",
- G_CALLBACK (add_window_clicked),
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (add_window_clicked),
NULL);
-
+
button = gtk_button_new_with_label ("Remove window");
gtk_box_pack_start (GTK_BOX (vbox),
button,
- FALSE, FALSE,
- 2);
+ FALSE, FALSE);
gtk_widget_show (button);
- g_signal_connect (button, "clicked",
- G_CALLBACK (remove_window_clicked),
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (remove_window_clicked),
NULL);
button = gtk_button_new_with_label ("Save");
gtk_box_pack_start (GTK_BOX (vbox),
button,
- FALSE, FALSE,
- 2);
+ FALSE, FALSE);
gtk_widget_show (button);
- g_signal_connect (button, "clicked",
- G_CALLBACK (save_clicked),
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (save_clicked),
NULL);
button = gtk_button_new_with_label ("Refresh");
gtk_box_pack_start (GTK_BOX (vbox),
button,
- FALSE, FALSE,
- 2);
+ FALSE, FALSE);
gtk_widget_show (button);
- g_signal_connect (button, "clicked",
- G_CALLBACK (refresh_clicked),
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (refresh_clicked),
NULL);
-
+
gtk_widget_show (window);
if (argc == 2)
@@ -1073,7 +1064,7 @@ main (int argc, char **argv)
load_file (file);
g_object_unref (file);
}
-
+
gtk_main ();
return 0;
diff --git a/tests/testwindowsize.c b/tests/testwindowsize.c
index d33ffbb..42d3da1 100644
--- a/tests/testwindowsize.c
+++ b/tests/testwindowsize.c
@@ -60,7 +60,7 @@ show_dialog (void)
gtk_window_set_resizable (GTK_WINDOW (dialog), resizable);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
- label, 0, TRUE, TRUE);
+ label, TRUE, TRUE);
gtk_widget_show (label);
label = gtk_label_new ("? x ?");
diff --git a/tests/treestoretest.c b/tests/treestoretest.c
index 6730689..dc7e9b5 100644
--- a/tests/treestoretest.c
+++ b/tests/treestoretest.c
@@ -329,7 +329,7 @@ make_window (gint view_type)
/* Put them together */
gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
- gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE);
gtk_container_add (GTK_CONTAINER (window), vbox);
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
GTK_POLICY_AUTOMATIC,
@@ -338,32 +338,32 @@ make_window (gint view_type)
/* buttons */
button = gtk_button_new_with_label ("gtk_tree_store_remove");
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
g_signal_connect (selection, "changed",
G_CALLBACK (selection_changed),
button);
- g_signal_connect (button, "clicked",
- G_CALLBACK (iter_remove),
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (iter_remove),
tree_view);
gtk_widget_set_sensitive (button, FALSE);
button = gtk_button_new_with_label ("gtk_tree_store_insert");
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
entry = gtk_entry_new ();
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE);
g_object_set_data (G_OBJECT (button), "user_data", entry);
- g_signal_connect (button, "clicked",
- G_CALLBACK (iter_insert),
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (iter_insert),
tree_view);
-
+
button = gtk_button_new_with_label ("gtk_tree_store_set");
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
entry = gtk_entry_new ();
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE);
g_object_set_data (G_OBJECT (button), "user_data", entry);
g_signal_connect (button, "clicked",
G_CALLBACK (iter_change),
@@ -372,18 +372,18 @@ make_window (gint view_type)
button = gtk_button_new_with_label ("gtk_tree_store_insert_with_values");
hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
entry = gtk_entry_new ();
- gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+ gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
+ gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE);
g_object_set_data (G_OBJECT (button), "user_data", entry);
g_signal_connect (button, "clicked",
G_CALLBACK (iter_insert_with_values),
tree_view);
-
+
button = gtk_button_new_with_label ("gtk_tree_store_insert_before");
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
- g_signal_connect (button, "clicked",
- G_CALLBACK (iter_insert_before),
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (iter_insert_before),
tree_view);
g_signal_connect (selection, "changed",
G_CALLBACK (selection_changed),
@@ -391,9 +391,9 @@ make_window (gint view_type)
gtk_widget_set_sensitive (button, FALSE);
button = gtk_button_new_with_label ("gtk_tree_store_insert_after");
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
- g_signal_connect (button, "clicked",
- G_CALLBACK (iter_insert_after),
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (iter_insert_after),
tree_view);
g_signal_connect (selection, "changed",
G_CALLBACK (selection_changed),
@@ -401,15 +401,15 @@ make_window (gint view_type)
gtk_widget_set_sensitive (button, FALSE);
button = gtk_button_new_with_label ("gtk_tree_store_prepend");
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
- g_signal_connect (button, "clicked",
- G_CALLBACK (iter_prepend),
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (iter_prepend),
tree_view);
button = gtk_button_new_with_label ("gtk_tree_store_append");
- gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
- g_signal_connect (button, "clicked",
- G_CALLBACK (iter_append),
+ gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+ g_signal_connect (button, "clicked",
+ G_CALLBACK (iter_append),
tree_view);
/* The selected column */
diff --git a/testsuite/reftests/inherit-and-initial.ref.ui b/testsuite/reftests/inherit-and-initial.ref.ui
index d954396..e66b65b 100644
--- a/testsuite/reftests/inherit-and-initial.ref.ui
+++ b/testsuite/reftests/inherit-and-initial.ref.ui
@@ -967,7 +967,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="padding">4</property>
<property name="position">0</property>
</packing>
</child>
@@ -1742,7 +1741,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="padding">6</property>
<property name="position">8</property>
</packing>
</child>
@@ -1750,7 +1748,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="padding">10</property>
<property name="position">2</property>
</packing>
</child>
diff --git a/testsuite/reftests/inherit-and-initial.ui b/testsuite/reftests/inherit-and-initial.ui
index be81c8f..ecefb8d 100644
--- a/testsuite/reftests/inherit-and-initial.ui
+++ b/testsuite/reftests/inherit-and-initial.ui
@@ -896,7 +896,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="padding">4</property>
<property name="position">0</property>
</packing>
</child>
@@ -1616,7 +1615,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="padding">6</property>
<property name="position">8</property>
</packing>
</child>
@@ -1624,7 +1622,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="padding">10</property>
<property name="position">2</property>
</packing>
</child>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]