diff options
| author | Benjamin Otte <otte@redhat.com> | 2016-10-09 02:32:00 +0200 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2016-10-16 18:18:58 +0200 |
| commit | 4df6ddad54d2cb6ebfdcbf2b6fee35ec4fa760b9 (patch) | |
| tree | 0d6d46d38a70de6930e51d279c0eb50265a0a203 /tests | |
| parent | 1518fe0a8f0a973f013e21c185f38111d69d6ac7 (diff) | |
| download | gtk+-4df6ddad54d2cb6ebfdcbf2b6fee35ec4fa760b9.tar.gz | |
API: container: Remove gtk_container_set_border_width()
Diffstat (limited to 'tests')
43 files changed, 14 insertions, 239 deletions
diff --git a/tests/gdkgears.c b/tests/gdkgears.c index dfe80d8734..584c3fa16c 100644 --- a/tests/gdkgears.c +++ b/tests/gdkgears.c @@ -117,7 +117,6 @@ main (int argc, char *argv[]) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_titlebar (GTK_WINDOW (window), g_object_new (GTK_TYPE_HEADER_BAR, "visible", TRUE, "title", "GdkGears", NULL)); gtk_window_set_default_size (GTK_WINDOW (window), 640, 640); - gtk_container_set_border_width (GTK_CONTAINER (window), 12); g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); overlay = gtk_overlay_new (); @@ -203,7 +202,6 @@ main (int argc, char *argv[]) button = gtk_menu_button_new (); gtk_menu_button_set_direction (GTK_MENU_BUTTON (button), GTK_ARROW_UP); popover = gtk_popover_new (NULL); - gtk_container_set_border_width (GTK_CONTAINER (popover), 10); label = gtk_label_new ("Popovers work too!"); gtk_widget_show (label); gtk_container_add (GTK_CONTAINER (popover), label); diff --git a/tests/gtkoffscreenbox.c b/tests/gtkoffscreenbox.c index 610ddd850c..f8e2f0005a 100644 --- a/tests/gtkoffscreenbox.c +++ b/tests/gtkoffscreenbox.c @@ -255,20 +255,17 @@ gtk_offscreen_box_realize (GtkWidget *widget) GdkWindow *window; GdkWindowAttr attributes; gint attributes_mask; - guint border_width; GtkRequisition child_requisition; int start_y = 0; gtk_widget_set_realized (widget, TRUE); - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); - gtk_widget_get_allocation (widget, &allocation); - attributes.x = allocation.x + border_width; - attributes.y = allocation.y + border_width; - attributes.width = allocation.width - 2 * border_width; - attributes.height = allocation.height - 2 * border_width; + attributes.x = allocation.x; + attributes.y = allocation.y; + attributes.width = allocation.width; + attributes.height = allocation.height; attributes.window_type = GDK_WINDOW_CHILD; attributes.event_mask = gtk_widget_get_events (widget) | GDK_EXPOSURE_MASK @@ -482,7 +479,6 @@ gtk_offscreen_box_size_request (GtkWidget *widget, { GtkOffscreenBox *offscreen_box = GTK_OFFSCREEN_BOX (widget); int w, h; - guint border_width; w = 0; h = 0; @@ -509,9 +505,8 @@ gtk_offscreen_box_size_request (GtkWidget *widget, h += CHILD2_SIZE_SCALE * child_requisition.height; } - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); - requisition->width = border_width * 2 + w; - requisition->height = border_width * 2 + h; + requisition->width = w; + requisition->height = h; } static void @@ -544,20 +539,17 @@ gtk_offscreen_box_size_allocate (GtkWidget *widget, { GtkOffscreenBox *offscreen_box; gint start_y; - guint border_width; offscreen_box = GTK_OFFSCREEN_BOX (widget); gtk_widget_set_allocation (widget, allocation); - border_width = gtk_container_get_border_width (GTK_CONTAINER (widget)); - if (gtk_widget_get_realized (widget)) gdk_window_move_resize (gtk_widget_get_window (widget), - allocation->x + border_width, - allocation->y + border_width, - allocation->width - border_width * 2, - allocation->height - border_width * 2); + allocation->x, + allocation->y, + allocation->width, + allocation->height); start_y = 0; @@ -570,7 +562,7 @@ gtk_offscreen_box_size_allocate (GtkWidget *widget, &child_requisition, NULL); child_allocation.x = child_requisition.width * (CHILD1_SIZE_SCALE - 1.0) / 2; child_allocation.y = start_y + child_requisition.height * (CHILD1_SIZE_SCALE - 1.0) / 2; - child_allocation.width = MAX (1, (gint) allocation->width - 2 * border_width); + child_allocation.width = allocation->width; child_allocation.height = child_requisition.height; start_y += CHILD1_SIZE_SCALE * child_requisition.height; @@ -595,7 +587,7 @@ gtk_offscreen_box_size_allocate (GtkWidget *widget, &child_requisition, NULL); child_allocation.x = child_requisition.width * (CHILD2_SIZE_SCALE - 1.0) / 2; child_allocation.y = start_y + child_requisition.height * (CHILD2_SIZE_SCALE - 1.0) / 2; - child_allocation.width = MAX (1, (gint) allocation->width - 2 * border_width); + child_allocation.width = allocation->width; child_allocation.height = child_requisition.height; start_y += CHILD2_SIZE_SCALE * child_requisition.height; diff --git a/tests/print-editor.c b/tests/print-editor.c index efdee69c78..fd24973969 100644 --- a/tests/print-editor.c +++ b/tests/print-editor.c @@ -319,7 +319,6 @@ create_custom_widget (GtkPrintOperation *operation, gtk_print_operation_set_custom_tab_label (operation, "Other"); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - 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); diff --git a/tests/simple.c b/tests/simple.c index 6041fde82d..30ebd1499a 100644 --- a/tests/simple.c +++ b/tests/simple.c @@ -36,7 +36,6 @@ main (int argc, char *argv[]) "type", GTK_WINDOW_TOPLEVEL, "title", "hello world", "resizable", FALSE, - "border_width", 10, NULL), "signal::destroy", gtk_main_quit, NULL, NULL); diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c index 62a2a4c6c6..e2cea6b6b0 100644 --- a/tests/testadjustsize.c +++ b/tests/testadjustsize.c @@ -128,25 +128,6 @@ open_test_window (void) } static void -on_toggle_border_widths (GtkToggleButton *button, - void *data) -{ - gboolean has_border; - int i; - - has_border = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)); - - for (i = 0; i < TEST_WIDGET_LAST; ++i) - { - if (GTK_IS_CONTAINER (test_widgets[i])) - { - gtk_container_set_border_width (GTK_CONTAINER (test_widgets[i]), - has_border ? 50 : 0); - } - } -} - -static void on_set_small_size_requests (GtkToggleButton *button, void *data) { @@ -197,13 +178,6 @@ open_control_window (void) gtk_container_add (GTK_CONTAINER (window), box); toggle = - gtk_toggle_button_new_with_label ("Containers have borders"); - g_signal_connect (G_OBJECT (toggle), - "toggled", G_CALLBACK (on_toggle_border_widths), - NULL); - gtk_container_add (GTK_CONTAINER (box), toggle); - - toggle = gtk_toggle_button_new_with_label ("Set small size requests"); g_signal_connect (G_OBJECT (toggle), "toggled", G_CALLBACK (on_set_small_size_requests), @@ -235,7 +209,6 @@ create_widget_visible_border (const char *text) gtk_style_context_add_class (gtk_widget_get_style_context (outer_box), "black-bg"); inner_box = gtk_event_box_new (); - gtk_container_set_border_width (GTK_CONTAINER (inner_box), 5); gtk_style_context_add_class (gtk_widget_get_style_context (inner_box), "blue-bg"); gtk_container_add (GTK_CONTAINER (outer_box), inner_box); diff --git a/tests/testanimation.c b/tests/testanimation.c index aa8ffd05ef..2dd60f910d 100644 --- a/tests/testanimation.c +++ b/tests/testanimation.c @@ -318,10 +318,7 @@ do_image (const char *filename) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), "Image Loading"); - gtk_container_set_border_width (GTK_CONTAINER (window), 8); - vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 8); gtk_container_add (GTK_CONTAINER (window), vbox); label = gtk_label_new (NULL); @@ -375,10 +372,7 @@ do_nonprogressive (const gchar *filename) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), "Animation"); - gtk_container_set_border_width (GTK_CONTAINER (window), 8); - vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 8); gtk_container_add (GTK_CONTAINER (window), vbox); label = gtk_label_new (NULL); diff --git a/tests/testappchooser.c b/tests/testappchooser.c index 6641730731..25666dfe8d 100644 --- a/tests/testappchooser.c +++ b/tests/testappchooser.c @@ -160,7 +160,6 @@ main (int argc, char **argv) gtk_init (&argc, &argv); toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_container_set_border_width (GTK_CONTAINER (toplevel), 12); grid = gtk_grid_new (); w1 = gtk_label_new ("File:"); diff --git a/tests/testappchooserbutton.c b/tests/testappchooserbutton.c index 95def5a38d..bf37cd57c4 100644 --- a/tests/testappchooserbutton.c +++ b/tests/testappchooserbutton.c @@ -71,7 +71,6 @@ main (int argc, gtk_init (&argc, &argv); toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_container_set_border_width (GTK_CONTAINER (toplevel), 12); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); gtk_container_add (GTK_CONTAINER (toplevel), box); diff --git a/tests/testcalendar.c b/tests/testcalendar.c index 3d6fab7b18..de0d4f106f 100644 --- a/tests/testcalendar.c +++ b/tests/testcalendar.c @@ -446,7 +446,6 @@ create_calendar(void) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), "GtkCalendar Example"); - gtk_container_set_border_width (GTK_CONTAINER (window), 12); g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); diff --git a/tests/testcellrenderertext.c b/tests/testcellrenderertext.c index 842d81312a..c9648a5255 100644 --- a/tests/testcellrenderertext.c +++ b/tests/testcellrenderertext.c @@ -259,7 +259,6 @@ main (int argc, char **argv) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); - gtk_container_set_border_width (GTK_CONTAINER (window), 12); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12); gtk_container_add (GTK_CONTAINER (window), vbox); diff --git a/tests/testcombo.c b/tests/testcombo.c index 7d2db0b201..c0880d161f 100644 --- a/tests/testcombo.c +++ b/tests/testcombo.c @@ -1079,7 +1079,6 @@ main (int argc, char **argv) } window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_container_set_border_width (GTK_CONTAINER (window), 5); g_signal_connect (window, "destroy", gtk_main_quit, NULL); mainbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); @@ -1090,7 +1089,6 @@ main (int argc, char **argv) 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); cellview = gtk_cell_view_new (); @@ -1112,7 +1110,6 @@ main (int argc, char **argv) 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); model = create_list_blaat (); @@ -1153,7 +1150,6 @@ main (int argc, char **argv) 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); model = create_empty_list_blaat (); @@ -1197,7 +1193,6 @@ main (int argc, char **argv) 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); model = create_list_blaat (); @@ -1257,7 +1252,6 @@ main (int argc, char **argv) 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); model = create_tree_blaat (); @@ -1301,7 +1295,6 @@ main (int argc, char **argv) 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 (); @@ -1313,7 +1306,6 @@ main (int argc, char **argv) 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); comboboxtext = gtk_combo_box_text_new_with_entry (); @@ -1326,7 +1318,6 @@ main (int argc, char **argv) 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); model = create_phylogenetic_tree (); @@ -1349,7 +1340,6 @@ main (int argc, char **argv) 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); model = create_capital_tree (); @@ -1381,7 +1371,6 @@ main (int argc, char **argv) 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); model = create_food_list (); @@ -1416,7 +1405,6 @@ main (int argc, char **argv) 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); model = create_list_long (); diff --git a/tests/testcombochange.c b/tests/testcombochange.c index 9b5c1ec541..c8c7762840 100644 --- a/tests/testcombochange.c +++ b/tests/testcombochange.c @@ -247,7 +247,6 @@ main (int argc, char **argv) content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); 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); combo_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); diff --git a/tests/testellipsise.c b/tests/testellipsise.c index 9d1397e560..18b650852e 100644 --- a/tests/testellipsise.c +++ b/tests/testellipsise.c @@ -128,7 +128,6 @@ main (int argc, char *argv[]) gtk_init (&argc, &argv); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_container_set_border_width (GTK_CONTAINER (window), 12); gtk_window_set_default_size (GTK_WINDOW (window), 400, 300); g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); diff --git a/tests/testemblems.c b/tests/testemblems.c index 19f0aa1d41..3d8ee8091f 100644 --- a/tests/testemblems.c +++ b/tests/testemblems.c @@ -13,7 +13,6 @@ int main (int argc, char **argv) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); grid = gtk_grid_new (); - gtk_container_set_border_width (GTK_CONTAINER (grid), 12); gtk_grid_set_row_spacing (GTK_GRID (grid), 12); gtk_grid_set_column_spacing (GTK_GRID (grid), 12); gtk_container_add (GTK_CONTAINER (window), grid); diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c index a45c2c9886..4bb0124e7c 100644 --- a/tests/testentrycompletion.c +++ b/tests/testentrycompletion.c @@ -299,14 +299,11 @@ main (int argc, char *argv[]) gtk_init (&argc, &argv); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_container_set_border_width (GTK_CONTAINER (window), 5); g_signal_connect (window, "delete_event", gtk_main_quit, NULL); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); gtk_container_add (GTK_CONTAINER (window), vbox); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); - 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."); diff --git a/tests/testentryicons.c b/tests/testentryicons.c index d9921edc9a..1025c0a806 100644 --- a/tests/testentryicons.c +++ b/tests/testentryicons.c @@ -112,7 +112,6 @@ main (int argc, char **argv) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), "Gtk Entry Icons Test"); - gtk_container_set_border_width (GTK_CONTAINER (window), 12); g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL); diff --git a/tests/testfilechooserbutton.c b/tests/testfilechooserbutton.c index ec537aab9a..96deb114f3 100644 --- a/tests/testfilechooserbutton.c +++ b/tests/testfilechooserbutton.c @@ -124,7 +124,6 @@ tests_button_clicked_cb (GtkButton *real_button, tests = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (tests), "Tests - TestFileChooserButton"); - gtk_container_set_border_width (GTK_CONTAINER (tests), 12); gtk_window_set_transient_for (GTK_WINDOW (tests), GTK_WINDOW (gtk_widget_get_toplevel (user_data))); diff --git a/tests/testflowbox.c b/tests/testflowbox.c index ce79ba7104..779ee4df4e 100644 --- a/tests/testflowbox.c +++ b/tests/testflowbox.c @@ -403,8 +403,6 @@ create_window (void) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); - gtk_container_set_border_width (GTK_CONTAINER (window), 8); - gtk_widget_show (vbox); gtk_widget_show (hbox); gtk_container_add (GTK_CONTAINER (window), hbox); diff --git a/tests/testfontoptions.c b/tests/testfontoptions.c index 644ece9754..7db27bcf7a 100644 --- a/tests/testfontoptions.c +++ b/tests/testfontoptions.c @@ -38,7 +38,6 @@ main (int argc, char *argv[]) grid = gtk_grid_new (); gtk_grid_set_row_spacing (GTK_GRID (grid), 10); gtk_grid_set_column_spacing (GTK_GRID (grid), 10); - gtk_container_set_border_width (GTK_CONTAINER (grid), 10); gtk_container_add (GTK_CONTAINER (window), grid); label = gtk_label_new ("Default font options"); gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 2, 1); diff --git a/tests/testframe.c b/tests/testframe.c index 85b6fe5d0c..7410c6eef7 100644 --- a/tests/testframe.c +++ b/tests/testframe.c @@ -139,7 +139,6 @@ int main (int argc, char **argv) gtk_init (&argc, &argv); window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_container_set_border_width (GTK_CONTAINER (window), 5); gtk_window_set_default_size (GTK_WINDOW (window), 300, 300); g_signal_connect (G_OBJECT (window), "delete-event", gtk_main_quit, NULL); diff --git a/tests/testglarea.c b/tests/testglarea.c index ef2bec8d39..187637d952 100644 --- a/tests/testglarea.c +++ b/tests/testglarea.c @@ -406,7 +406,6 @@ main (int argc, char *argv[]) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), "GtkGLArea - Triangle"); gtk_window_set_default_size (GTK_WINDOW (window), 400, 600); - gtk_container_set_border_width (GTK_CONTAINER (window), 12); g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE); diff --git a/tests/testglblending.c b/tests/testglblending.c index ef81c8c52b..bb3b186bdd 100644 --- a/tests/testglblending.c +++ b/tests/testglblending.c @@ -13,7 +13,6 @@ main (int argc, char *argv[]) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), "Test GL/gtk inter-blending"); gtk_window_set_default_size (GTK_WINDOW (window), 250, 250); - gtk_container_set_border_width (GTK_CONTAINER (window), 12); g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); fixed = gtk_fixed_new (); diff --git a/tests/testgtk.c b/tests/testgtk.c index 23e0ac20fe..3a2dcfb2d2 100644 --- a/tests/testgtk.c +++ b/tests/testgtk.c @@ -132,13 +132,8 @@ on_alpha_window_draw (GtkWidget *widget, /* Get the child allocation to avoid painting over the borders */ GtkWidget *child = gtk_bin_get_child (GTK_BIN (widget)); GtkAllocation child_allocation; - int border_width = gtk_container_get_border_width (GTK_CONTAINER (child)); gtk_widget_get_allocation (child, &child_allocation); - child_allocation.x -= border_width; - child_allocation.y -= border_width; - child_allocation.width += 2 * border_width; - child_allocation.height += 2 * border_width; cairo_translate (cr, child_allocation.x, child_allocation.y); @@ -261,7 +256,6 @@ create_alpha_window (GtkWidget *widget) 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); @@ -328,7 +322,6 @@ create_buttons (GtkWidget *widget) &window); gtk_window_set_title (GTK_WINDOW (window), "GtkButton"); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (window), box1); @@ -336,7 +329,6 @@ create_buttons (GtkWidget *widget) grid = gtk_grid_new (); gtk_grid_set_row_spacing (GTK_GRID (grid), 5); gtk_grid_set_column_spacing (GTK_GRID (grid), 5); - gtk_container_set_border_width (GTK_CONTAINER (grid), 10); gtk_box_pack_start (GTK_BOX (box1), grid, TRUE, TRUE); button[0] = gtk_button_new_with_label ("button1"); @@ -365,7 +357,6 @@ create_buttons (GtkWidget *widget) 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); button[9] = gtk_button_new_with_label ("close"); @@ -407,13 +398,11 @@ create_toggle_buttons (GtkWidget *widget) &window); gtk_window_set_title (GTK_WINDOW (window), "GtkToggleButton"); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (window), box1); 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); button = gtk_toggle_button_new_with_label ("button1"); @@ -433,7 +422,6 @@ create_toggle_buttons (GtkWidget *widget) 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); button = gtk_button_new_with_label ("close"); @@ -539,7 +527,6 @@ create_check_buttons (GtkWidget *widget) 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); button = gtk_check_button_new_with_mnemonic ("_button1"); @@ -559,7 +546,6 @@ create_check_buttons (GtkWidget *widget) 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); } @@ -604,7 +590,6 @@ create_radio_buttons (GtkWidget *widget) 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); button = gtk_radio_button_new_with_label (NULL, "button1"); @@ -631,7 +616,6 @@ create_radio_buttons (GtkWidget *widget) 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); button = gtk_radio_button_new_with_label (NULL, "button4"); @@ -655,7 +639,6 @@ create_radio_buttons (GtkWidget *widget) 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); } @@ -688,7 +671,6 @@ create_bbox (gint horizontal, else bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL); - gtk_container_set_border_width (GTK_CONTAINER (bbox), 5); gtk_container_add (GTK_CONTAINER (frame), bbox); gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), layout); @@ -726,8 +708,6 @@ create_button_box (GtkWidget *widget) G_CALLBACK (gtk_widget_destroyed), &window); - gtk_container_set_border_width (GTK_CONTAINER (window), 10); - main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (window), main_vbox); @@ -737,7 +717,6 @@ create_button_box (GtkWidget *widget) 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), @@ -766,7 +745,6 @@ create_button_box (GtkWidget *widget) 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), @@ -935,7 +913,6 @@ create_toolbar (GtkWidget *widget) G_CALLBACK (gtk_widget_destroyed), &window); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); gtk_widget_realize (window); toolbar = gtk_toolbar_new (); @@ -1081,13 +1058,11 @@ create_statusbar (GtkWidget *widget) &window); gtk_window_set_title (GTK_WINDOW (window), "statusbar"); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (window), box1); 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); statusbar = gtk_statusbar_new (); @@ -1142,7 +1117,6 @@ create_statusbar (GtkWidget *widget) 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); button = gtk_button_new_with_label ("close"); @@ -1194,7 +1168,6 @@ create_alpha_widgets (GtkWidget *widget) G_CALLBACK (gtk_widget_destroyed), &window); gtk_window_set_title (GTK_WINDOW (window), "Alpha"); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); gtk_container_add (GTK_CONTAINER (window), main_hbox); @@ -1435,7 +1408,6 @@ void create_labels (GtkWidget *widget) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); 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"); @@ -1600,7 +1572,6 @@ create_rotated_label (GtkWidget *widget) vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); 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>"); @@ -1813,13 +1784,11 @@ create_reparent (GtkWidget *widget) &window); gtk_window_set_title (GTK_WINDOW (window), "reparent"); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (window), box1); 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); label = gtk_label_new ("Hello World"); @@ -1828,7 +1797,6 @@ create_reparent (GtkWidget *widget) 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); gtk_container_add (GTK_CONTAINER (frame), box3); button = gtk_button_new_with_label ("switch"); @@ -1851,7 +1819,6 @@ create_reparent (GtkWidget *widget) 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); gtk_container_add (GTK_CONTAINER (frame), box3); button = gtk_button_new_with_label ("switch"); @@ -1869,7 +1836,6 @@ create_reparent (GtkWidget *widget) 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); button = gtk_button_new_with_label ("close"); @@ -2140,7 +2106,6 @@ create_saved_position (GtkWidget *widget) &window); main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); - gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 0); gtk_container_add (GTK_CONTAINER (window), main_vbox); vbox = @@ -2148,7 +2113,6 @@ create_saved_position (GtkWidget *widget) "orientation", GTK_ORIENTATION_VERTICAL, "GtkBox::homogeneous", FALSE, "GtkBox::spacing", 5, - "GtkContainer::border_width", 10, "GtkWidget::parent", main_vbox, "GtkWidget::visible", TRUE, "child", g_object_connect (g_object_new (GTK_TYPE_TOGGLE_BUTTON, @@ -2161,7 +2125,6 @@ create_saved_position (GtkWidget *widget) NULL); 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); label = gtk_label_new ("X Origin : "); @@ -2174,7 +2137,6 @@ create_saved_position (GtkWidget *widget) 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); label = gtk_label_new ("Y Origin : "); @@ -2193,7 +2155,6 @@ create_saved_position (GtkWidget *widget) 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); button = gtk_button_new_with_label ("Close"); @@ -2239,14 +2200,12 @@ create_pixbuf (GtkWidget *widget) &window); gtk_window_set_title (GTK_WINDOW (window), "GtkPixmap"); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); gtk_widget_realize(window); box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (window), box1); 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); button = gtk_button_new (); @@ -2258,7 +2217,6 @@ create_pixbuf (GtkWidget *widget) label = gtk_label_new ("Pixbuf\ntest"); box3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_container_set_border_width (GTK_CONTAINER (box3), 2); gtk_container_add (GTK_CONTAINER (box3), pixbufwid); gtk_container_add (GTK_CONTAINER (box3), label); gtk_container_add (GTK_CONTAINER (button), box3); @@ -2270,7 +2228,6 @@ create_pixbuf (GtkWidget *widget) label = gtk_label_new ("Pixbuf\ntest"); box3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); - gtk_container_set_border_width (GTK_CONTAINER (box3), 2); gtk_container_add (GTK_CONTAINER (box3), pixbufwid); gtk_container_add (GTK_CONTAINER (box3), label); gtk_container_add (GTK_CONTAINER (button), box3); @@ -2281,7 +2238,6 @@ create_pixbuf (GtkWidget *widget) 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); button = gtk_button_new_with_label ("close"); @@ -2316,7 +2272,6 @@ create_tooltips (GtkWidget *widget) window = g_object_new (gtk_window_get_type (), "GtkWindow::type", GTK_WINDOW_TOPLEVEL, - "GtkContainer::border_width", 0, "GtkWindow::title", "Tooltips", "GtkWindow::resizable", FALSE, NULL); @@ -2328,7 +2283,6 @@ create_tooltips (GtkWidget *widget) gtk_container_add (GTK_CONTAINER (window), box1); 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); button = gtk_toggle_button_new_with_label ("button1"); @@ -2354,7 +2308,6 @@ create_tooltips (GtkWidget *widget) "orientation", GTK_ORIENTATION_VERTICAL, "homogeneous", FALSE, "spacing", 5, - "border_width", 5, "visible", TRUE, NULL); @@ -2370,7 +2323,6 @@ create_tooltips (GtkWidget *widget) frame = g_object_new (gtk_frame_get_type (), "label", "ToolTips Inspector", "label_xalign", (double) 0.5, - "border_width", 0, "visible", TRUE, "parent", box2, "child", box3, @@ -2381,7 +2333,6 @@ create_tooltips (GtkWidget *widget) 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); button = gtk_button_new_with_label ("close"); @@ -2923,7 +2874,6 @@ create_menus (GtkWidget *widget) gtk_window_add_accel_group (GTK_WINDOW (window), accel_group); gtk_window_set_title (GTK_WINDOW (window), "menus"); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); @@ -2980,7 +2930,6 @@ create_menus (GtkWidget *widget) 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); gtk_widget_show (box2); @@ -3031,7 +2980,6 @@ create_menus (GtkWidget *widget) 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); gtk_widget_show (box2); @@ -3230,10 +3178,6 @@ create_modal_window (GtkWidget *widget) btnFile = gtk_button_new_with_label ("File Selection"); btnClose = gtk_button_new_with_label ("Close"); - /* 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); @@ -3416,10 +3360,8 @@ create_scrolled_windows (GtkWidget *widget) content_area = gtk_dialog_get_content_area (GTK_DIALOG (window)); gtk_window_set_title (GTK_WINDOW (window), "dialog"); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 10); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); @@ -3572,7 +3514,6 @@ create_entry (GtkWidget *widget) &window); gtk_window_set_title (GTK_WINDOW (window), "entry"); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); @@ -3580,7 +3521,6 @@ 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); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); @@ -3636,7 +3576,6 @@ create_entry (GtkWidget *widget) 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); button = gtk_button_new_with_label ("close"); @@ -3673,7 +3612,6 @@ create_expander (GtkWidget *widget) &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); @@ -3770,7 +3708,6 @@ create_event_box (GtkWidget *widget) &window); gtk_window_set_title (GTK_WINDOW (window), "event box"); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (window), box1); @@ -3816,7 +3753,6 @@ create_event_box (GtkWidget *widget) 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); button = gtk_button_new_with_label ("close"); @@ -3896,7 +3832,6 @@ create_size_group_window (GdkScreen *screen, 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), 5); gtk_widget_set_size_request (grid, 250, 250); hgroup1 = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); @@ -4212,14 +4147,12 @@ create_spins (GtkWidget *widget) 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); 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 */ @@ -4298,7 +4231,6 @@ create_spins (GtkWidget *widget) 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); @@ -4376,7 +4308,6 @@ create_spins (GtkWidget *widget) 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"); @@ -4674,7 +4605,6 @@ create_cursors (GtkWidget *widget) gtk_window_set_title (GTK_WINDOW (window), "Cursors"); main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); - gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 0); gtk_container_add (GTK_CONTAINER (window), main_vbox); vbox = @@ -4682,7 +4612,6 @@ create_cursors (GtkWidget *widget) "orientation", GTK_ORIENTATION_VERTICAL, "GtkBox::homogeneous", FALSE, "GtkBox::spacing", 5, - "GtkContainer::border_width", 10, "GtkWidget::parent", main_vbox, "GtkWidget::visible", TRUE, NULL); @@ -4701,7 +4630,6 @@ create_cursors (GtkWidget *widget) guint w, h; 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); label = gtk_label_new ("Cursor Theme:"); @@ -4725,7 +4653,6 @@ 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); label = gtk_label_new ("Cursor Name:"); @@ -4746,7 +4673,6 @@ create_cursors (GtkWidget *widget) g_object_new (gtk_frame_get_type (), "GtkFrame::label_xalign", 0.5, "GtkFrame::label", "Cursor Area", - "GtkContainer::border_width", 10, "GtkWidget::parent", vbox, "GtkWidget::visible", TRUE, NULL); @@ -4771,7 +4697,6 @@ create_cursors (GtkWidget *widget) 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); button = gtk_button_new_with_label ("Close"); @@ -4812,10 +4737,8 @@ create_color_selection (GtkWidget *widget) &window); gtk_window_set_title (GTK_WINDOW (window), "GtkColorButton"); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 8); gtk_container_add (GTK_CONTAINER (window), hbox); label = gtk_label_new ("Pick a color"); @@ -4902,8 +4825,6 @@ create_forward_back (const char *title, GtkWidget *back_button = gtk_button_new_with_label ("Back"); GtkWidget *forward_button = gtk_button_new_with_label ("Forward"); - gtk_container_set_border_width (GTK_CONTAINER (bbox), 5); - gtk_container_add (GTK_CONTAINER (frame), bbox); gtk_container_add (GTK_CONTAINER (bbox), back_button); gtk_container_add (GTK_CONTAINER (bbox), forward_button); @@ -4936,7 +4857,6 @@ create_flipping (GtkWidget *widget) gtk_window_set_title (GTK_WINDOW (window), "Bidirectional Flipping"); check_button = gtk_check_button_new_with_label ("Right-to-left global direction"); - gtk_container_set_border_width (GTK_CONTAINER (check_button), 10); gtk_box_pack_start (GTK_BOX (content_area), check_button, TRUE, TRUE); if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL) @@ -4946,7 +4866,6 @@ create_flipping (GtkWidget *widget) G_CALLBACK (flipping_toggled_cb), NULL); 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); g_signal_connect (check_button, "toggled", @@ -5102,10 +5021,8 @@ create_font_selection (GtkWidget *widget) &window); gtk_window_set_title (GTK_WINDOW (window), "GtkFontButton"); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 8); gtk_container_add (GTK_CONTAINER (window), hbox); label = gtk_label_new ("Pick a font"); @@ -5184,7 +5101,6 @@ create_dialog (GtkWidget *widget) gtk_window_set_title (GTK_WINDOW (dialog_window), "GtkDialog"); - gtk_container_set_border_width (GTK_CONTAINER (dialog_window), 0); gtk_dialog_add_button (GTK_DIALOG (dialog_window), "OK", @@ -5286,7 +5202,6 @@ create_display_screen (GtkWidget *widget) "screen", screen, "type", GTK_WINDOW_TOPLEVEL, "title", "Screen or Display selection", - "border_width", 10, NULL); g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroy), NULL); @@ -5407,14 +5322,12 @@ create_event_watcher (GtkWidget *widget) content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog_window)); gtk_window_set_title (GTK_WINDOW (dialog_window), "Event Watcher"); - gtk_container_set_border_width (GTK_CONTAINER (dialog_window), 0); gtk_widget_set_size_request (dialog_window, 200, 110); button = gtk_toggle_button_new_with_label ("Activate Watch"); g_signal_connect (button, "clicked", 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); gtk_widget_show (button); @@ -5465,7 +5378,6 @@ create_range_controls (GtkWidget *widget) &window); gtk_window_set_title (GTK_WINDOW (window), "range controls"); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); @@ -5474,7 +5386,6 @@ 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); gtk_widget_show (box2); @@ -5537,7 +5448,6 @@ 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, FALSE, TRUE); gtk_widget_show (box2); @@ -5697,11 +5607,9 @@ create_pages (GtkNotebook *notebook, gint start, gint end) sprintf (accel_buffer, "Page _%d", i); child = gtk_frame_new (buffer); - gtk_container_set_border_width (GTK_CONTAINER (child), 10); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_box_set_homogeneous (GTK_BOX (vbox), TRUE); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 10); gtk_container_add (GTK_CONTAINER (child), vbox); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); @@ -5869,7 +5777,6 @@ create_notebook (GtkWidget *widget) &window); gtk_window_set_title (GTK_WINDOW (window), "notebook"); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); gtk_container_add (GTK_CONTAINER (window), box1); @@ -5879,7 +5786,6 @@ create_notebook (GtkWidget *widget) G_CALLBACK (page_switch), NULL); gtk_notebook_set_tab_pos (GTK_NOTEBOOK (sample_notebook), GTK_POS_TOP); gtk_box_pack_start (GTK_BOX (box1), sample_notebook, TRUE, TRUE); - gtk_container_set_border_width (GTK_CONTAINER (sample_notebook), 10); gtk_widget_realize (sample_notebook); @@ -5895,7 +5801,6 @@ create_notebook (GtkWidget *widget) 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); button = gtk_check_button_new_with_label ("popup menu"); @@ -5905,7 +5810,6 @@ create_notebook (GtkWidget *widget) 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); label = gtk_label_new ("Notebook Style :"); @@ -5923,7 +5827,6 @@ create_notebook (GtkWidget *widget) 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); button = gtk_button_new_with_label ("prev"); @@ -5947,7 +5850,6 @@ create_notebook (GtkWidget *widget) 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); @@ -6004,7 +5906,6 @@ create_pane_options (GtkPaned *paned, child2 = gtk_paned_get_child2 (paned); frame = gtk_frame_new (frame_label); - gtk_container_set_border_width (GTK_CONTAINER (frame), 4); grid = gtk_grid_new (); gtk_container_add (GTK_CONTAINER (frame), grid); @@ -6070,14 +5971,12 @@ create_panes (GtkWidget *widget) &window); gtk_window_set_title (GTK_WINDOW (window), "Panes"); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); 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); - gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5); hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); gtk_paned_add1 (GTK_PANED (vpaned), hpaned); @@ -6202,11 +6101,9 @@ paned_keyboard_window1 (GtkWidget *widget) frame4 = gtk_frame_new ("Buttons"); gtk_container_add (GTK_CONTAINER (frame3), frame4); - gtk_container_set_border_width (GTK_CONTAINER (frame4), 15); grid1 = gtk_grid_new (); gtk_container_add (GTK_CONTAINER (frame4), grid1); - gtk_container_set_border_width (GTK_CONTAINER (grid1), 11); button1 = gtk_button_new_with_label ("button1"); gtk_grid_attach (GTK_GRID (grid1), button1, 0, 0, 1, 1); @@ -6760,7 +6657,6 @@ create_wmhints (GtkWidget *widget) &window); gtk_window_set_title (GTK_WINDOW (window), "WM Hints"); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); gtk_widget_realize (window); @@ -6795,7 +6691,6 @@ create_wmhints (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, FALSE, TRUE); gtk_widget_show (box2); @@ -7704,10 +7599,8 @@ create_progress_bar (GtkWidget *widget) content_area = gtk_dialog_get_content_area (GTK_DIALOG (pdata->window)); gtk_window_set_title (GTK_WINDOW (pdata->window), "GtkProgressBar"); - gtk_container_set_border_width (GTK_CONTAINER (pdata->window), 0); 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); frame = gtk_frame_new ("Progress"); @@ -8095,7 +7988,6 @@ create_snapshot (GtkWidget *widget) data); gtk_window_set_title (GTK_WINDOW (window), "test snapshot"); - gtk_container_set_border_width (GTK_CONTAINER (window), 10); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1); gtk_container_add (GTK_CONTAINER (window), vbox); @@ -8219,12 +8111,10 @@ create_selection_test (GtkWidget *widget) content_area = gtk_dialog_get_content_area (GTK_DIALOG (window)); gtk_window_set_title (GTK_WINDOW (window), "Selection Test"); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); /* Create the list */ 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); label = gtk_label_new ("Gets available targets for current selection"); @@ -8372,7 +8262,6 @@ create_scroll_test (GtkWidget *widget) content_area = gtk_dialog_get_content_area (GTK_DIALOG (window)); gtk_window_set_title (GTK_WINDOW (window), "Scroll Test"); - 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); @@ -8490,7 +8379,6 @@ create_timeout_test (GtkWidget *widget) action_area = gtk_dialog_get_content_area (GTK_DIALOG (window)); gtk_window_set_title (GTK_WINDOW (window), "Timeout Test"); - gtk_container_set_border_width (GTK_CONTAINER (window), 0); label = gtk_label_new ("count: 0"); g_object_set (label, "margin", 10, NULL); @@ -9191,14 +9079,12 @@ create_main_window (void) gtk_widget_set_name (label, "testgtk-version-label"); scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), 10); 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); box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); - gtk_container_set_border_width (GTK_CONTAINER (box2), 10); gtk_container_add (GTK_CONTAINER (scrolled_window), box2); gtk_container_set_focus_vadjustment (GTK_CONTAINER (box2), gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrolled_window))); @@ -9221,7 +9107,6 @@ create_main_window (void) 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); button = gtk_button_new_with_mnemonic ("_Close"); diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c index 1bc63e7be7..66e9531701 100644 --- a/tests/testheightforwidth.c +++ b/tests/testheightforwidth.c @@ -102,7 +102,6 @@ TestInterface interfaces[] = { " <requires lib=\"gtk+\" version=\"2.18\"/>" " <!-- interface-naming-policy project-wide -->" " <object class=\"GtkWindow\" id=\"window\">" - " <property name=\"border_width\">12</property>" " <property name=\"default_width\">300</property>" " <child>" " <object class=\"GtkHPaned\" id=\"hpaned1\">" @@ -633,7 +632,6 @@ TestInterface interfaces[] = { " <child>" " <object class=\"GtkFrame\" id=\"frame1\">" " <property name=\"visible\">True</property>" - " <property name=\"border_width\">8</property>" " <property name=\"label_xalign\">0</property>" " <child>" " <object class=\"GtkAlignment\" id=\"alignment1\">" @@ -670,7 +668,6 @@ TestInterface interfaces[] = { " <requires lib=\"gtk+\" version=\"2.20\"/>" " <!-- interface-naming-policy project-wide -->" " <object class=\"GtkWindow\" id=\"window\">" - " <property name=\"border_width\">8</property>" " <property name=\"default_width\">600</property>" " <child>" " <object class=\"GtkHPaned\" id=\"hpaned1\">" @@ -949,8 +946,6 @@ create_window (void) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); - gtk_container_set_border_width (GTK_CONTAINER (window), 8); - gtk_widget_show (vbox); gtk_container_add (GTK_CONTAINER (window), vbox); diff --git a/tests/testkineticscrolling.c b/tests/testkineticscrolling.c index dec82da878..94bd6b85c0 100644 --- a/tests/testkineticscrolling.c +++ b/tests/testkineticscrolling.c @@ -29,7 +29,6 @@ kinetic_scrolling (void) gint i; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_container_set_border_width (GTK_CONTAINER (window), 5); gtk_window_set_default_size (GTK_WINDOW (window), 400, 400); g_signal_connect (window, "delete_event", G_CALLBACK (gtk_main_quit), NULL); diff --git a/tests/testlockbutton.c b/tests/testlockbutton.c index 96b6891d13..f64cea8882 100644 --- a/tests/testlockbutton.c +++ b/tests/testlockbutton.c @@ -224,7 +224,6 @@ main (int argc, char *argv[]) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_resizable (GTK_WINDOW (window), FALSE); - gtk_container_set_border_width (GTK_CONTAINER (window), 12); box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); gtk_container_add (GTK_CONTAINER (window), box); diff --git a/tests/testmenubutton.c b/tests/testmenubutton.c index 670b9ee8d0..d51133ed4a 100644 --- a/tests/testmenubutton.c +++ b/tests/testmenubutton.c @@ -52,7 +52,6 @@ int main (int argc, char **argv) gtk_window_resize (GTK_WINDOW (window), 400, 300); grid = gtk_grid_new (); - gtk_container_set_border_width (GTK_CONTAINER (grid), 12); gtk_grid_set_row_spacing (GTK_GRID (grid), 12); gtk_grid_set_column_spacing (GTK_GRID (grid), 12); gtk_container_add (GTK_CONTAINER (window), grid); diff --git a/tests/testmerge.c b/tests/testmerge.c index 7ea85a1580..59d185611f 100644 --- a/tests/testmerge.c +++ b/tests/testmerge.c @@ -597,14 +597,12 @@ main (int argc, char **argv) grid = gtk_grid_new (); gtk_grid_set_row_spacing (GTK_GRID (grid), 2); gtk_grid_set_column_spacing (GTK_GRID (grid), 2); - gtk_container_set_border_width (GTK_CONTAINER (grid), 2); gtk_container_add (GTK_CONTAINER (window), grid); 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 (); @@ -654,7 +652,6 @@ main (int argc, char **argv) gtk_grid_attach (GTK_GRID (grid), frame, 0, 0, 1, 1); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 2); gtk_container_add (GTK_CONTAINER (frame), vbox); for (i = 0; i < G_N_ELEMENTS (merge_ids); i++) diff --git a/tests/testmultidisplay.c b/tests/testmultidisplay.c index 5b8412b998..0b28b47e09 100644 --- a/tests/testmultidisplay.c +++ b/tests/testmultidisplay.c @@ -69,14 +69,13 @@ make_selection_dialog (GdkScreen * screen, "user_data", NULL, "type", GTK_WINDOW_TOPLEVEL, "title", "MultiDisplay Cut & Paste", - "border_width", 10, NULL); + NULL); g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); content_area = gtk_dialog_get_content_area (GTK_DIALOG (window)); vbox = g_object_new (GTK_TYPE_BOX, - "border_width", 5, "orientation", GTK_ORIENTATION_VERTICAL, NULL); gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE, FALSE); diff --git a/tests/testnotebookdnd.c b/tests/testnotebookdnd.c index be78ca6e4c..436baabfe8 100644 --- a/tests/testnotebookdnd.c +++ b/tests/testnotebookdnd.c @@ -188,7 +188,6 @@ create_notebook (gchar **labels, gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), pos); gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook), TRUE); - gtk_container_set_border_width (GTK_CONTAINER (notebook), 6); gtk_notebook_set_group_name (GTK_NOTEBOOK (notebook), group); while (*labels) @@ -233,7 +232,6 @@ create_notebook_non_dragable_content (gchar **labels, gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), pos); gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook), TRUE); - gtk_container_set_border_width (GTK_CONTAINER (notebook), 6); gtk_notebook_set_group_name (GTK_NOTEBOOK (notebook), group); while (*labels) @@ -275,7 +273,6 @@ create_notebook_with_notebooks (gchar **labels, gtk_notebook_set_tab_pos (GTK_NOTEBOOK (notebook), pos); gtk_notebook_set_scrollable (GTK_NOTEBOOK (notebook), TRUE); - gtk_container_set_border_width (GTK_CONTAINER (notebook), 6); gtk_notebook_set_group_name (GTK_NOTEBOOK (notebook), group); while (*labels) diff --git a/tests/testrichtext.c b/tests/testrichtext.c index 329973b09a..7da1bef897 100644 --- a/tests/testrichtext.c +++ b/tests/testrichtext.c @@ -155,7 +155,6 @@ main (gint argc, sw = gtk_scrolled_window_new (NULL, NULL); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), GTK_SHADOW_IN); - gtk_container_set_border_width (GTK_CONTAINER (sw), 12); gtk_container_add (GTK_CONTAINER (window), sw); g_signal_connect (window, "delete-event", diff --git a/tests/testscrolledwindow.c b/tests/testscrolledwindow.c index 9941cb103b..cecc1770b1 100644 --- a/tests/testscrolledwindow.c +++ b/tests/testscrolledwindow.c @@ -69,7 +69,7 @@ add_row (GtkButton *button, { GtkWidget *row; - row = g_object_new (GTK_TYPE_LIST_BOX_ROW, "border-width", 12, NULL); + row = g_object_new (GTK_TYPE_LIST_BOX_ROW, NULL); gtk_container_add (GTK_CONTAINER (row), gtk_label_new ("test")); gtk_container_add (GTK_CONTAINER (listbox), row); @@ -101,8 +101,6 @@ scrollable_policy (void) hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6); - gtk_container_set_border_width (GTK_CONTAINER (window), 8); - gtk_widget_show (vbox); gtk_widget_show (hbox); gtk_container_add (GTK_CONTAINER (window), hbox); diff --git a/tests/testselection.c b/tests/testselection.c index 3fb0756baf..7176985590 100644 --- a/tests/testselection.c +++ b/tests/testselection.c @@ -410,7 +410,6 @@ main (int argc, char *argv[]) dialog = gtk_dialog_new (); gtk_widget_set_name (dialog, "Test Input"); - gtk_container_set_border_width (GTK_CONTAINER(dialog), 0); g_signal_connect (dialog, "destroy", G_CALLBACK (quit), NULL); @@ -418,7 +417,6 @@ main (int argc, char *argv[]) content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); 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); gtk_widget_show (vbox); diff --git a/tests/testswitch.c b/tests/testswitch.c index c348ba9abc..ee0a569846 100644 --- a/tests/testswitch.c +++ b/tests/testswitch.c @@ -161,7 +161,6 @@ int main (int argc, char *argv[]) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), "GtkSwitch"); gtk_window_set_default_size (GTK_WINDOW (window), 400, -1); - gtk_container_set_border_width (GTK_CONTAINER (window), 6); g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); gtk_widget_show (window); diff --git a/tests/testtoolbar.c b/tests/testtoolbar.c index dc1522baf0..d284b52cee 100644 --- a/tests/testtoolbar.c +++ b/tests/testtoolbar.c @@ -503,11 +503,9 @@ main (gint argc, gchar **argv) gtk_grid_attach (GTK_GRID (grid), toolbar, 0, 0, 2, 1); hbox1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3); - gtk_container_set_border_width (GTK_CONTAINER (hbox1), 5); gtk_grid_attach (GTK_GRID (grid), hbox1, 1, 1, 1, 1); hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); - gtk_container_set_border_width (GTK_CONTAINER (hbox2), 5); gtk_grid_attach (GTK_GRID (grid), hbox2, 1, 2, 1, 1); checkbox = gtk_check_button_new_with_mnemonic("_Vertical"); @@ -693,7 +691,6 @@ main (gint argc, gchar **argv) gtk_toolbar_insert (GTK_TOOLBAR (toolbar), item, -1); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5); - gtk_container_set_border_width (GTK_CONTAINER (hbox), 5); gtk_widget_set_hexpand (hbox, TRUE); gtk_grid_attach (GTK_GRID (grid), hbox, 1, 4, 1, 1); diff --git a/tests/testtooltips.c b/tests/testtooltips.c index 027bdacebd..4a8884d1eb 100644 --- a/tests/testtooltips.c +++ b/tests/testtooltips.c @@ -282,7 +282,6 @@ main (int argc, char *argv[]) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), "Tooltips test"); - gtk_container_set_border_width (GTK_CONTAINER (window), 10); g_signal_connect (window, "delete_event", G_CALLBACK (gtk_main_quit), NULL); diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c index 67257d6aec..d6d3d77aa4 100644 --- a/tests/testtreecolumns.c +++ b/tests/testtreecolumns.c @@ -765,7 +765,6 @@ main (int argc, char *argv[]) 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); diff --git a/tests/testtreecolumnsizing.c b/tests/testtreecolumnsizing.c index c152c0f1f2..c3ade30ad5 100644 --- a/tests/testtreecolumnsizing.c +++ b/tests/testtreecolumnsizing.c @@ -176,7 +176,6 @@ main (int argc, char **argv) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_default_size (GTK_WINDOW (window), 640, 480); g_signal_connect (window, "delete-event", G_CALLBACK (gtk_main_quit), NULL); - gtk_container_set_border_width (GTK_CONTAINER (window), 5); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5); gtk_container_add (GTK_CONTAINER (window), vbox); diff --git a/tests/testtreeflow.c b/tests/testtreeflow.c index e7bab70292..6c73ab656a 100644 --- a/tests/testtreeflow.c +++ b/tests/testtreeflow.c @@ -134,7 +134,6 @@ main (int argc, char *argv[]) gtk_window_set_title (GTK_WINDOW (window), "Reflow test"); g_signal_connect (window, "destroy", gtk_main_quit, NULL); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 8); 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); diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c index f7607758a0..6841101a52 100644 --- a/tests/testtreefocus.c +++ b/tests/testtreefocus.c @@ -352,7 +352,6 @@ main (int argc, char *argv[]) gtk_window_set_title (GTK_WINDOW (window), "Card planning sheet"); g_signal_connect (window, "destroy", gtk_main_quit, NULL); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_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); gtk_container_add (GTK_CONTAINER (window), vbox); @@ -467,7 +466,6 @@ main (int argc, char *argv[]) gtk_window_set_title (GTK_WINDOW (window), "Model"); g_signal_connect (window, "destroy", gtk_main_quit, NULL); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 8); gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("The model revealed"), FALSE, FALSE); gtk_container_add (GTK_CONTAINER (window), vbox); diff --git a/tests/testtreesort.c b/tests/testtreesort.c index 2bf02538a6..8239ad26ec 100644 --- a/tests/testtreesort.c +++ b/tests/testtreesort.c @@ -122,7 +122,6 @@ main (int argc, char *argv[]) gtk_window_set_title (GTK_WINDOW (window), "Words, words, words - Window 1"); g_signal_connect (window, "destroy", gtk_main_quit, NULL); vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_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); gtk_container_add (GTK_CONTAINER (window), vbox); @@ -250,7 +249,6 @@ main (int argc, char *argv[]) "Words, words, words - window 2"); g_signal_connect (window2, "destroy", gtk_main_quit, NULL); vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - 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); @@ -320,7 +318,6 @@ main (int argc, char *argv[]) "Words, words, words - Window 3"); g_signal_connect (window3, "destroy", gtk_main_quit, NULL); vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - 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); diff --git a/tests/testwindowsize.c b/tests/testwindowsize.c index 42d3da1420..8a76399077 100644 --- a/tests/testwindowsize.c +++ b/tests/testwindowsize.c @@ -84,7 +84,6 @@ create_window (void) window = gtk_window_new (GTK_WINDOW_TOPLEVEL); gtk_window_set_title (GTK_WINDOW (window), "Window size"); - gtk_container_set_border_width (GTK_CONTAINER (window), 12); gtk_window_set_resizable (GTK_WINDOW (window), FALSE); grid = gtk_grid_new (); diff --git a/tests/treestoretest.c b/tests/treestoretest.c index dc7e9b5af4..f930a388db 100644 --- a/tests/treestoretest.c +++ b/tests/treestoretest.c @@ -302,7 +302,6 @@ make_window (gint view_type) } vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8); - gtk_container_set_border_width (GTK_CONTAINER (vbox), 8); gtk_window_set_default_size (GTK_WINDOW (window), 300, 350); scrolled_window = gtk_scrolled_window_new (NULL, NULL); switch (view_type) |