[gtk+/wip/otte/gtk4] API: container: Remove gtk_container_set_border_width()



commit d2f6bf1ae36ffcff9a9ce593eff6b7940f7f8496
Author: Benjamin Otte <otte redhat com>
Date:   Sun Oct 9 02:32:00 2016 +0200

    API: container: Remove gtk_container_set_border_width()

 demos/gtk-demo/assistant.c                         |    2 -
 demos/gtk-demo/blendmodes.ui                       |    1 -
 demos/gtk-demo/button_box.c                        |    5 -
 demos/gtk-demo/changedisplay.c                     |    2 -
 demos/gtk-demo/clipboard.c                         |    4 -
 demos/gtk-demo/colorsel.c                          |    3 -
 demos/gtk-demo/combobox.c                          |    6 -
 demos/gtk-demo/dialog.c                            |    4 -
 demos/gtk-demo/drawingarea.c                       |    3 -
 demos/gtk-demo/editable_cells.c                    |    1 -
 demos/gtk-demo/entry_buffer.c                      |    1 -
 demos/gtk-demo/entry_completion.c                  |    1 -
 demos/gtk-demo/glarea.c                            |    1 -
 demos/gtk-demo/hypertext.c                         |    2 -
 demos/gtk-demo/images.c                            |    3 -
 demos/gtk-demo/infobar.c                           |    2 -
 demos/gtk-demo/links.c                             |    1 -
 demos/gtk-demo/list_store.c                        |    1 -
 demos/gtk-demo/menus.c                             |    3 -
 demos/gtk-demo/offscreen_window.c                  |   33 +--
 demos/gtk-demo/offscreen_window2.c                 |   33 +--
 demos/gtk-demo/panes.c                             |    3 -
 demos/gtk-demo/pickers.c                           |    4 -
 demos/gtk-demo/popover.c                           |    2 -
 demos/gtk-demo/revealer.ui                         |    1 -
 demos/gtk-demo/scale.ui                            |    1 -
 demos/gtk-demo/search_entry.c                      |    2 -
 demos/gtk-demo/search_entry2.c                     |    3 -
 demos/gtk-demo/sizegroup.c                         |    3 -
 demos/gtk-demo/spinner.c                           |    1 -
 demos/gtk-demo/textview.c                          |    2 -
 demos/gtk-demo/theming_style_classes.c             |    1 -
 demos/gtk-demo/toolpalette.c                       |    5 -
 demos/gtk-demo/transparent.c                       |    1 -
 demos/gtk-demo/tree_store.c                        |    1 -
 demos/widget-factory/widget-factory.ui             |    3 -
 docs/reference/gtk/gtk3-sections.txt               |    3 -
 docs/tools/widgets.c                               |    6 -
 examples/action-namespace.c                        |    1 -
 examples/builder.ui                                |    1 -
 examples/drawing.c                                 |    2 -
 examples/grid-packing.c                            |    1 -
 examples/plugman.c                                 |    1 -
 gtk/deprecated/gtkalignment.c                      |   21 +-
 gtk/deprecated/gtktable.c                          |    1 -
 gtk/gtk-builder-tool.c                             |    2 -
 gtk/gtkappchooserdialog.c                          |   48 +----
 gtk/gtkapplicationwindow.c                         |   12 +-
 gtk/gtkbbox.c                                      |    1 -
 gtk/gtkbin.c                                       |   45 +----
 gtk/gtkbox.c                                       |    1 -
 gtk/gtkbuilder.c                                   |    2 -
 gtk/gtkbutton.c                                    |    4 -
 gtk/gtkcombobox.c                                  |    2 -
 gtk/gtkcontainer.c                                 |  248 --------------------
 gtk/gtkcontainer.h                                 |   11 +-
 gtk/gtkcontainerprivate.h                          |    3 -
 gtk/gtkcustompaperunixdialog.c                     |    9 +-
 gtk/gtkdialog.c                                    |   51 ----
 gtk/gtkentry.c                                     |    1 -
 gtk/gtkeventbox.c                                  |    3 -
 gtk/gtkfilechooserwidget.c                         |    3 -
 gtk/gtkfixed.c                                     |    1 -
 gtk/gtkflowbox.c                                   |    1 -
 gtk/gtkframe.c                                     |    2 -
 gtk/gtkgrid.c                                      |    1 -
 gtk/gtkheaderbar.c                                 |    1 -
 gtk/gtkmenu.c                                      |   77 ++----
 gtk/gtkmenubar.c                                   |    3 -
 gtk/gtkmenuitem.c                                  |    2 -
 gtk/gtkmessagedialog.c                             |   34 ---
 gtk/gtkmountoperation.c                            |    4 -
 gtk/gtknotebook.c                                  |    2 -
 gtk/gtkoffscreenwindow.c                           |   25 +--
 gtk/gtkpaned.c                                     |    1 -
 gtk/gtkpathbar.c                                   |    1 -
 gtk/gtkplacesview.c                                |    1 -
 gtk/gtkpopover.c                                   |   11 +-
 gtk/gtkrecentchooserdialog.c                       |    8 +-
 gtk/gtkscrolledwindow.c                            |    1 -
 gtk/gtkshortcutssection.c                          |    1 -
 gtk/gtkshortcutswindow.c                           |    2 -
 gtk/gtkspinbutton.c                                |    2 -
 gtk/gtkstack.c                                     |    1 -
 gtk/gtktextview.c                                  |   17 +-
 gtk/gtktoolbar.c                                   |    2 -
 gtk/gtktoolitem.c                                  |    2 -
 gtk/gtktoolitemgroup.c                             |   44 ++---
 gtk/gtktoolpalette.c                               |   29 +--
 gtk/gtktreeview.c                                  |    1 -
 gtk/gtkviewport.c                                  |    1 -
 gtk/gtkwindow.c                                    |   43 +---
 gtk/ui/gtkaboutdialog.ui                           |    3 -
 gtk/ui/gtkcolorchooserdialog.ui                    |    2 -
 gtk/ui/gtkdialog.ui                                |    1 -
 gtk/ui/gtkfilechooserdialog.ui                     |    2 -
 gtk/ui/gtkfilechooserwidget.ui                     |    3 -
 gtk/ui/gtkfontchooserdialog.ui                     |    2 -
 gtk/ui/gtkinfobar.ui                               |    3 -
 gtk/ui/gtkmessagedialog.ui                         |    1 -
 gtk/ui/gtkpagesetupunixdialog.ui                   |    2 -
 gtk/ui/gtkplacesview.ui                            |    2 -
 gtk/ui/gtkprintunixdialog.ui                       |    8 -
 gtk/ui/gtksearchbar.ui                             |    1 -
 tests/gdkgears.c                                   |    2 -
 tests/gtkoffscreenbox.c                            |   32 +--
 tests/print-editor.c                               |    1 -
 tests/simple.c                                     |    1 -
 tests/testadjustsize.c                             |   27 ---
 tests/testanimation.c                              |    6 -
 tests/testappchooser.c                             |    1 -
 tests/testappchooserbutton.c                       |    1 -
 tests/testcalendar.c                               |    1 -
 tests/testcellrenderertext.c                       |    1 -
 tests/testcombo.c                                  |   12 -
 tests/testcombochange.c                            |    1 -
 tests/testellipsise.c                              |    1 -
 tests/testemblems.c                                |    1 -
 tests/testentrycompletion.c                        |    3 -
 tests/testentryicons.c                             |    1 -
 tests/testfilechooserbutton.c                      |    1 -
 tests/testflowbox.c                                |    2 -
 tests/testfontoptions.c                            |    1 -
 tests/testframe.c                                  |    1 -
 tests/testglarea.c                                 |    1 -
 tests/testglblending.c                             |    1 -
 tests/testgtk.c                                    |  115 ---------
 tests/testheightforwidth.c                         |    5 -
 tests/testkineticscrolling.c                       |    1 -
 tests/testlockbutton.c                             |    1 -
 tests/testmenubutton.c                             |    1 -
 tests/testmerge.c                                  |    3 -
 tests/testmultidisplay.c                           |    3 +-
 tests/testnotebookdnd.c                            |    3 -
 tests/testrichtext.c                               |    1 -
 tests/testscrolledwindow.c                         |    4 +-
 tests/testselection.c                              |    2 -
 tests/testswitch.c                                 |    1 -
 tests/testtoolbar.c                                |    3 -
 tests/testtooltips.c                               |    1 -
 tests/testtreecolumns.c                            |    1 -
 tests/testtreecolumnsizing.c                       |    1 -
 tests/testtreeflow.c                               |    1 -
 tests/testtreefocus.c                              |    2 -
 tests/testtreesort.c                               |    3 -
 tests/testwindowsize.c                             |    1 -
 tests/treestoretest.c                              |    1 -
 testsuite/gtk/builder.c                            |    5 -
 testsuite/reftests/background-area.ref.ui          |    1 -
 testsuite/reftests/background-area.ui              |    1 -
 .../reftests/background-image-multiple.ref.ui      |    1 -
 testsuite/reftests/background-image-multiple.ui    |    1 -
 testsuite/reftests/background-origin.ui            |    1 -
 testsuite/reftests/info-bar-message-types.ui       |   10 -
 .../reftests/messagedialog-secondarytext.ref.ui    |    1 -
 testsuite/reftests/messagedialog-secondarytext.ui  |    1 -
 testsuite/reftests/window-border-width.ref.ui      |    1 -
 testsuite/reftests/window-border-width.ui          |    1 -
 testsuite/reftests/window-height-for-width.ref.ui  |    1 -
 testsuite/reftests/window-height-for-width.ui      |    1 -
 160 files changed, 131 insertions(+), 1127 deletions(-)
---
diff --git a/demos/gtk-demo/assistant.c b/demos/gtk-demo/assistant.c
index 22b19bc..22b2cb4 100644
--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -94,7 +94,6 @@ create_page1 (GtkWidget *assistant)
   GtkWidget *box, *label, *entry;
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  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);
@@ -118,7 +117,6 @@ create_page2 (GtkWidget *assistant)
   GtkWidget *box, *checkbutton;
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-  gtk_container_set_border_width (GTK_CONTAINER (box), 12);
 
   checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
                                                  "even if you do not check this");
diff --git a/demos/gtk-demo/blendmodes.ui b/demos/gtk-demo/blendmodes.ui
index 02dc736..fb5b5b7 100644
--- a/demos/gtk-demo/blendmodes.ui
+++ b/demos/gtk-demo/blendmodes.ui
@@ -11,7 +11,6 @@
       <object class="GtkGrid">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="border_width">12</property>
         <property name="row_spacing">12</property>
         <property name="column_spacing">12</property>
         <child>
diff --git a/demos/gtk-demo/button_box.c b/demos/gtk-demo/button_box.c
index be4e033..d5182b0 100644
--- a/demos/gtk-demo/button_box.c
+++ b/demos/gtk-demo/button_box.c
@@ -23,7 +23,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);
@@ -62,8 +61,6 @@ do_button_box (GtkWidget *do_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);
 
@@ -73,7 +70,6 @@ do_button_box (GtkWidget *do_widget)
     gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE);
 
     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),
@@ -104,7 +100,6 @@ do_button_box (GtkWidget *do_widget)
     gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE);
 
     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),
diff --git a/demos/gtk-demo/changedisplay.c b/demos/gtk-demo/changedisplay.c
index c8a4487..6a066e2 100644
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -305,7 +305,6 @@ create_frame (ChangeDisplayInfo *info,
   *frame = gtk_frame_new (title);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-  gtk_container_set_border_width (GTK_CONTAINER (hbox), 8);
   gtk_container_add (GTK_CONTAINER (*frame), hbox);
 
   scrollwin = gtk_scrolled_window_new (NULL, NULL);
@@ -539,7 +538,6 @@ do_changedisplay (GtkWidget *do_widget)
       content_area = gtk_dialog_get_content_area (GTK_DIALOG (info->window));
 
       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);
 
       frame = create_display_frame (info);
diff --git a/demos/gtk-demo/clipboard.c b/demos/gtk-demo/clipboard.c
index 8e31c51..e3ca3ea 100644
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -219,7 +219,6 @@ do_clipboard (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
 
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
@@ -228,7 +227,6 @@ do_clipboard (GtkWidget *do_widget)
       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);
 
       /* Create the first entry */
@@ -245,7 +243,6 @@ do_clipboard (GtkWidget *do_widget)
       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);
 
       /* Create the second entry */
@@ -262,7 +259,6 @@ do_clipboard (GtkWidget *do_widget)
       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);
 
       /* Create the first image */
diff --git a/demos/gtk-demo/colorsel.c b/demos/gtk-demo/colorsel.c
index 4df48b6..b75bb26 100644
--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -74,10 +74,7 @@ do_colorsel (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
-      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);
 
       /*
diff --git a/demos/gtk-demo/combobox.c b/demos/gtk-demo/combobox.c
index 09d50e4..6ebac74 100644
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -318,8 +318,6 @@ do_combobox (GtkWidget *do_widget)
     g_signal_connect (window, "destroy",
                       G_CALLBACK (gtk_widget_destroyed), &window);
 
-    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
     vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
     gtk_container_add (GTK_CONTAINER (window), vbox);
 
@@ -330,7 +328,6 @@ do_combobox (GtkWidget *do_widget)
     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);
     gtk_container_add (GTK_CONTAINER (frame), box);
 
     model = create_icon_store ();
@@ -371,7 +368,6 @@ do_combobox (GtkWidget *do_widget)
     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);
     gtk_container_add (GTK_CONTAINER (frame), box);
 
     model = create_capital_store ();
@@ -399,7 +395,6 @@ do_combobox (GtkWidget *do_widget)
     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);
     gtk_container_add (GTK_CONTAINER (frame), box);
 
     combo = gtk_combo_box_text_new_with_entry ();
@@ -417,7 +412,6 @@ do_combobox (GtkWidget *do_widget)
     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);
     gtk_container_add (GTK_CONTAINER (frame), box);
 
     combo = gtk_combo_box_text_new ();
diff --git a/demos/gtk-demo/dialog.c b/demos/gtk-demo/dialog.c
index a632519..362e27e 100644
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -56,7 +56,6 @@ interactive_dialog_clicked (GtkButton *button,
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
   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);
 
   image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG);
@@ -114,13 +113,10 @@ do_dialog (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
       frame = gtk_frame_new ("Dialogs");
       gtk_container_add (GTK_CONTAINER (window), frame);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
       gtk_container_add (GTK_CONTAINER (frame), vbox);
 
       /* Standard message dialog */
diff --git a/demos/gtk-demo/drawingarea.c b/demos/gtk-demo/drawingarea.c
index 8023bb3..ac03133 100644
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -215,10 +215,7 @@ do_drawingarea (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (close_window), NULL);
 
-      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);
 
       /*
diff --git a/demos/gtk-demo/editable_cells.c b/demos/gtk-demo/editable_cells.c
index d6acc49..770091b 100644
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -349,7 +349,6 @@ do_editable_cells (GtkWidget *do_widget)
       gtk_window_set_screen (GTK_WINDOW (window),
                              gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Editable Cells");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 5);
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
diff --git a/demos/gtk-demo/entry_buffer.c b/demos/gtk-demo/entry_buffer.c
index ef3e15e..7e7094d 100644
--- a/demos/gtk-demo/entry_buffer.c
+++ b/demos/gtk-demo/entry_buffer.c
@@ -29,7 +29,6 @@ do_entry_buffer (GtkWidget *do_widget)
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       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),
diff --git a/demos/gtk-demo/entry_completion.c b/demos/gtk-demo/entry_completion.c
index 0ca4cbe..c3bee99 100644
--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -56,7 +56,6 @@ do_entry_completion (GtkWidget *do_widget)
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       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/demos/gtk-demo/glarea.c b/demos/gtk-demo/glarea.c
index 715b067..eb92928 100644
--- a/demos/gtk-demo/glarea.c
+++ b/demos/gtk-demo/glarea.c
@@ -393,7 +393,6 @@ create_glarea_window (GtkWidget *do_widget)
   gtk_window_set_screen (GTK_WINDOW (window), gtk_widget_get_screen (do_widget));
   gtk_window_set_title (GTK_WINDOW (window), "OpenGL Area");
   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 (close_window), NULL);
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, FALSE);
diff --git a/demos/gtk-demo/hypertext.c b/demos/gtk-demo/hypertext.c
index 4a221d8..0aa1b23 100644
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -268,8 +268,6 @@ do_hypertext (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
       view = gtk_text_view_new ();
       gtk_text_view_set_wrap_mode (GTK_TEXT_VIEW (view), GTK_WRAP_WORD);
       gtk_text_view_set_left_margin (GTK_TEXT_VIEW (view), 20);
diff --git a/demos/gtk-demo/images.c b/demos/gtk-demo/images.c
index a3e9c7a..eecb728 100644
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -347,10 +347,7 @@ do_images (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (cleanup_callback), NULL);
 
-      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/demos/gtk-demo/infobar.c b/demos/gtk-demo/infobar.c
index 62df74f..8dbea04 100644
--- a/demos/gtk-demo/infobar.c
+++ b/demos/gtk-demo/infobar.c
@@ -59,7 +59,6 @@ do_infobar (GtkWidget *do_widget)
       gtk_window_set_title (GTK_WINDOW (window), "Info Bars");
 
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -132,7 +131,6 @@ do_infobar (GtkWidget *do_widget)
       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);
       gtk_container_add (GTK_CONTAINER (frame), vbox2);
 
       /* Standard message dialog */
diff --git a/demos/gtk-demo/links.c b/demos/gtk-demo/links.c
index 5a39a1a..c896656 100644
--- a/demos/gtk-demo/links.c
+++ b/demos/gtk-demo/links.c
@@ -56,7 +56,6 @@ do_links (GtkWidget *do_widget)
       gtk_window_set_screen (GTK_WINDOW (window),
                              gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Links");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 12);
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
diff --git a/demos/gtk-demo/list_store.c b/demos/gtk-demo/list_store.c
index db065ed..2fa12ce 100644
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -262,7 +262,6 @@ do_list_store (GtkWidget *do_widget)
 
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_container_add (GTK_CONTAINER (window), vbox);
diff --git a/demos/gtk-demo/menus.c b/demos/gtk-demo/menus.c
index 5537751..9fdd353 100644
--- a/demos/gtk-demo/menus.c
+++ b/demos/gtk-demo/menus.c
@@ -105,8 +105,6 @@ do_menus (GtkWidget *do_widget)
       accel_group = gtk_accel_group_new ();
       gtk_window_add_accel_group (GTK_WINDOW (window), accel_group);
 
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
-
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_container_add (GTK_CONTAINER (window), box);
       gtk_widget_show (box);
@@ -138,7 +136,6 @@ do_menus (GtkWidget *do_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, FALSE, TRUE);
       gtk_widget_show (box2);
 
diff --git a/demos/gtk-demo/offscreen_window.c b/demos/gtk-demo/offscreen_window.c
index ce5a077..9480025 100644
--- a/demos/gtk-demo/offscreen_window.c
+++ b/demos/gtk-demo/offscreen_window.c
@@ -233,18 +233,16 @@ gtk_rotated_bin_realize (GtkWidget *widget)
   GdkWindow *window;
   GdkWindowAttr attributes;
   gint attributes_mask;
-  guint border_width;
   GtkRequisition child_requisition;
 
   gtk_widget_set_realized (widget, TRUE);
 
   gtk_widget_get_allocation (widget, &allocation);
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
 
-  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
@@ -383,8 +381,6 @@ gtk_rotated_bin_size_request (GtkWidget      *widget,
   GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
   GtkRequisition child_requisition;
   double s, c;
-  double w, h;
-  guint border_width;
 
   child_requisition.width = 0;
   child_requisition.height = 0;
@@ -395,12 +391,8 @@ gtk_rotated_bin_size_request (GtkWidget      *widget,
 
   s = sin (bin->angle);
   c = cos (bin->angle);
-  w = c * child_requisition.width + s * child_requisition.height;
-  h = s * child_requisition.width + c * 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 = c * child_requisition.width + s * child_requisition.height;
+  requisition->height = s * child_requisition.width + c * child_requisition.height;
 }
 
 static void
@@ -432,21 +424,18 @@ gtk_rotated_bin_size_allocate (GtkWidget     *widget,
                                GtkAllocation *allocation)
 {
   GtkRotatedBin *bin = GTK_ROTATED_BIN (widget);
-  guint border_width;
   gint w, h;
   gdouble s, c;
 
   gtk_widget_set_allocation (widget, allocation);
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-
-  w = allocation->width - border_width * 2;
-  h = allocation->height - border_width * 2;
+  w = allocation->width;
+  h = allocation->height;
 
   if (gtk_widget_get_realized (widget))
     gdk_window_move_resize (gtk_widget_get_window (widget),
-                            allocation->x + border_width,
-                            allocation->y + border_width,
+                            allocation->x,
+                            allocation->y,
                             w, h);
 
   if (bin->child && gtk_widget_get_visible (bin->child))
@@ -577,8 +566,6 @@ do_offscreen_window (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
-      gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
                                         0, G_PI/2, 0.01);
diff --git a/demos/gtk-demo/offscreen_window2.c b/demos/gtk-demo/offscreen_window2.c
index ce91040..06c4a0a 100644
--- a/demos/gtk-demo/offscreen_window2.c
+++ b/demos/gtk-demo/offscreen_window2.c
@@ -172,18 +172,16 @@ gtk_mirror_bin_realize (GtkWidget *widget)
   GdkWindow *window;
   GdkWindowAttr attributes;
   gint attributes_mask;
-  guint border_width;
   GtkRequisition child_requisition;
 
   gtk_widget_set_realized (widget, TRUE);
 
   gtk_widget_get_allocation (widget, &allocation);
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
 
-  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
@@ -309,7 +307,6 @@ gtk_mirror_bin_size_request (GtkWidget      *widget,
 {
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
   GtkRequisition child_requisition;
-  guint border_width;
 
   child_requisition.width = 0;
   child_requisition.height = 0;
@@ -318,9 +315,8 @@ gtk_mirror_bin_size_request (GtkWidget      *widget,
     gtk_widget_get_preferred_size ( (bin->child),
                                &child_requisition, NULL);
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-  requisition->width = border_width * 2 + child_requisition.width + 10;
-  requisition->height = border_width * 2 + child_requisition.height * 2 + 10;
+  requisition->width = child_requisition.width + 10;
+  requisition->height = child_requisition.height * 2 + 10;
 }
 
 static void
@@ -353,19 +349,16 @@ gtk_mirror_bin_size_allocate (GtkWidget     *widget,
 {
   GtkMirrorBin *bin = GTK_MIRROR_BIN (widget);
   gint w, h;
-  guint border_width;
 
   gtk_widget_set_allocation (widget, allocation);
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-
-  w = allocation->width - border_width * 2;
-  h = allocation->height - border_width * 2;
+  w = allocation->width;
+  h = allocation->height;
 
   if (gtk_widget_get_realized (widget))
     gdk_window_move_resize (gtk_widget_get_window (widget),
-                            allocation->x + border_width,
-                            allocation->y + border_width,
+                            allocation->x,
+                            allocation->y,
                             w, h);
 
   if (bin->child && gtk_widget_get_visible (bin->child))
@@ -382,8 +375,8 @@ gtk_mirror_bin_size_allocate (GtkWidget     *widget,
 
       if (gtk_widget_get_realized (widget))
         gdk_window_move_resize (bin->offscreen_window,
-                                allocation->x + border_width,
-                                allocation->y + border_width,
+                                allocation->x,
+                                allocation->y,
                                 child_allocation.width, child_allocation.height);
       gtk_widget_size_allocate (bin->child, &child_allocation);
     }
@@ -482,8 +475,6 @@ do_offscreen_window2 (GtkWidget *do_widget)
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
-      gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
       bin = gtk_mirror_bin_new ();
diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c
index e92a37c..3fb0ef0 100644
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -85,7 +85,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);
 
   table = gtk_grid_new ();
   gtk_container_add (GTK_CONTAINER (frame), table);
@@ -142,14 +141,12 @@ do_panes (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_window_set_title (GTK_WINDOW (window), "Paned Widgets");
-      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);
diff --git a/demos/gtk-demo/pickers.c b/demos/gtk-demo/pickers.c
index db8ee77..54daaf0 100644
--- a/demos/gtk-demo/pickers.c
+++ b/demos/gtk-demo/pickers.c
@@ -22,15 +22,11 @@ do_pickers (GtkWidget *do_widget)
     g_signal_connect (window, "destroy",
                       G_CALLBACK (gtk_widget_destroyed), &window);
 
-    gtk_container_set_border_width (GTK_CONTAINER (window), 10);
-
     table = gtk_grid_new ();
     gtk_grid_set_row_spacing (GTK_GRID (table), 3);
     gtk_grid_set_column_spacing (GTK_GRID (table), 10);
     gtk_container_add (GTK_CONTAINER (window), table);
 
-    gtk_container_set_border_width (GTK_CONTAINER (table), 10);
-
     label = gtk_label_new ("Color:");
     gtk_widget_set_halign (label, GTK_ALIGN_START);
     gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
diff --git a/demos/gtk-demo/popover.c b/demos/gtk-demo/popover.c
index 44afdf2..ec79b97 100644
--- a/demos/gtk-demo/popover.c
+++ b/demos/gtk-demo/popover.c
@@ -25,7 +25,6 @@ create_popover (GtkWidget       *parent,
   popover = gtk_popover_new (parent);
   gtk_popover_set_position (GTK_POPOVER (popover), pos);
   gtk_container_add (GTK_CONTAINER (popover), child);
-  gtk_container_set_border_width (GTK_CONTAINER (popover), 6);
   gtk_widget_show (child);
 
   return popover;
@@ -132,7 +131,6 @@ do_popover (GtkWidget *do_widget)
     {
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 24);
-      gtk_container_set_border_width (GTK_CONTAINER (box), 24);
       gtk_container_add (GTK_CONTAINER (window), box);
 
       g_signal_connect (window, "destroy",
diff --git a/demos/gtk-demo/revealer.ui b/demos/gtk-demo/revealer.ui
index 0265ab3..7322684 100644
--- a/demos/gtk-demo/revealer.ui
+++ b/demos/gtk-demo/revealer.ui
@@ -2,7 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkWindow" id="window">
-    <property name="border_width">5</property>
     <property name="default_width">300</property>
     <property name="default_height">300</property>
     <property name="title">Revealer</property>
diff --git a/demos/gtk-demo/scale.ui b/demos/gtk-demo/scale.ui
index 198fa09..521b3f2 100644
--- a/demos/gtk-demo/scale.ui
+++ b/demos/gtk-demo/scale.ui
@@ -21,7 +21,6 @@
   </object>
   <object class="GtkWindow" id="window1">
     <property name="title" translatable="yes">Scales</property>
-    <property name="border-width" translatable="yes">20</property>
     <child>
       <object class="GtkGrid" id="grid1">
         <property name="visible">1</property>
diff --git a/demos/gtk-demo/search_entry.c b/demos/gtk-demo/search_entry.c
index 37cb10a..09743e5 100644
--- a/demos/gtk-demo/search_entry.c
+++ b/demos/gtk-demo/search_entry.c
@@ -239,7 +239,6 @@ do_search_entry (GtkWidget *do_widget)
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       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), "Search entry demo");
@@ -247,7 +246,6 @@ do_search_entry (GtkWidget *do_widget)
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
       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 ();
diff --git a/demos/gtk-demo/search_entry2.c b/demos/gtk-demo/search_entry2.c
index be70e51..eabac96 100644
--- a/demos/gtk-demo/search_entry2.c
+++ b/demos/gtk-demo/search_entry2.c
@@ -87,7 +87,6 @@ do_search_entry2 (GtkWidget *do_widget)
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_container_add (GTK_CONTAINER (window), vbox);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
 
       entry = gtk_search_entry_new ();
       container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
@@ -117,7 +116,6 @@ do_search_entry2 (GtkWidget *do_widget)
       /* Result */
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
       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);
@@ -134,7 +132,6 @@ do_search_entry2 (GtkWidget *do_widget)
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
       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);
diff --git a/demos/gtk-demo/sizegroup.c b/demos/gtk-demo/sizegroup.c
index e196f25..4245558 100644
--- a/demos/gtk-demo/sizegroup.c
+++ b/demos/gtk-demo/sizegroup.c
@@ -109,7 +109,6 @@ do_sizegroup (GtkWidget *do_widget)
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       gtk_container_add (GTK_CONTAINER (window), vbox);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 
       size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
       g_object_set_data_full (G_OBJECT (window), "size-group", size_group, g_object_unref);
@@ -119,7 +118,6 @@ do_sizegroup (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
 
       table = gtk_grid_new ();
-      gtk_container_set_border_width (GTK_CONTAINER (table), 5);
       gtk_grid_set_row_spacing (GTK_GRID (table), 5);
       gtk_grid_set_column_spacing (GTK_GRID (table), 10);
       gtk_container_add (GTK_CONTAINER (frame), table);
@@ -132,7 +130,6 @@ do_sizegroup (GtkWidget *do_widget)
       gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
 
       table = gtk_grid_new ();
-      gtk_container_set_border_width (GTK_CONTAINER (table), 5);
       gtk_grid_set_row_spacing (GTK_GRID (table), 5);
       gtk_grid_set_column_spacing (GTK_GRID (table), 10);
       gtk_container_add (GTK_CONTAINER (frame), table);
diff --git a/demos/gtk-demo/spinner.c b/demos/gtk-demo/spinner.c
index 969665f..597fe7a 100644
--- a/demos/gtk-demo/spinner.c
+++ b/demos/gtk-demo/spinner.c
@@ -53,7 +53,6 @@ do_spinner (GtkWidget *do_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), 5);
 
     /* Sensitive */
     hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
diff --git a/demos/gtk-demo/textview.c b/demos/gtk-demo/textview.c
index 13ea318..474fdbf 100644
--- a/demos/gtk-demo/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -481,10 +481,8 @@ do_textview (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_window_set_title (GTK_WINDOW (window), "Multiple Views");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
       vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-      gtk_container_set_border_width (GTK_CONTAINER(vpaned), 5);
       gtk_container_add (GTK_CONTAINER (window), vpaned);
 
       /* For convenience, we just use the autocreated buffer from
diff --git a/demos/gtk-demo/theming_style_classes.c b/demos/gtk-demo/theming_style_classes.c
index 63fea3b..afb9dcd 100644
--- a/demos/gtk-demo/theming_style_classes.c
+++ b/demos/gtk-demo/theming_style_classes.c
@@ -25,7 +25,6 @@ do_theming_style_classes (GtkWidget *do_widget)
                              gtk_widget_get_screen (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Style Classes");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 12);
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
diff --git a/demos/gtk-demo/toolpalette.c b/demos/gtk-demo/toolpalette.c
index 2d61e7e..b158cf3 100644
--- a/demos/gtk-demo/toolpalette.c
+++ b/demos/gtk-demo/toolpalette.c
@@ -443,7 +443,6 @@ do_toolpalette (GtkWidget *do_widget)
 
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
-      gtk_container_set_border_width (GTK_CONTAINER (window), 8);
 
       /* Add widgets to control the ToolPalette appearance: */
       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
@@ -529,7 +528,6 @@ do_toolpalette (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (palette_scroller),
                                       GTK_POLICY_NEVER,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_container_set_border_width (GTK_CONTAINER (palette_scroller), 6);
       gtk_widget_set_hexpand (palette_scroller, TRUE);
 
       gtk_container_add (GTK_CONTAINER (palette_scroller), palette);
@@ -549,7 +547,6 @@ do_toolpalette (GtkWidget *do_widget)
       /* ===== notebook ===== */
 
       notebook = gtk_notebook_new ();
-      gtk_container_set_border_width (GTK_CONTAINER (notebook), 6);
       gtk_box_pack_end (GTK_BOX(hbox), notebook, FALSE, FALSE);
 
       /* ===== DnD for tool items ===== */
@@ -585,7 +582,6 @@ do_toolpalette (GtkWidget *do_widget)
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_ALWAYS);
       gtk_container_add (GTK_CONTAINER (contents_scroller), contents);
-      gtk_container_set_border_width (GTK_CONTAINER (contents_scroller), 6);
 
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook),
                                 contents_scroller,
@@ -615,7 +611,6 @@ do_toolpalette (GtkWidget *do_widget)
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_ALWAYS);
       gtk_container_add (GTK_CONTAINER (contents_scroller), contents);
-      gtk_container_set_border_width (GTK_CONTAINER (contents_scroller), 6);
 
       gtk_notebook_append_page (GTK_NOTEBOOK (notebook), contents_scroller,
                                 gtk_label_new ("Interactive DnD Mode"));
diff --git a/demos/gtk-demo/transparent.c b/demos/gtk-demo/transparent.c
index dbd94b7..bbbacbe 100644
--- a/demos/gtk-demo/transparent.c
+++ b/demos/gtk-demo/transparent.c
@@ -202,7 +202,6 @@ do_transparent (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       gtk_window_set_title (GTK_WINDOW (window), "Transparency");
-      gtk_container_set_border_width (GTK_CONTAINER (window), 0);
 
       view = gtk_text_view_new ();
 
diff --git a/demos/gtk-demo/tree_store.c b/demos/gtk-demo/tree_store.c
index 318b4db..32ec14c 100644
--- a/demos/gtk-demo/tree_store.c
+++ b/demos/gtk-demo/tree_store.c
@@ -398,7 +398,6 @@ do_tree_store (GtkWidget *do_widget)
                         G_CALLBACK (gtk_widget_destroyed), &window);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-      gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       gtk_box_pack_start (GTK_BOX (vbox),
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index c7d80a6..caae6d9 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -441,7 +441,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
               <object class="GtkBox" id="page1">
                 <property name="visible">1</property>
                 <property name="orientation">vertical</property>
-                <property name="border-width">10</property>
                 <property name="spacing">10</property>
                 <child>
                   <object class="GtkBox" id="box2">
@@ -1830,7 +1829,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                   <object class="GtkBox">
                     <property name="visible">1</property>
                     <property name="spacing">10</property>
-                    <property name="border-width">16</property>
                     <child>
                       <object class="GtkBox">
                         <property name="visible">1</property>
@@ -2873,7 +2871,6 @@ microphone-sensitivity-medium-symbolic</property>
             <child>
               <object class="GtkBox">
                 <property name="visible">1</property>
-                <property name="border-width">16</property>
                 <property name="spacing">10</property>
                 <child>
                   <object class="GtkBox">
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 9ae88f9..287de54 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -999,8 +999,6 @@ gtk_container_child_set_valist
 gtk_container_child_notify
 gtk_container_child_notify_by_pspec
 gtk_container_forall
-gtk_container_get_border_width
-gtk_container_set_border_width
 gtk_container_propagate_draw
 gtk_container_get_focus_chain
 gtk_container_set_focus_chain
@@ -1009,7 +1007,6 @@ gtk_container_class_find_child_property
 gtk_container_class_install_child_property
 gtk_container_class_install_child_properties
 gtk_container_class_list_child_properties
-gtk_container_class_handle_border_width
 
 <SUBSECTION Standard>
 GTK_CONTAINER
diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 5315f5a..6f3303a 100644
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -36,7 +36,6 @@ new_widget_info (const char *name,
   else
     {
       info->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-      gtk_container_set_border_width (GTK_CONTAINER (info->window), 12);
       info->include_decorations = FALSE;
       gtk_widget_show_all (widget);
       gtk_container_add (GTK_CONTAINER (info->window), widget);
@@ -391,7 +390,6 @@ create_info_bar (void)
   gtk_container_add (GTK_CONTAINER (align), widget);
 
   info = new_widget_info ("info-bar", align, SMALL);
-  gtk_container_set_border_width (GTK_CONTAINER (info->window), 0);
 
   return info;
 }
@@ -423,7 +421,6 @@ create_search_bar (void)
   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);
 
   return info;
 }
@@ -457,7 +454,6 @@ create_action_bar (void)
   gtk_container_add (GTK_CONTAINER (box), widget);
 
   info = new_widget_info ("action-bar", box, SMALL);
-  gtk_container_set_border_width (GTK_CONTAINER (info->window), 0);
 
   return info;
 }
@@ -1086,7 +1082,6 @@ create_statusbar (void)
   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);
 
   return info;
 }
@@ -1280,7 +1275,6 @@ create_headerbar (void)
   GtkWidget *button;
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-  gtk_container_set_border_width (GTK_CONTAINER (window), 0);
   view = gtk_text_view_new ();
   gtk_widget_show (view);
   gtk_widget_set_size_request (window, 220, 150);
diff --git a/examples/action-namespace.c b/examples/action-namespace.c
index 7335ad9..6a4c84e 100644
--- a/examples/action-namespace.c
+++ b/examples/action-namespace.c
@@ -114,7 +114,6 @@ activate (GApplication *app,
   gtk_widget_set_halign (GTK_WIDGET (button), GTK_ALIGN_CENTER);
   gtk_widget_set_valign (GTK_WIDGET (button), GTK_ALIGN_START);
   gtk_container_add (GTK_CONTAINER (win), button);
-  gtk_container_set_border_width (GTK_CONTAINER (win), 12);
   gtk_widget_show_all (win);
 
   g_object_unref (button_menu);
diff --git a/examples/builder.ui b/examples/builder.ui
index 6321c93..b9b5c2d 100644
--- a/examples/builder.ui
+++ b/examples/builder.ui
@@ -2,7 +2,6 @@
   <object id="window" class="GtkWindow">
     <property name="visible">True</property>
     <property name="title">Grid</property>
-    <property name="border-width">10</property>
     <child>
       <object id="grid" class="GtkGrid">
         <property name="visible">True</property>
diff --git a/examples/drawing.c b/examples/drawing.c
index a496bca..2d4b9b4 100644
--- a/examples/drawing.c
+++ b/examples/drawing.c
@@ -142,8 +142,6 @@ activate (GtkApplication *app,
 
   g_signal_connect (window, "destroy", G_CALLBACK (close_window), NULL);
 
-  gtk_container_set_border_width (GTK_CONTAINER (window), 8);
-
   frame = gtk_frame_new (NULL);
   gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
   gtk_container_add (GTK_CONTAINER (window), frame);
diff --git a/examples/grid-packing.c b/examples/grid-packing.c
index 2d9db4f..06cf955 100644
--- a/examples/grid-packing.c
+++ b/examples/grid-packing.c
@@ -18,7 +18,6 @@ activate (GtkApplication *app,
   /* create a new window, and set its title */
   window = gtk_application_window_new (app);
   gtk_window_set_title (GTK_WINDOW (window), "Window");
-  gtk_container_set_border_width (GTK_CONTAINER (window), 10);
 
   /* Here we construct the container that is going pack our buttons */
   grid = gtk_grid_new ();
diff --git a/examples/plugman.c b/examples/plugman.c
index 04f0029..82006d6 100644
--- a/examples/plugman.c
+++ b/examples/plugman.c
@@ -338,7 +338,6 @@ configure_plugins (GSimpleAction *action,
   gtk_builder_add_from_string (builder,
                                "<interface>"
                                "  <object class='GtkDialog' id='plugin-dialog'>"
-                               "    <property name='border-width'>12</property>"
                                "    <property name='title'>Plugins</property>"
                                "    <child internal-child='vbox'>"
                                "      <object class='GtkBox' id='content-area'>"
diff --git a/gtk/deprecated/gtkalignment.c b/gtk/deprecated/gtkalignment.c
index eaf7f2b..8c5913e 100644
--- a/gtk/deprecated/gtkalignment.c
+++ b/gtk/deprecated/gtkalignment.c
@@ -556,7 +556,6 @@ gtk_alignment_size_allocate (GtkWidget     *widget,
   GtkAllocation child_allocation;
   GtkWidget *child;
   gint width, height;
-  gint border_width;
   gint baseline;
 
   gtk_widget_set_allocation (widget, allocation);
@@ -571,17 +570,15 @@ gtk_alignment_size_allocate (GtkWidget     *widget,
       gint child_width, child_height;
       double yalign, yscale;
 
-      border_width = gtk_container_get_border_width (GTK_CONTAINER (alignment));
-
       padding_horizontal = priv->padding_left + priv->padding_right;
       padding_vertical = priv->padding_top + priv->padding_bottom;
 
-      width  = MAX (1, allocation->width - padding_horizontal - 2 * border_width);
-      height = MAX (1, allocation->height - padding_vertical - 2 * border_width);
+      width  = MAX (1, allocation->width - padding_horizontal);
+      height = MAX (1, allocation->height - padding_vertical);
 
       baseline = gtk_widget_get_allocated_baseline (widget);
       if (baseline != -1)
-       baseline -= border_width + priv->padding_top;
+       baseline -= priv->padding_top;
 
       /* If we get a baseline set that means we're baseline aligned, and the parent
         honored that. In that case we have to ignore yalign/yscale as we need
@@ -634,11 +631,11 @@ gtk_alignment_size_allocate (GtkWidget     *widget,
        child_allocation.height = height;
 
       if (gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL)
-       child_allocation.x = (1.0 - priv->xalign) * (width - child_allocation.width) + allocation->x + 
border_width + priv->padding_right;
+       child_allocation.x = (1.0 - priv->xalign) * (width - child_allocation.width) + allocation->x + 
priv->padding_right;
       else 
-       child_allocation.x = priv->xalign * (width - child_allocation.width) + allocation->x + border_width + 
priv->padding_left;
+       child_allocation.x = priv->xalign * (width - child_allocation.width) + allocation->x + 
priv->padding_left;
 
-      child_allocation.y = yalign * (height - child_allocation.height) + allocation->y + border_width + 
priv->padding_top;
+      child_allocation.y = yalign * (height - child_allocation.height) + allocation->y + priv->padding_top;
 
       gtk_widget_size_allocate_with_baseline (child, &child_allocation, baseline);
     }
@@ -659,16 +656,14 @@ gtk_alignment_get_preferred_size (GtkWidget      *widget,
   GtkWidget *child;
   guint minimum, natural;
   guint top_offset;
-  guint border;
 
   if (minimum_baseline)
     *minimum_baseline = -1;
   if (natural_baseline)
     *natural_baseline = -1;
 
-  border = gtk_container_get_border_width (GTK_CONTAINER (widget));
-  natural = minimum = border * 2;
-  top_offset = border;
+  natural = minimum = 0;
+  top_offset = 0;
 
   if ((child = gtk_bin_get_child (GTK_BIN (widget))) && gtk_widget_get_visible (child))
     {
diff --git a/gtk/deprecated/gtktable.c b/gtk/deprecated/gtktable.c
index b51f869..a10e893 100644
--- a/gtk/deprecated/gtktable.c
+++ b/gtk/deprecated/gtktable.c
@@ -177,7 +177,6 @@ gtk_table_class_init (GtkTableClass *class)
   container_class->child_type = gtk_table_child_type;
   container_class->set_child_property = gtk_table_set_child_property;
   container_class->get_child_property = gtk_table_get_child_property;
-  gtk_container_class_handle_border_width (container_class);
 
   g_object_class_install_property (gobject_class,
                                    PROP_N_ROWS,
diff --git a/gtk/gtk-builder-tool.c b/gtk/gtk-builder-tool.c
index cb5e864..28e4454 100644
--- a/gtk/gtk-builder-tool.c
+++ b/gtk/gtk-builder-tool.c
@@ -186,14 +186,12 @@ needs_explicit_setting (MyParserData *data,
     { "GtkCalendar", "year", 0 },
     { "GtkCalendar", "month", 0 },
     { "GtkCalendar", "day", 0 },
-    { "GtkDialog", "border-width", 0 },
     { "GtkPlacesSidebar", "show-desktop", 0 },
     { "GtkRadioButton", "draw-indicator", 0 },
     { "GtkGrid", "left-attach", 1 },
     { "GtkGrid", "top-attach", 1 },
     { "GtkWidget", "hexpand", 0 },
     { "GtkWidget", "vexpand", 0 },
-    { "GtkContainer", "border-width", 0 },
     { "GtkVBox", "expand", 1 },
     { NULL, NULL, 0 }
   };
diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c
index 1694547..556525d 100644
--- a/gtk/gtkappchooserdialog.c
+++ b/gtk/gtkappchooserdialog.c
@@ -522,45 +522,6 @@ gtk_app_chooser_dialog_constructed (GObject *object)
   setup_search (self);
 }
 
-/* This is necessary do deal with the fact that GtkDialog
- * exposes bits of its internal spacing as style properties,
- * and puts the action area inside the content area.
- * To achieve a flush-top search bar, we need the content
- * area border to be 0, and distribute the spacing to other
- * containers to compensate.
- */
-static void
-update_spacings (GtkAppChooserDialog *self)
-{
-  GtkWidget *widget;
-  gint content_area_border;
-  gint action_area_border;
-
-  gtk_widget_style_get (GTK_WIDGET (self),
-                        "content-area-border", &content_area_border,
-                        "action-area-border", &action_area_border,
-                        NULL);
-
-  widget = gtk_dialog_get_content_area (GTK_DIALOG (self));
-  gtk_container_set_border_width (GTK_CONTAINER (widget), 0);
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  widget = gtk_dialog_get_action_area (GTK_DIALOG (self));
-G_GNUC_END_IGNORE_DEPRECATIONS
-  gtk_container_set_border_width (GTK_CONTAINER (widget), 5 + content_area_border + action_area_border);
-
-  widget = self->priv->inner_box;
-  gtk_container_set_border_width (GTK_CONTAINER (widget), 10 + content_area_border);
-}
-
-static void
-gtk_app_chooser_dialog_style_updated (GtkWidget *widget)
-{
-  GTK_WIDGET_CLASS (gtk_app_chooser_dialog_parent_class)->style_updated (widget);
-
-  update_spacings (GTK_APP_CHOOSER_DIALOG (widget));
-}
-
 static void
 gtk_app_chooser_dialog_dispose (GObject *object)
 {
@@ -646,20 +607,19 @@ gtk_app_chooser_dialog_iface_init (GtkAppChooserIface *iface)
 static void
 gtk_app_chooser_dialog_class_init (GtkAppChooserDialogClass *klass)
 {
-  GtkWidgetClass *widget_class;
   GObjectClass *gobject_class;
+  GtkWidgetClass *widget_class;
   GParamSpec *pspec;
 
   gobject_class = G_OBJECT_CLASS (klass);
+  widget_class = GTK_WIDGET_CLASS (klass);
+
   gobject_class->dispose = gtk_app_chooser_dialog_dispose;
   gobject_class->finalize = gtk_app_chooser_dialog_finalize;
   gobject_class->set_property = gtk_app_chooser_dialog_set_property;
   gobject_class->get_property = gtk_app_chooser_dialog_get_property;
   gobject_class->constructed = gtk_app_chooser_dialog_constructed;
 
-  widget_class = GTK_WIDGET_CLASS (klass);
-  widget_class->style_updated = gtk_app_chooser_dialog_style_updated;
-
   g_object_class_override_property (gobject_class, PROP_CONTENT_TYPE, "content-type");
 
   /**
@@ -718,8 +678,6 @@ gtk_app_chooser_dialog_init (GtkAppChooserDialog *self)
    */
   g_signal_connect (self, "response",
                     G_CALLBACK (gtk_app_chooser_dialog_response), NULL);
-
-  update_spacings (self);
 }
 
 static void
diff --git a/gtk/gtkapplicationwindow.c b/gtk/gtkapplicationwindow.c
index 62d133a..7df701c 100644
--- a/gtk/gtkapplicationwindow.c
+++ b/gtk/gtkapplicationwindow.c
@@ -576,16 +576,14 @@ gtk_application_window_real_get_preferred_width (GtkWidget *widget,
   if (window->priv->menubar != NULL)
     {
       gint menubar_min_width, menubar_nat_width;
-      gint border_width;
       GtkBorder border = { 0 };
 
       gtk_widget_get_preferred_width (window->priv->menubar, &menubar_min_width, &menubar_nat_width);
 
-      border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
       _gtk_window_get_shadow_width (GTK_WINDOW (widget), &border);
 
-      menubar_min_width += 2 * border_width + border.left + border.right;
-      menubar_nat_width += 2 * border_width + border.left + border.right;
+      menubar_min_width += border.left + border.right;
+      menubar_nat_width += border.left + border.right;
 
       *minimum_width = MAX (*minimum_width, menubar_min_width);
       *natural_width = MAX (*natural_width, menubar_nat_width);
@@ -612,16 +610,14 @@ gtk_application_window_real_get_preferred_width_for_height (GtkWidget *widget,
   if (window->priv->menubar != NULL)
     {
       gint menubar_min_width, menubar_nat_width;
-      gint border_width;
       GtkBorder border = { 0 };
 
       gtk_widget_get_preferred_width_for_height (window->priv->menubar, menubar_height, &menubar_min_width, 
&menubar_nat_width);
 
-      border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
       _gtk_window_get_shadow_width (GTK_WINDOW (widget), &border);
 
-      menubar_min_width += 2 * border_width + border.left + border.right;
-      menubar_nat_width += 2 * border_width + border.left + border.right;
+      menubar_min_width += border.left + border.right;
+      menubar_nat_width += border.left + border.right;
 
       *minimum_width = MAX (*minimum_width, menubar_min_width);
       *natural_width = MAX (*natural_width, menubar_nat_width);
diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c
index 979f2a8..9ea859f 100644
--- a/gtk/gtkbbox.c
+++ b/gtk/gtkbbox.c
@@ -203,7 +203,6 @@ gtk_button_box_class_init (GtkButtonBoxClass *class)
   container_class->add = gtk_button_box_add;
   container_class->set_child_property = gtk_button_box_set_child_property;
   container_class->get_child_property = gtk_button_box_get_child_property;
-  gtk_container_class_handle_border_width (container_class);
 
   /**
    * GtkButtonBox:child-min-width:
diff --git a/gtk/gtkbin.c b/gtk/gtkbin.c
index 1295a37..2fba246 100644
--- a/gtk/gtkbin.c
+++ b/gtk/gtkbin.c
@@ -171,15 +171,6 @@ gtk_bin_forall (GtkContainer *container,
     (* callback) (priv->child, callback_data);
 }
 
-static int
-gtk_bin_get_effective_border_width (GtkBin *bin)
-{
-  if (GTK_CONTAINER_CLASS (GTK_BIN_GET_CLASS (bin))->_handle_border_width)
-    return 0;
-
-  return gtk_container_get_border_width (GTK_CONTAINER (bin));
-}
-
 static void
 gtk_bin_get_preferred_width (GtkWidget *widget,
                              gint      *minimum_width,
@@ -187,7 +178,6 @@ gtk_bin_get_preferred_width (GtkWidget *widget,
 {
   GtkBin *bin = GTK_BIN (widget);
   GtkBinPrivate *priv = bin->priv;
-  gint border_width;
 
   *minimum_width = 0;
   *natural_width = 0;
@@ -200,10 +190,6 @@ gtk_bin_get_preferred_width (GtkWidget *widget,
       *minimum_width = child_min;
       *natural_width = child_nat;
     }
-
-  border_width = gtk_bin_get_effective_border_width (bin);
-  *minimum_width += 2 * border_width;
-  *natural_width += 2 * border_width;
 }
 
 static void
@@ -213,7 +199,6 @@ gtk_bin_get_preferred_height (GtkWidget *widget,
 {
   GtkBin *bin = GTK_BIN (widget);
   GtkBinPrivate *priv = bin->priv;
-  gint border_width;
 
   *minimum_height = 0;
   *natural_height = 0;
@@ -226,10 +211,6 @@ gtk_bin_get_preferred_height (GtkWidget *widget,
       *minimum_height = child_min;
       *natural_height = child_nat;
     }
-
-  border_width = gtk_bin_get_effective_border_width (bin);
-  *minimum_height += 2 * border_width;
-  *natural_height += 2 * border_width;
 }
 
 static void 
@@ -240,25 +221,19 @@ gtk_bin_get_preferred_width_for_height (GtkWidget *widget,
 {
   GtkBin *bin = GTK_BIN (widget);
   GtkBinPrivate *priv = bin->priv;
-  gint border_width;
 
   *minimum_width = 0;
   *natural_width = 0;
 
-  border_width = gtk_bin_get_effective_border_width (bin);
-
   if (priv->child && gtk_widget_get_visible (priv->child))
     {
       gint child_min, child_nat;
-      gtk_widget_get_preferred_width_for_height (priv->child, height - 2 * border_width,
+      gtk_widget_get_preferred_width_for_height (priv->child, height,
                                                  &child_min, &child_nat);
 
       *minimum_width = child_min;
       *natural_width = child_nat;
     }
-
-  *minimum_width += 2 * border_width;
-  *natural_width += 2 * border_width;
 }
 
 static void
@@ -269,25 +244,19 @@ gtk_bin_get_preferred_height_for_width  (GtkWidget *widget,
 {
   GtkBin *bin = GTK_BIN (widget);
   GtkBinPrivate *priv = bin->priv;
-  gint border_width;
 
   *minimum_height = 0;
   *natural_height = 0;
 
-  border_width = gtk_bin_get_effective_border_width (bin);
-
   if (priv->child && gtk_widget_get_visible (priv->child))
     {
       gint child_min, child_nat;
-      gtk_widget_get_preferred_height_for_width (priv->child, width - 2 * border_width,
+      gtk_widget_get_preferred_height_for_width (priv->child, width,
                                                  &child_min, &child_nat);
 
       *minimum_height = child_min;
       *natural_height = child_nat;
     }
-
-  *minimum_height += 2 * border_width;
-  *natural_height += 2 * border_width;
 }
 
 static void
@@ -301,15 +270,7 @@ gtk_bin_size_allocate (GtkWidget     *widget,
 
   if (priv->child && gtk_widget_get_visible (priv->child))
     {
-      GtkAllocation child_allocation;
-      gint border_width = gtk_bin_get_effective_border_width (bin);
-
-      child_allocation.x = allocation->x + border_width;
-      child_allocation.y = allocation->y + border_width;
-      child_allocation.width = allocation->width - 2 * border_width;
-      child_allocation.height = allocation->height - 2 * border_width;
-
-      gtk_widget_size_allocate (priv->child, &child_allocation);
+      gtk_widget_size_allocate (priv->child, allocation);
     }
 }
 
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index f0e0f7b..ddb680b 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -265,7 +265,6 @@ gtk_box_class_init (GtkBoxClass *class)
   container_class->set_child_property = gtk_box_set_child_property;
   container_class->get_child_property = gtk_box_get_child_property;
   container_class->get_path_for_child = gtk_box_get_path_for_child;
-  gtk_container_class_handle_border_width (container_class);
 
   g_object_class_override_property (object_class,
                                     PROP_ORIENTATION,
diff --git a/gtk/gtkbuilder.c b/gtk/gtkbuilder.c
index 0e4eaca..547461e 100644
--- a/gtk/gtkbuilder.c
+++ b/gtk/gtkbuilder.c
@@ -174,10 +174,8 @@
  *   <object class="GtkDialog" id="dialog1">
  *     <child internal-child="vbox">
  *       <object class="GtkBox" id="vbox1">
- *         <property name="border-width">10</property>
  *         <child internal-child="action_area">
  *           <object class="GtkButtonBox" id="hbuttonbox1">
- *             <property name="border-width">20</property>
  *             <child>
  *               <object class="GtkButton" id="ok_button">
  *                 <property name="label">gtk-ok</property>
diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index 4b17c33..dbe7d82 100644
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -219,11 +219,9 @@ gtk_button_class_init (GtkButtonClass *klass)
 {
   GObjectClass *gobject_class;
   GtkWidgetClass *widget_class;
-  GtkContainerClass *container_class;
 
   gobject_class = G_OBJECT_CLASS (klass);
   widget_class = (GtkWidgetClass*) klass;
-  container_class = (GtkContainerClass*) klass;
   
   gobject_class->constructed  = gtk_button_constructed;
   gobject_class->dispose      = gtk_button_dispose;
@@ -250,8 +248,6 @@ gtk_button_class_init (GtkButtonClass *klass)
   widget_class->state_changed = gtk_button_state_changed;
   widget_class->grab_notify = gtk_button_grab_notify;
 
-  gtk_container_class_handle_border_width (container_class);
-
   klass->clicked = NULL;
   klass->activate = gtk_real_button_activate;
 
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index a3044a0..603bf4a 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -668,8 +668,6 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
   container_class->add = gtk_combo_box_add;
   container_class->remove = gtk_combo_box_remove;
 
-  gtk_container_class_handle_border_width (container_class);
-
   widget_class = (GtkWidgetClass *)klass;
   widget_class->size_allocate = gtk_combo_box_size_allocate;
   widget_class->draw = gtk_combo_box_draw;
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index d90370b..fcd086d 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -280,9 +280,6 @@ struct _GtkContainerPrivate
   GdkFrameClock *resize_clock;
   guint resize_handler;
 
-  guint border_width : 16;
-  guint border_width_set   : 1;
-
   guint has_focus_chain    : 1;
   guint reallocate_redraws : 1;
   guint restyle_pending    : 1;
@@ -301,7 +298,6 @@ enum {
 
 enum {
   PROP_0,
-  PROP_BORDER_WIDTH,
   PROP_RESIZE_MODE,
   PROP_CHILD,
   LAST_PROP
@@ -350,21 +346,6 @@ static gint     gtk_container_draw                 (GtkWidget         *widget,
                                                     cairo_t           *cr);
 static void     gtk_container_map                  (GtkWidget         *widget);
 static void     gtk_container_unmap                (GtkWidget         *widget);
-static void     gtk_container_adjust_size_request  (GtkWidget         *widget,
-                                                    GtkOrientation     orientation,
-                                                    gint              *minimum_size,
-                                                    gint              *natural_size);
-static void     gtk_container_adjust_baseline_request (GtkWidget      *widget,
-                                                      gint           *minimum_baseline,
-                                                      gint           *natural_baseline);
-static void     gtk_container_adjust_size_allocation (GtkWidget       *widget,
-                                                      GtkOrientation   orientation,
-                                                      gint            *minimum_size,
-                                                      gint            *natural_size,
-                                                      gint            *allocated_pos,
-                                                      gint            *allocated_size);
-static void     gtk_container_adjust_baseline_allocation (GtkWidget      *widget,
-                                                         gint           *baseline);
 static GtkSizeRequestMode gtk_container_get_request_mode (GtkWidget   *widget);
 
 static gchar* gtk_container_child_default_composite_name (GtkContainer *container,
@@ -510,11 +491,6 @@ gtk_container_class_init (GtkContainerClass *class)
   widget_class->map = gtk_container_map;
   widget_class->unmap = gtk_container_unmap;
   widget_class->focus = gtk_container_focus;
-
-  widget_class->adjust_size_request = gtk_container_adjust_size_request;
-  widget_class->adjust_baseline_request = gtk_container_adjust_baseline_request;
-  widget_class->adjust_size_allocation = gtk_container_adjust_size_allocation;
-  widget_class->adjust_baseline_allocation = gtk_container_adjust_baseline_allocation;
   widget_class->get_request_mode = gtk_container_get_request_mode;
 
   class->add = gtk_container_add_unimplemented;
@@ -534,14 +510,6 @@ gtk_container_class_init (GtkContainerClass *class)
                          GTK_RESIZE_PARENT,
                          GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY|G_PARAM_DEPRECATED);
 
-  container_props[PROP_BORDER_WIDTH] =
-      g_param_spec_uint ("border-width",
-                         P_("Border width"),
-                         P_("The width of the empty border outside the containers children"),
-                         0, 65535,
-                         0,
-                         GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY);
-
   container_props[PROP_CHILD] =
       g_param_spec_object ("child",
                            P_("Child"),
@@ -1674,10 +1642,8 @@ gtk_container_init (GtkContainer *container)
   priv = container->priv;
 
   priv->focus_child = NULL;
-  priv->border_width = 0;
   priv->resize_mode = GTK_RESIZE_PARENT;
   priv->reallocate_redraws = FALSE;
-  priv->border_width_set = FALSE;
 }
 
 static void
@@ -1712,9 +1678,6 @@ gtk_container_set_property (GObject         *object,
 
   switch (prop_id)
     {
-    case PROP_BORDER_WIDTH:
-      gtk_container_set_border_width (container, g_value_get_uint (value));
-      break;
     case PROP_RESIZE_MODE:
       G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
       gtk_container_set_resize_mode (container, g_value_get_enum (value));
@@ -1740,9 +1703,6 @@ gtk_container_get_property (GObject         *object,
 
   switch (prop_id)
     {
-    case PROP_BORDER_WIDTH:
-      g_value_set_uint (value, priv->border_width);
-      break;
     case PROP_RESIZE_MODE:
       g_value_set_enum (value, priv->resize_mode);
       break;
@@ -1752,86 +1712,6 @@ gtk_container_get_property (GObject         *object,
     }
 }
 
-gboolean
-_gtk_container_get_border_width_set (GtkContainer *container)
-{
-  GtkContainerPrivate *priv;
-
-  g_return_val_if_fail (GTK_IS_CONTAINER (container), FALSE);
-
-  priv = container->priv;
-
-  return priv->border_width_set;
-}
-
-void
-_gtk_container_set_border_width_set (GtkContainer *container,
-                                     gboolean      border_width_set)
-{
-  GtkContainerPrivate *priv;
-
-  g_return_if_fail (GTK_IS_CONTAINER (container));
-
-  priv = container->priv;
-
-  priv->border_width_set = border_width_set ? TRUE : FALSE;
-}
-
-/**
- * gtk_container_set_border_width:
- * @container: a #GtkContainer
- * @border_width: amount of blank space to leave outside
- *   the container. Valid values are in the range 0-65535 pixels.
- *
- * Sets the border width of the container.
- *
- * The border width of a container is the amount of space to leave
- * around the outside of the container. The only exception to this is
- * #GtkWindow; because toplevel windows can’t leave space outside,
- * they leave the space inside. The border is added on all sides of
- * the container. To add space to only one side, use a specific
- * #GtkWidget:margin property on the child widget, for example
- * #GtkWidget:margin-top.
- **/
-void
-gtk_container_set_border_width (GtkContainer *container,
-                                guint         border_width)
-{
-  GtkContainerPrivate *priv;
-
-  g_return_if_fail (GTK_IS_CONTAINER (container));
-
-  priv = container->priv;
-
-  if (priv->border_width != border_width)
-    {
-      priv->border_width = border_width;
-      _gtk_container_set_border_width_set (container, TRUE);
-
-      g_object_notify_by_pspec (G_OBJECT (container), container_props[PROP_BORDER_WIDTH]);
-
-      if (_gtk_widget_get_realized (GTK_WIDGET (container)))
-        gtk_widget_queue_resize (GTK_WIDGET (container));
-    }
-}
-
-/**
- * gtk_container_get_border_width:
- * @container: a #GtkContainer
- *
- * Retrieves the border width of the container. See
- * gtk_container_set_border_width().
- *
- * Returns: the current border width
- **/
-guint
-gtk_container_get_border_width (GtkContainer *container)
-{
-  g_return_val_if_fail (GTK_IS_CONTAINER (container), 0);
-
-  return container->priv->border_width;
-}
-
 /**
  * gtk_container_add:
  * @container: a #GtkContainer
@@ -2240,111 +2120,6 @@ gtk_container_resize_children (GtkContainer *container)
   gtk_widget_size_allocate_with_baseline (widget, &allocation, baseline);
 }
 
-static void
-gtk_container_adjust_size_request (GtkWidget         *widget,
-                                   GtkOrientation     orientation,
-                                   gint              *minimum_size,
-                                   gint              *natural_size)
-{
-  GtkContainer *container;
-
-  container = GTK_CONTAINER (widget);
-
-  if (GTK_CONTAINER_GET_CLASS (widget)->_handle_border_width)
-    {
-      int border_width;
-
-      border_width = container->priv->border_width;
-
-      *minimum_size += border_width * 2;
-      *natural_size += border_width * 2;
-    }
-
-  /* chain up last so gtk_widget_set_size_request() values
-   * will have a chance to overwrite our border width.
-   */
-  parent_class->adjust_size_request (widget, orientation,
-                                     minimum_size, natural_size);
-}
-
-static void
-gtk_container_adjust_baseline_request (GtkWidget         *widget,
-                                      gint              *minimum_baseline,
-                                      gint              *natural_baseline)
-{
-  GtkContainer *container;
-
-  container = GTK_CONTAINER (widget);
-
-  if (GTK_CONTAINER_GET_CLASS (widget)->_handle_border_width)
-    {
-      int border_width;
-
-      border_width = container->priv->border_width;
-
-      *minimum_baseline += border_width;
-      *natural_baseline += border_width;
-    }
-
-  parent_class->adjust_baseline_request (widget, minimum_baseline, natural_baseline);
-}
-
-static void
-gtk_container_adjust_size_allocation (GtkWidget         *widget,
-                                      GtkOrientation     orientation,
-                                      gint              *minimum_size,
-                                      gint              *natural_size,
-                                      gint              *allocated_pos,
-                                      gint              *allocated_size)
-{
-  GtkContainer *container;
-  int border_width;
-
-  container = GTK_CONTAINER (widget);
-
-  if (GTK_CONTAINER_GET_CLASS (widget)->_handle_border_width)
-    {
-      border_width = container->priv->border_width;
-
-      *allocated_size -= border_width * 2;
-      *allocated_pos += border_width;
-      *minimum_size -= border_width * 2;
-      *natural_size -= border_width * 2;
-    }
-
-  /* Chain up to GtkWidgetClass *after* removing our border width from
-   * the proposed allocation size. This is because it's possible that the
-   * widget was allocated more space than it needs in a said orientation,
-   * if GtkWidgetClass does any alignments and thus limits the size to the
-   * natural size... then we need that to be done *after* removing any margins
-   * and padding values.
-   */
-  parent_class->adjust_size_allocation (widget, orientation,
-                                        minimum_size, natural_size, allocated_pos,
-                                        allocated_size);
-}
-
-static void
-gtk_container_adjust_baseline_allocation (GtkWidget         *widget,
-                                         gint              *baseline)
-{
-  GtkContainer *container;
-  int border_width;
-
-  container = GTK_CONTAINER (widget);
-
-  if (GTK_CONTAINER_GET_CLASS (widget)->_handle_border_width)
-    {
-      border_width = container->priv->border_width;
-
-      if (*baseline >= 0)
-       *baseline -= border_width;
-    }
-
-  parent_class->adjust_baseline_allocation (widget, baseline);
-}
-
-
 typedef struct {
   gint hfw;
   gint wfh;
@@ -2387,29 +2162,6 @@ gtk_container_get_request_mode (GtkWidget *widget)
 }
 
 /**
- * gtk_container_class_handle_border_width:
- * @klass: the class struct of a #GtkContainer subclass
- *
- * Modifies a subclass of #GtkContainerClass to automatically add and
- * remove the border-width setting on GtkContainer.  This allows the
- * subclass to ignore the border width in its size request and
- * allocate methods. The intent is for a subclass to invoke this
- * in its class_init function.
- *
- * gtk_container_class_handle_border_width() is necessary because it
- * would break API too badly to make this behavior the default. So
- * subclasses must “opt in” to the parent class handling border_width
- * for them.
- */
-void
-gtk_container_class_handle_border_width (GtkContainerClass *klass)
-{
-  g_return_if_fail (GTK_IS_CONTAINER_CLASS (klass));
-
-  klass->_handle_border_width = TRUE;
-}
-
-/**
  * gtk_container_forall: (virtual forall)
  * @container: a #GtkContainer
  * @callback: (scope call) (closure callback_data): a callback
diff --git a/gtk/gtkcontainer.h b/gtk/gtkcontainer.h
index ea87bd9..63420cd 100644
--- a/gtk/gtkcontainer.h
+++ b/gtk/gtkcontainer.h
@@ -107,8 +107,6 @@ struct _GtkContainerClass
 
   /*< private >*/
 
-  unsigned int _handle_border_width : 1;
-
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);
   void (*_gtk_reserved2) (void);
@@ -139,11 +137,7 @@ typedef enum
 
 GDK_AVAILABLE_IN_ALL
 GType   gtk_container_get_type          (void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_ALL
-void    gtk_container_set_border_width  (GtkContainer     *container,
-                                         guint             border_width);
-GDK_AVAILABLE_IN_ALL
-guint   gtk_container_get_border_width   (GtkContainer     *container);
+
 GDK_AVAILABLE_IN_ALL
 void    gtk_container_add               (GtkContainer     *container,
                                          GtkWidget        *widget);
@@ -293,9 +287,6 @@ void    gtk_container_forall                     (GtkContainer *container,
                                              gpointer      callback_data);
 
 GDK_AVAILABLE_IN_ALL
-void    gtk_container_class_handle_border_width (GtkContainerClass *klass);
-
-GDK_AVAILABLE_IN_ALL
 GtkWidgetPath * gtk_container_get_path_for_child (GtkContainer      *container,
                                                   GtkWidget         *child);
 
diff --git a/gtk/gtkcontainerprivate.h b/gtk/gtkcontainerprivate.h
index 7402a66..0681909 100644
--- a/gtk/gtkcontainerprivate.h
+++ b/gtk/gtkcontainerprivate.h
@@ -39,9 +39,6 @@ gboolean _gtk_container_get_reallocate_redraws (GtkContainer *container);
 
 void      _gtk_container_stop_idle_sizer        (GtkContainer *container);
 void      _gtk_container_maybe_start_idle_sizer (GtkContainer *container);
-gboolean  _gtk_container_get_border_width_set   (GtkContainer *container);
-void      _gtk_container_set_border_width_set   (GtkContainer *container,
-                                                 gboolean      border_width_set);
 void      gtk_container_get_children_clip       (GtkContainer  *container,
                                                  GtkAllocation *out_clip);
 void      gtk_container_set_default_resize_mode (GtkContainer *container,
diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c
index ff6fa9f..375891e 100644
--- a/gtk/gtkcustompaperunixdialog.c
+++ b/gtk/gtkcustompaperunixdialog.c
@@ -1021,7 +1021,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
 {
   GtkCustomPaperUnixDialogPrivate *priv = dialog->priv;
   GtkDialog *cpu_dialog = GTK_DIALOG (dialog);
-  GtkWidget *action_area, *content_area;
+  GtkWidget *content_area;
   GtkWidget *grid, *label, *widget, *frame, *combo;
   GtkWidget *hbox, *vbox, *treeview, *scrolled, *toolbar, *button;
   GtkCellRenderer *cell;
@@ -1033,16 +1033,9 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
   GtkStyleContext *context;
 
   content_area = gtk_dialog_get_content_area (cpu_dialog);
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS 
-  action_area = gtk_dialog_get_action_area (cpu_dialog);
-G_GNUC_END_IGNORE_DEPRECATIONS 
-  gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
   gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */
-  gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
-  gtk_box_set_spacing (GTK_BOX (action_area), 6);
 
   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);
   gtk_widget_show (hbox);
 
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index 0a6fa6c..0b6538b 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -576,22 +576,6 @@ gtk_dialog_class_init (GtkDialogClass *class)
                  G_TYPE_NONE, 0);
 
   /**
-   * GtkDialog:content-area-border:
-   *
-   * The default border width used around the
-   * content area of the dialog, as returned by
-   * gtk_dialog_get_content_area(), unless gtk_container_set_border_width()
-   * was called on that widget directly.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                          g_param_spec_int ("content-area-border",
-                                                             P_("Content area border"),
-                                                             P_("Width of border around the main dialog 
area"),
-                                                             0,
-                                                             G_MAXINT,
-                                                             2,
-                                                             GTK_PARAM_READABLE));
-  /**
    * GtkDialog:content-area-spacing:
    *
    * The default spacing used between elements of the
@@ -619,23 +603,6 @@ gtk_dialog_class_init (GtkDialogClass *class)
                                                              GTK_PARAM_READABLE));
 
   /**
-   * GtkDialog:action-area-border:
-   *
-   * The default border width used around the
-   * action area of the dialog, as returned by
-   * gtk_dialog_get_action_area(), unless gtk_container_set_border_width()
-   * was called on that widget directly.
-   */
-  gtk_widget_class_install_style_property (widget_class,
-                                           g_param_spec_int ("action-area-border",
-                                                             P_("Action area border"),
-                                                             P_("Width of border around the button area at 
the bottom of the dialog"),
-                                                             0,
-                                                             G_MAXINT,
-                                                             5,
-                                                             GTK_PARAM_READABLE));
-
-  /**
    * GtkDialog:use-header-bar:
    *
    * %TRUE if the dialog uses a #GtkHeaderBar for action buttons
@@ -673,25 +640,14 @@ static void
 update_spacings (GtkDialog *dialog)
 {
   GtkDialogPrivate *priv = dialog->priv;
-  gint content_area_border;
   gint content_area_spacing;
   gint button_spacing;
-  gint action_area_border;
 
   gtk_widget_style_get (GTK_WIDGET (dialog),
-                        "content-area-border", &content_area_border,
                         "content-area-spacing", &content_area_spacing,
                         "button-spacing", &button_spacing,
-                        "action-area-border", &action_area_border,
                         NULL);
 
-  if (!_gtk_container_get_border_width_set (GTK_CONTAINER (priv->vbox)))
-    {
-      gtk_container_set_border_width (GTK_CONTAINER (priv->vbox),
-                                      content_area_border);
-      _gtk_container_set_border_width_set (GTK_CONTAINER (priv->vbox), FALSE);
-    }
-
   if (!_gtk_box_get_spacing_set (GTK_BOX (priv->vbox)))
     {
       gtk_box_set_spacing (GTK_BOX (priv->vbox), content_area_spacing);
@@ -701,13 +657,6 @@ update_spacings (GtkDialog *dialog)
   /* don't set spacing when buttons are linked */
   if (gtk_button_box_get_layout (GTK_BUTTON_BOX (priv->action_area)) != GTK_BUTTONBOX_EXPAND)
     gtk_box_set_spacing (GTK_BOX (priv->action_area), button_spacing);
-
-  if (!_gtk_container_get_border_width_set (GTK_CONTAINER (priv->action_area)))
-    {
-      gtk_container_set_border_width (GTK_CONTAINER (priv->action_area),
-                                      action_area_border);
-      _gtk_container_set_border_width_set (GTK_CONTAINER (priv->action_area), FALSE);
-    }
 }
 
 static void
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index fa4a794..9d30895 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -2567,7 +2567,6 @@ gtk_entry_ensure_magnifier (GtkEntry *entry)
   gtk_popover_set_modal (GTK_POPOVER (priv->magnifier_popover), FALSE);
   gtk_container_add (GTK_CONTAINER (priv->magnifier_popover),
                      priv->magnifier);
-  gtk_container_set_border_width (GTK_CONTAINER (priv->magnifier_popover), 4);
   gtk_widget_show (priv->magnifier);
 }
 
diff --git a/gtk/gtkeventbox.c b/gtk/gtkeventbox.c
index dc06847..2f92131 100644
--- a/gtk/gtkeventbox.c
+++ b/gtk/gtkeventbox.c
@@ -91,7 +91,6 @@ gtk_event_box_class_init (GtkEventBoxClass *class)
 {
   GObjectClass *gobject_class = G_OBJECT_CLASS (class);
   GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-  GtkContainerClass *container_class = GTK_CONTAINER_CLASS (class);
 
   gobject_class->set_property = gtk_event_box_set_property;
   gobject_class->get_property = gtk_event_box_get_property;
@@ -106,8 +105,6 @@ gtk_event_box_class_init (GtkEventBoxClass *class)
   widget_class->size_allocate = gtk_event_box_size_allocate;
   widget_class->draw = gtk_event_box_draw;
 
-  gtk_container_class_handle_border_width (container_class);
-
   g_object_class_install_property (gobject_class,
                                    PROP_VISIBLE_WINDOW,
                                    g_param_spec_boolean ("visible-window",
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 05827a2..9be4320 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -2681,10 +2681,7 @@ save_widgets_create (GtkFileChooserWidget *impl)
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_style_context_add_class (gtk_widget_get_style_context (vbox), "search-bar");
 
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 0);
-
   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);
   gtk_widget_show (priv->save_widgets_table);
   gtk_grid_set_row_spacing (GTK_GRID (priv->save_widgets_table), 12);
diff --git a/gtk/gtkfixed.c b/gtk/gtkfixed.c
index 751e7b3..2edc2fa 100644
--- a/gtk/gtkfixed.c
+++ b/gtk/gtkfixed.c
@@ -140,7 +140,6 @@ gtk_fixed_class_init (GtkFixedClass *class)
   container_class->child_type = gtk_fixed_child_type;
   container_class->set_child_property = gtk_fixed_set_child_property;
   container_class->get_child_property = gtk_fixed_get_child_property;
-  gtk_container_class_handle_border_width (container_class);
 
   gtk_container_class_install_child_property (container_class,
                                               CHILD_PROP_X,
diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c
index ed50e5f..b3a914b 100644
--- a/gtk/gtkflowbox.c
+++ b/gtk/gtkflowbox.c
@@ -3798,7 +3798,6 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class)
   container_class->remove = gtk_flow_box_remove;
   container_class->forall = gtk_flow_box_forall;
   container_class->child_type = gtk_flow_box_child_type;
-  gtk_container_class_handle_border_width (container_class);
 
   class->activate_cursor_child = gtk_flow_box_activate_cursor_child;
   class->toggle_cursor_child = gtk_flow_box_toggle_cursor_child;
diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
index 56fb8c9..2ad519f 100644
--- a/gtk/gtkframe.c
+++ b/gtk/gtkframe.c
@@ -272,8 +272,6 @@ gtk_frame_class_init (GtkFrameClass *class)
   container_class->remove = gtk_frame_remove;
   container_class->forall = gtk_frame_forall;
 
-  gtk_container_class_handle_border_width (container_class);
-
   class->compute_child_allocation = gtk_frame_real_compute_child_allocation;
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_FRAME_ACCESSIBLE);
diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
index 357dbb1..31808d0 100644
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@ -1752,7 +1752,6 @@ gtk_grid_class_init (GtkGridClass *class)
   container_class->child_type = gtk_grid_child_type;
   container_class->set_child_property = gtk_grid_set_child_property;
   container_class->get_child_property = gtk_grid_get_child_property;
-  gtk_container_class_handle_border_width (container_class);
 
   g_object_class_override_property (object_class, PROP_ORIENTATION, "orientation");
 
diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
index 4e41f3d..cc377c8 100644
--- a/gtk/gtkheaderbar.c
+++ b/gtk/gtkheaderbar.c
@@ -1975,7 +1975,6 @@ gtk_header_bar_class_init (GtkHeaderBarClass *class)
   container_class->child_type = gtk_header_bar_child_type;
   container_class->set_child_property = gtk_header_bar_set_child_property;
   container_class->get_child_property = gtk_header_bar_get_child_property;
-  gtk_container_class_handle_border_width (container_class);
 
   gtk_container_class_install_child_property (container_class,
                                               CHILD_PROP_PACK_TYPE,
diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 1f08ed4..1921dd4 100644
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -2628,7 +2628,6 @@ gtk_menu_realize (GtkWidget *widget)
   GdkWindow *window;
   GdkWindowAttr attributes;
   gint attributes_mask;
-  gint border_width;
   GtkWidget *child;
   GList *children;
   GtkBorder arrow_border, padding;
@@ -2657,16 +2656,13 @@ gtk_menu_realize (GtkWidget *widget)
   gtk_widget_register_window (widget, window);
 
   get_menu_padding (widget, &padding);
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
 
   gtk_widget_get_allocation (widget, &allocation);
 
-  attributes.x = border_width + padding.left;
-  attributes.y = border_width + padding.top;
-  attributes.width = allocation.width -
-    (2 * border_width) - padding.left - padding.right;
-  attributes.height = allocation.height -
-    (2 * border_width) - padding.top - padding.bottom;
+  attributes.x = padding.left;
+  attributes.y = padding.top;
+  attributes.width = allocation.width - padding.left - padding.right;
+  attributes.height = allocation.height - padding.top - padding.bottom;
 
   get_arrows_border (menu, &arrow_border);
   attributes.y += arrow_border.top;
@@ -2684,10 +2680,8 @@ gtk_menu_realize (GtkWidget *widget)
 
   attributes.x = 0;
   attributes.y = - priv->scroll_offset;
-  attributes.width = allocation.width + (2 * border_width) +
-    padding.left + padding.right;
-  attributes.height = priv->requested_height - (2 * border_width) +
-    padding.top + padding.bottom;
+  attributes.width = allocation.width + padding.left + padding.right;
+  attributes.height = priv->requested_height + padding.top + padding.bottom;
 
   attributes.width = MAX (1, attributes.width);
   attributes.height = MAX (1, attributes.height);
@@ -2805,7 +2799,6 @@ calculate_line_heights (GtkMenu *menu,
   GtkMenuShell   *menu_shell;
   GtkWidget      *child, *widget;
   GList          *children;
-  guint           border_width;
   guint           n_columns;
   gint            n_heights;
   guint          *min_heights;
@@ -2824,8 +2817,7 @@ calculate_line_heights (GtkMenu *menu,
 
   get_menu_padding (widget, &padding);
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (menu));
-  avail_width -= (border_width) * 2 + padding.left + padding.right;
+  avail_width -= padding.left + padding.right;
 
   for (children = menu_shell->priv->children; children; children = children->next)
     {
@@ -2881,7 +2873,6 @@ gtk_menu_size_allocate (GtkWidget     *widget,
   GList *children;
   gint x, y, i;
   gint width, height;
-  guint border_width;
   GtkBorder arrow_border, padding;
 
   g_return_if_fail (GTK_IS_MENU (widget));
@@ -2894,7 +2885,6 @@ gtk_menu_size_allocate (GtkWidget     *widget,
   gtk_widget_set_allocation (widget, allocation);
 
   get_menu_padding (widget, &padding);
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (menu));
 
   g_free (priv->heights);
   priv->heights_length = calculate_line_heights (menu,
@@ -2903,14 +2893,14 @@ gtk_menu_size_allocate (GtkWidget     *widget,
                                                  NULL);
 
   /* refresh our cached height request */
-  priv->requested_height = (2 * border_width) + padding.top + padding.bottom;
+  priv->requested_height = padding.top + padding.bottom;
   for (i = 0; i < priv->heights_length; i++)
     priv->requested_height += priv->heights[i];
 
-  x = border_width + padding.left;
-  y = border_width + padding.top;
-  width = allocation->width - (2 * border_width) - padding.left - padding.right;
-  height = allocation->height - (2 * border_width) - padding.top - padding.bottom;
+  x = padding.left;
+  y = padding.top;
+  width = allocation->width - padding.left - padding.right;
+  height = allocation->height - padding.top - padding.bottom;
 
   if (menu_shell->priv->active)
     gtk_menu_scroll_to (menu, priv->scroll_offset);
@@ -3077,7 +3067,6 @@ gtk_menu_get_preferred_width (GtkWidget *widget,
   GList          *children;
   guint           max_toggle_size;
   guint           max_accel_width;
-  guint           border_width;
   gint            child_min, child_nat;
   gint            min_width, nat_width;
   GtkBorder       padding;
@@ -3160,9 +3149,8 @@ gtk_menu_get_preferred_width (GtkWidget *widget,
   nat_width *= gtk_menu_get_n_columns (menu);
 
   get_menu_padding (widget, &padding);
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (menu));
-  min_width   += (2 * border_width) + padding.left + padding.right;
-  nat_width   += (2 * border_width) + padding.left + padding.right;
+  min_width   += padding.left + padding.right;
+  nat_width   += padding.left + padding.right;
 
   priv->toggle_size = max_toggle_size;
   priv->accel_size  = max_accel_width;
@@ -3195,14 +3183,12 @@ gtk_menu_get_preferred_height_for_width (GtkWidget *widget,
   GtkMenu        *menu = GTK_MENU (widget);
   GtkMenuPrivate *priv = menu->priv;
   guint          *min_heights, *nat_heights;
-  guint           border_width;
   gint            n_heights, i;
   gint            min_height, single_height, nat_height;
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (menu));
   get_menu_padding (widget, &padding);
 
-  min_height = nat_height = (2 * border_width) + padding.top + padding.bottom;
+  min_height = nat_height = padding.top + padding.bottom;
   single_height = 0;
 
   n_heights =
@@ -3216,8 +3202,7 @@ gtk_menu_get_preferred_height_for_width (GtkWidget *widget,
     }
 
   get_arrows_border (menu, &arrow_border);
-  single_height += (2 * border_width) 
-                   + padding.top + padding.bottom
+  single_height += padding.top + padding.bottom
                    + arrow_border.top + arrow_border.bottom;
   min_height = MIN (min_height, single_height);
 
@@ -3605,7 +3590,6 @@ get_arrows_sensitive_area (GtkMenu      *menu,
   GtkWidget *widget = GTK_WIDGET (menu);
   GdkWindow *window;
   gint width, height;
-  guint border;
   gint win_x, win_y;
   GtkBorder padding;
   gint top_arrow_height, bottom_arrow_height;
@@ -3625,7 +3609,6 @@ get_arrows_sensitive_area (GtkMenu      *menu,
   width = gdk_window_get_width (window);
   height = gdk_window_get_height (window);
 
-  border = gtk_container_get_border_width (GTK_CONTAINER (menu));
   get_menu_padding (widget, &padding);
 
   gdk_window_get_position (window, &win_x, &win_y);
@@ -3635,15 +3618,15 @@ get_arrows_sensitive_area (GtkMenu      *menu,
       upper->x = win_x;
       upper->y = win_y;
       upper->width = width;
-      upper->height = top_arrow_height + border + padding.top;
+      upper->height = top_arrow_height + padding.top;
     }
 
   if (lower)
     {
       lower->x = win_x;
-      lower->y = win_y + height - border - padding.bottom - bottom_arrow_height;
+      lower->y = win_y + height - padding.bottom - bottom_arrow_height;
       lower->width = width;
-      lower->height = bottom_arrow_height + border + padding.bottom;
+      lower->height = bottom_arrow_height + padding.bottom;
     }
 }
 
@@ -4661,7 +4644,6 @@ gtk_menu_scroll_to (GtkMenu *menu,
   GtkWidget *widget;
   gint x, y;
   gint view_width, view_height;
-  gint border_width;
 
   widget = GTK_WIDGET (menu);
 
@@ -4671,13 +4653,11 @@ gtk_menu_scroll_to (GtkMenu *menu,
 
   get_menu_padding (widget, &padding);
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (menu));
+  view_width -= padding.left + padding.right;
+  view_height -= padding.top + padding.bottom;
 
-  view_width -= (2 * border_width) + padding.left + padding.right;
-  view_height -= (2 * border_width) + padding.top + padding.bottom;
-
-  x = border_width + padding.left;
-  y = border_width + padding.top;
+  x = padding.left;
+  y = padding.top;
 
   top_arrow_node = gtk_css_gadget_get_node (priv->top_arrow_gadget);
   gtk_css_node_set_visible (top_arrow_node, priv->upper_arrow_visible);
@@ -4762,8 +4742,7 @@ gtk_menu_scroll_item_visible (GtkMenuShell *menu_shell,
 
       get_menu_padding (widget, &padding);
 
-      height -= 2 * gtk_container_get_border_width (GTK_CONTAINER (menu)) +
-        padding.top + padding.bottom;
+      height -= padding.top + padding.bottom;
 
       if (child_offset < y)
         {
@@ -5072,16 +5051,13 @@ get_visible_size (GtkMenu *menu)
 {
   GtkAllocation allocation;
   GtkWidget *widget = GTK_WIDGET (menu);
-  GtkContainer *container = GTK_CONTAINER (menu);
   GtkBorder padding, arrow_border;
   gint menu_height;
 
   gtk_widget_get_allocation (widget, &allocation);
   get_menu_padding (widget, &padding);
 
-  menu_height = (allocation.height -
-                 (2 * gtk_container_get_border_width (container)) -
-                 padding.top - padding.bottom);
+  menu_height = allocation.height - padding.top - padding.bottom;
 
   get_arrows_border (menu, &arrow_border);
   menu_height -= arrow_border.top;
@@ -5146,8 +5122,7 @@ get_menu_height (GtkMenu *menu)
   get_menu_padding (widget, &padding);
 
   height = priv->requested_height;
-  height -= (gtk_container_get_border_width (GTK_CONTAINER (widget)) * 2) +
-    padding.top + padding.bottom;
+  height -= padding.top + padding.bottom;
 
   get_arrows_border (menu, &arrow_border);
   height -= arrow_border.top;
diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
index f6f771d..bdf2ce0 100644
--- a/gtk/gtkmenubar.c
+++ b/gtk/gtkmenubar.c
@@ -138,14 +138,12 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
   GObjectClass *gobject_class;
   GtkWidgetClass *widget_class;
   GtkMenuShellClass *menu_shell_class;
-  GtkContainerClass *container_class;
 
   GtkBindingSet *binding_set;
 
   gobject_class = (GObjectClass*) class;
   widget_class = (GtkWidgetClass*) class;
   menu_shell_class = (GtkMenuShellClass*) class;
-  container_class = (GtkContainerClass*) class;
 
   gobject_class->get_property = gtk_menu_bar_get_property;
   gobject_class->set_property = gtk_menu_bar_set_property;
@@ -239,7 +237,6 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
                                                       GTK_PACK_DIRECTION_LTR,
                                                       GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
 
-  gtk_container_class_handle_border_width (container_class);
   gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_MENU_BAR);
   gtk_widget_class_set_css_name (widget_class, "menubar");
 }
diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index c4d511f..efa3059 100644
--- a/gtk/gtkmenuitem.c
+++ b/gtk/gtkmenuitem.c
@@ -814,8 +814,6 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
 
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_MENU_ITEM_ACCESSIBLE);
   gtk_widget_class_set_css_name (widget_class, "menuitem");
-
-  gtk_container_class_handle_border_width (container_class);
 }
 
 static void
diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
index ed48e85..f55479b 100644
--- a/gtk/gtkmessagedialog.c
+++ b/gtk/gtkmessagedialog.c
@@ -110,8 +110,6 @@ struct _GtkMessageDialogPrivate
   guint          message_type       : 3;
 };
 
-static void gtk_message_dialog_style_updated (GtkWidget       *widget);
-
 static void gtk_message_dialog_constructed  (GObject          *object);
 static void gtk_message_dialog_set_property (GObject          *object,
                                             guint             prop_id,
@@ -161,23 +159,12 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
   widget_class = GTK_WIDGET_CLASS (class);
   gobject_class = G_OBJECT_CLASS (class);
   
-  widget_class->style_updated = gtk_message_dialog_style_updated;
-
   gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_ALERT);
 
   gobject_class->constructed = gtk_message_dialog_constructed;
   gobject_class->set_property = gtk_message_dialog_set_property;
   gobject_class->get_property = gtk_message_dialog_get_property;
   
-  gtk_widget_class_install_style_property (widget_class,
-                                          g_param_spec_int ("message-border",
-                                                             P_("label border"),
-                                                             P_("Width of border around the label in the 
message dialog"),
-                                                             0,
-                                                             G_MAXINT,
-                                                             12,
-                                                             GTK_PARAM_READABLE));
-
   /**
    * GtkMessageDialog:message-type:
    *
@@ -323,7 +310,6 @@ gtk_message_dialog_init (GtkMessageDialog *dialog)
   priv->message_type = GTK_MESSAGE_OTHER;
 
   gtk_widget_init_template (GTK_WIDGET (dialog));
-  gtk_message_dialog_style_updated (GTK_WIDGET (dialog));
 G_GNUC_BEGIN_IGNORE_DEPRECATIONS
   action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
 G_GNUC_END_IGNORE_DEPRECATIONS
@@ -971,23 +957,3 @@ gtk_message_dialog_add_buttons (GtkMessageDialog* message_dialog,
   g_object_notify (G_OBJECT (message_dialog), "buttons");
 }
 
-static void
-gtk_message_dialog_style_updated (GtkWidget *widget)
-{
-  GtkMessageDialog *dialog = GTK_MESSAGE_DIALOG (widget);
-  GtkWidget *parent;
-  gint border_width;
-
-  parent = gtk_widget_get_parent (dialog->priv->message_area);
-
-  if (parent)
-    {
-      gtk_widget_style_get (widget, "message-border",
-                            &border_width, NULL);
-
-      gtk_container_set_border_width (GTK_CONTAINER (parent),
-                                      MAX (0, border_width - 7));
-    }
-
-  GTK_WIDGET_CLASS (gtk_message_dialog_parent_class)->style_updated (widget);
-}
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index 8340844..db8a602 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -532,9 +532,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 G_GNUC_END_IGNORE_DEPRECATIONS
 
   /* Set the dialog up with HIG properties */
-  gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
   gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */
-  gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
   gtk_box_set_spacing (GTK_BOX (action_area), 6);
 
   gtk_window_set_resizable (window, FALSE);
@@ -550,7 +548,6 @@ 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);
 
   icon = gtk_image_new_from_icon_name ("dialog-password",
@@ -1407,7 +1404,6 @@ 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);
 
   if (secondary != NULL)
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index ea120d2..430ac06 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -1152,8 +1152,6 @@ gtk_notebook_class_init (GtkNotebookClass *class)
   add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
   add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
 
-  gtk_container_class_handle_border_width (container_class);
-
   gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_NOTEBOOK_ACCESSIBLE);
   gtk_widget_class_set_css_name (widget_class, "notebook");
 }
diff --git a/gtk/gtkoffscreenwindow.c b/gtk/gtkoffscreenwindow.c
index ec2594c..367927f 100644
--- a/gtk/gtkoffscreenwindow.c
+++ b/gtk/gtkoffscreenwindow.c
@@ -56,13 +56,10 @@ gtk_offscreen_window_get_preferred_width (GtkWidget *widget,
 {
   GtkBin *bin = GTK_BIN (widget);
   GtkWidget *child;
-  gint border_width;
   gint default_width;
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-
-  *minimum = border_width * 2;
-  *natural = border_width * 2;
+  *minimum = 0;
+  *natural = 0;
 
   child = gtk_bin_get_child (bin);
 
@@ -90,13 +87,10 @@ gtk_offscreen_window_get_preferred_height (GtkWidget *widget,
 {
   GtkBin *bin = GTK_BIN (widget);
   GtkWidget *child;
-  gint border_width;
   gint default_height;
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-
-  *minimum = border_width * 2;
-  *natural = border_width * 2;
+  *minimum = 0;
+  *natural = 0;
 
   child = gtk_bin_get_child (bin);
 
@@ -123,12 +117,9 @@ gtk_offscreen_window_size_allocate (GtkWidget *widget,
 {
   GtkBin *bin = GTK_BIN (widget);
   GtkWidget *child;
-  gint border_width;
 
   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,
@@ -142,10 +133,10 @@ gtk_offscreen_window_size_allocate (GtkWidget *widget,
     {
       GtkAllocation  child_alloc;
 
-      child_alloc.x = border_width;
-      child_alloc.y = border_width;
-      child_alloc.width = allocation->width - 2 * border_width;
-      child_alloc.height = allocation->height - 2 * border_width;
+      child_alloc.x = 0;
+      child_alloc.y = 0;
+      child_alloc.width = allocation->width;
+      child_alloc.height = allocation->height;
 
       gtk_widget_size_allocate (child, &child_alloc);
     }
diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
index 67b39a9..9dd2ede 100644
--- a/gtk/gtkpaned.c
+++ b/gtk/gtkpaned.c
@@ -349,7 +349,6 @@ gtk_paned_class_init (GtkPanedClass *class)
   container_class->set_focus_child = gtk_paned_set_focus_child;
   container_class->set_child_property = gtk_paned_set_child_property;
   container_class->get_child_property = gtk_paned_get_child_property;
-  gtk_container_class_handle_border_width (container_class);
 
   paned_class->cycle_child_focus = gtk_paned_cycle_child_focus;
   paned_class->toggle_handle_focus = gtk_paned_toggle_handle_focus;
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index b35c5b3..9b2265f 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -237,7 +237,6 @@ gtk_path_bar_class_init (GtkPathBarClass *path_bar_class)
   container_class->add = gtk_path_bar_add;
   container_class->forall = gtk_path_bar_forall;
   container_class->remove = gtk_path_bar_remove;
-  gtk_container_class_handle_border_width (container_class);
   /* FIXME: */
   /*  container_class->child_type = gtk_path_bar_child_type;*/
 
diff --git a/gtk/gtkplacesview.c b/gtk/gtkplacesview.c
index 0105800..a0fae51 100644
--- a/gtk/gtkplacesview.c
+++ b/gtk/gtkplacesview.c
@@ -569,7 +569,6 @@ populate_servers (GtkPlacesView *view)
 
       grid = g_object_new (GTK_TYPE_GRID,
                            "orientation", GTK_ORIENTATION_VERTICAL,
-                           "border-width", 3,
                            NULL);
 
       /* name of the connected uri, if any */
diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
index 4aee40f..b2716f5 100644
--- a/gtk/gtkpopover.c
+++ b/gtk/gtkpopover.c
@@ -1223,19 +1223,16 @@ get_padding_and_border (GtkWidget *widget,
                         GtkBorder *border)
 {
   GtkStyleContext *context;
-  gint border_width;
   GtkBorder tmp;
 
   context = gtk_widget_get_style_context (widget);
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-
   gtk_style_context_get_padding (context, border);
   gtk_style_context_get_border (context, &tmp);
-  border->top += tmp.top + border_width;
-  border->right += tmp.right + border_width;
-  border->bottom += tmp.bottom + border_width;
-  border->left += tmp.left + border_width;
+  border->top += tmp.top;
+  border->right += tmp.right;
+  border->bottom += tmp.bottom;
+  border->left += tmp.left;
 }
 
 static gint
diff --git a/gtk/gtkrecentchooserdialog.c b/gtk/gtkrecentchooserdialog.c
index 8486e72..f83db78 100644
--- a/gtk/gtkrecentchooserdialog.c
+++ b/gtk/gtkrecentchooserdialog.c
@@ -127,7 +127,7 @@ static void
 gtk_recent_chooser_dialog_init (GtkRecentChooserDialog *dialog)
 {
   GtkRecentChooserDialogPrivate *priv;
-  GtkWidget *content_area, *action_area;
+  GtkWidget *content_area;
   GtkDialog *rc_dialog = GTK_DIALOG (dialog);
 
   priv = gtk_recent_chooser_dialog_get_instance_private (dialog);
@@ -135,13 +135,8 @@ gtk_recent_chooser_dialog_init (GtkRecentChooserDialog *dialog)
   gtk_dialog_set_use_header_bar_from_setting (GTK_DIALOG (dialog));
 
   content_area = gtk_dialog_get_content_area (rc_dialog);
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  action_area = gtk_dialog_get_action_area (rc_dialog);
-G_GNUC_END_IGNORE_DEPRECATIONS
 
-  gtk_container_set_border_width (GTK_CONTAINER (rc_dialog), 5);
   gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */
-  gtk_container_set_border_width (GTK_CONTAINER (action_area), 5);
 }
 
 /* we intercept the GtkRecentChooser::item_activated signal and try to
@@ -213,7 +208,6 @@ gtk_recent_chooser_dialog_constructed (GObject *object)
 
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (object));
 
-  gtk_container_set_border_width (GTK_CONTAINER (priv->chooser), 5);
   gtk_box_pack_start (GTK_BOX (content_area),
                       priv->chooser, TRUE, TRUE);
   gtk_widget_show (priv->chooser);
diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
index 13949ac..50ed4e5 100644
--- a/gtk/gtkscrolledwindow.c
+++ b/gtk/gtkscrolledwindow.c
@@ -556,7 +556,6 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
   container_class->add = gtk_scrolled_window_add;
   container_class->remove = gtk_scrolled_window_remove;
   container_class->forall = gtk_scrolled_window_forall;
-  gtk_container_class_handle_border_width (container_class);
 
   class->scroll_child = gtk_scrolled_window_scroll_child;
   class->move_focus_out = gtk_scrolled_window_move_focus_out;
diff --git a/gtk/gtkshortcutssection.c b/gtk/gtkshortcutssection.c
index 2ec177d..4fe6041 100644
--- a/gtk/gtkshortcutssection.c
+++ b/gtk/gtkshortcutssection.c
@@ -428,7 +428,6 @@ gtk_shortcuts_section_init (GtkShortcutsSection *self)
   gtk_orientable_set_orientation (GTK_ORIENTABLE (self), GTK_ORIENTATION_VERTICAL);
   gtk_box_set_homogeneous (GTK_BOX (self), FALSE);
   gtk_box_set_spacing (GTK_BOX (self), 22);
-  gtk_container_set_border_width (GTK_CONTAINER (self), 24);
 
   self->stack = g_object_new (GTK_TYPE_STACK,
                               "homogeneous", TRUE,
diff --git a/gtk/gtkshortcutswindow.c b/gtk/gtkshortcutswindow.c
index f80d930..b9a7f48 100644
--- a/gtk/gtkshortcutswindow.c
+++ b/gtk/gtkshortcutswindow.c
@@ -963,7 +963,6 @@ gtk_shortcuts_window_init (GtkShortcutsWindow *self)
   G_GNUC_END_IGNORE_DEPRECATIONS;
 
   priv->popover = g_object_new (GTK_TYPE_POPOVER,
-                                "border-width", 6,
                                 "relative-to", priv->menu_button,
                                 "position", GTK_POS_BOTTOM,
                                 NULL);
@@ -1002,7 +1001,6 @@ gtk_shortcuts_window_init (GtkShortcutsWindow *self)
                            "visible", TRUE,
                            NULL);
   box = g_object_new (GTK_TYPE_BOX,
-                      "border-width", 24,
                       "halign", GTK_ALIGN_CENTER,
                       "spacing", 24,
                       "orientation", GTK_ORIENTATION_VERTICAL,
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index fe4190e..a06d4cc 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -134,7 +134,6 @@
  *   adjustment = gtk_adjustment_new (50.0, 0.0, 100.0, 1.0, 5.0, 0.0);
  *
  *   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- *   gtk_container_set_border_width (GTK_CONTAINER (window), 5);
  *
  *   // creates the spinbutton, with no decimal places
  *   button = gtk_spin_button_new (adjustment, 1.0, 0);
@@ -166,7 +165,6 @@
  *   adjustment = gtk_adjustment_new (2.500, 0.0, 5.0, 0.001, 0.1, 0.0);
  *
  *   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
- *   gtk_container_set_border_width (GTK_CONTAINER (window), 5);
  *
  *   // creates the spinbutton, with three decimal places
  *   button = gtk_spin_button_new (adjustment, 0.001, 3);
diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c
index ca3e4e4..44fbe20 100644
--- a/gtk/gtkstack.c
+++ b/gtk/gtkstack.c
@@ -452,7 +452,6 @@ gtk_stack_class_init (GtkStackClass *klass)
   container_class->forall = gtk_stack_forall;
   container_class->set_child_property = gtk_stack_set_child_property;
   container_class->get_child_property = gtk_stack_get_child_property;
-  gtk_container_class_handle_border_width (container_class);
 
   stack_props[PROP_HOMOGENEOUS] =
       g_param_spec_boolean ("homogeneous", P_("Homogeneous"), P_("Homogeneous sizing"),
diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 84b6599..c4ee222 100644
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -1802,7 +1802,6 @@ _gtk_text_view_ensure_magnifier (GtkTextView *text_view)
   gtk_popover_set_modal (GTK_POPOVER (priv->magnifier_popover), FALSE);
   gtk_container_add (GTK_CONTAINER (priv->magnifier_popover),
                      priv->magnifier);
-  gtk_container_set_border_width (GTK_CONTAINER (priv->magnifier_popover), 4);
   gtk_widget_show (priv->magnifier);
 }
 
@@ -3976,7 +3975,6 @@ gtk_text_view_size_request (GtkWidget      *widget,
   GtkTextView *text_view;
   GtkTextViewPrivate *priv;
   GSList *tmp_list;
-  guint border_width;
 
   text_view = GTK_TEXT_VIEW (widget);
   priv = text_view->priv;
@@ -4007,10 +4005,6 @@ gtk_text_view_size_request (GtkWidget      *widget,
   if (priv->bottom_window)
     requisition->height += priv->bottom_window->requisition.height;
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (text_view));
-  requisition->width += border_width * 2;
-  requisition->height += border_width * 2;
-
   requisition->height += priv->top_border + priv->bottom_border;
   requisition->width += priv->left_border + priv->right_border;
 
@@ -4231,7 +4225,6 @@ gtk_text_view_size_allocate (GtkWidget *widget,
   GdkRectangle right_rect;
   GdkRectangle top_rect;
   GdkRectangle bottom_rect;
-  guint border_width;
   gboolean size_changed;
   
   text_view = GTK_TEXT_VIEW (widget);
@@ -4247,8 +4240,6 @@ gtk_text_view_size_allocate (GtkWidget *widget,
     widget_allocation.width != allocation->width ||
     widget_allocation.height != allocation->height;
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (text_view));
-
   gtk_widget_set_allocation (widget, allocation);
 
   if (gtk_widget_get_realized (widget))
@@ -4262,7 +4253,7 @@ gtk_text_view_size_allocate (GtkWidget *widget,
    * windows get at least a 1x1 allocation.
    */
 
-  width = allocation->width - border_width * 2;
+  width = allocation->width;
 
   if (priv->left_window)
     left_rect.width = priv->left_window->requisition.width;
@@ -4283,7 +4274,7 @@ gtk_text_view_size_allocate (GtkWidget *widget,
   top_rect.width = text_rect.width;
   bottom_rect.width = text_rect.width;
 
-  height = allocation->height - border_width * 2;
+  height = allocation->height;
 
   if (priv->top_window)
     top_rect.height = priv->top_window->requisition.height;
@@ -4305,8 +4296,8 @@ gtk_text_view_size_allocate (GtkWidget *widget,
   right_rect.height = text_rect.height;
 
   /* Origins */
-  left_rect.x = border_width;
-  top_rect.y = border_width;
+  left_rect.x = 0;
+  top_rect.y = 0;
 
   text_rect.x = left_rect.x + left_rect.width;
   text_rect.y = top_rect.y + top_rect.height;
diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
index 71913da..e7f270d 100644
--- a/gtk/gtktoolbar.c
+++ b/gtk/gtktoolbar.c
@@ -433,8 +433,6 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
   container_class->get_child_property = gtk_toolbar_get_child_property;
   container_class->set_child_property = gtk_toolbar_set_child_property;
 
-  gtk_container_class_handle_border_width (container_class);
-
   klass->orientation_changed = gtk_toolbar_orientation_changed;
   klass->style_changed = gtk_toolbar_real_style_changed;
   
diff --git a/gtk/gtktoolitem.c b/gtk/gtktoolitem.c
index c877985..0c59eae 100644
--- a/gtk/gtktoolitem.c
+++ b/gtk/gtktoolitem.c
@@ -169,8 +169,6 @@ gtk_tool_item_class_init (GtkToolItemClass *klass)
   widget_class->size_allocate = gtk_tool_item_size_allocate;
   widget_class->parent_set    = gtk_tool_item_parent_set;
 
-  gtk_container_class_handle_border_width (GTK_CONTAINER_CLASS (klass));
-
   klass->create_menu_proxy = _gtk_tool_item_create_menu_proxy;
   
   g_object_class_install_property (object_class,
diff --git a/gtk/gtktoolitemgroup.c b/gtk/gtktoolitemgroup.c
index 38fedeb..6dd1571 100644
--- a/gtk/gtktoolitemgroup.c
+++ b/gtk/gtktoolitemgroup.c
@@ -582,7 +582,6 @@ gtk_tool_item_group_size_request (GtkWidget      *widget,
   GtkOrientation orientation;
   GtkRequisition item_size;
   gint requested_rows;
-  guint border_width;
 
   if (priv->children && gtk_tool_item_group_get_label_widget (group))
     {
@@ -604,10 +603,6 @@ gtk_tool_item_group_size_request (GtkWidget      *widget,
     requisition->width = MAX (requisition->width, item_size.width);
   else
     requisition->height = MAX (requisition->height, item_size.height * requested_rows);
-
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-  requisition->width += border_width * 2;
-  requisition->height += border_width * 2;
 }
 
 static void
@@ -679,9 +674,7 @@ gtk_tool_item_group_real_size_query (GtkWidget      *widget,
   GtkOrientation orientation;
 
   gint min_rows;
-  guint border_width;
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
   orientation = gtk_tool_shell_get_orientation (GTK_TOOL_SHELL (group));
 
   /* figure out the size of homogeneous items */
@@ -713,7 +706,7 @@ gtk_tool_item_group_real_size_query (GtkWidget      *widget,
           gint row = -1;
           guint col = 0;
 
-          item_area.width = allocation->width - 2 * border_width;
+          item_area.width = allocation->width;
           n_columns = MAX (item_area.width / item_size.width, 1);
 
           /* calculate required rows for n_columns columns */
@@ -770,7 +763,7 @@ gtk_tool_item_group_real_size_query (GtkWidget      *widget,
           guint col = 0, min_col, max_col = 0, all_items = 0;
           gint i;
 
-          item_area.height = allocation->height - 2 * border_width;
+          item_area.height = allocation->height;
           n_rows = MAX (item_area.height / item_size.height, min_rows);
 
           row_min_width = g_new0 (guint, n_rows);
@@ -907,8 +900,8 @@ gtk_tool_item_group_real_size_query (GtkWidget      *widget,
     }
 
   /* report effective widget size */
-  inquery->width += item_area.width + 2 * border_width;
-  inquery->height += item_area.height + 2 * border_width;
+  inquery->width += item_area.width;
+  inquery->height += item_area.height;
 }
 
 static void
@@ -929,11 +922,8 @@ gtk_tool_item_group_real_size_allocate (GtkWidget     *widget,
 
   gint n_columns, n_rows = 1;
   gint min_rows;
-  guint border_width;
   GtkTextDirection direction;
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-
   direction = gtk_widget_get_direction (widget);
 
   orientation = gtk_tool_shell_get_orientation (GTK_TOOL_SHELL (group));
@@ -941,8 +931,8 @@ gtk_tool_item_group_real_size_allocate (GtkWidget     *widget,
   /* chain up */
   GTK_WIDGET_CLASS (gtk_tool_item_group_parent_class)->size_allocate (widget, allocation);
 
-  child_allocation.x = border_width;
-  child_allocation.y = border_width;
+  child_allocation.x = 0;
+  child_allocation.y = 0;
 
   /* place the header widget */
   if (gtk_widget_get_visible (priv->header))
@@ -961,7 +951,7 @@ gtk_tool_item_group_real_size_allocate (GtkWidget     *widget,
           child_allocation.height = allocation->height;
 
           if (GTK_TEXT_DIR_RTL == direction)
-            child_allocation.x = allocation->width - border_width - child_allocation.width;
+            child_allocation.x = allocation->width - child_allocation.width;
         }
 
       gtk_widget_size_allocate (priv->header, &child_allocation);
@@ -971,7 +961,7 @@ gtk_tool_item_group_real_size_allocate (GtkWidget     *widget,
       else if (GTK_TEXT_DIR_RTL != direction)
         child_allocation.x += child_allocation.width;
       else
-        child_allocation.x = border_width;
+        child_allocation.x = 0;
     }
   else
     child_requisition.width = child_requisition.height = 0;
@@ -987,8 +977,8 @@ gtk_tool_item_group_real_size_allocate (GtkWidget     *widget,
     {
       item_size.width = MIN (item_size.width, allocation->width);
 
-      item_area.width = allocation->width - 2 * border_width;
-      item_area.height = allocation->height - 2 * border_width - child_requisition.height;
+      item_area.width = allocation->width;
+      item_area.height = allocation->height - child_requisition.height;
 
       n_columns = MAX (item_area.width / item_size.width, 1);
 
@@ -998,8 +988,8 @@ gtk_tool_item_group_real_size_allocate (GtkWidget     *widget,
     {
       item_size.height = MIN (item_size.height, allocation->height);
 
-      item_area.width = allocation->width - 2 * border_width - child_requisition.width;
-      item_area.height = allocation->height - 2 * border_width;
+      item_area.width = allocation->width - child_requisition.width;
+      item_area.height = allocation->height;
 
       n_columns = MAX (item_area.width / item_size.width, 1);
       n_rows = MAX (item_area.height / item_size.height, min_rows);
@@ -1242,18 +1232,16 @@ gtk_tool_item_group_realize (GtkWidget *widget)
   GdkWindow *window;
   GdkWindowAttr attributes;
   gint attributes_mask;
-  guint border_width;
 
   gtk_widget_set_realized (widget, TRUE);
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
   gtk_widget_get_allocation (widget, &allocation);
 
   attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.x = allocation.x + border_width;
-  attributes.y = allocation.y + border_width;
-  attributes.width = allocation.width - border_width * 2;
-  attributes.height = allocation.height - border_width * 2;
+  attributes.x = allocation.x;
+  attributes.y = allocation.y;
+  attributes.width = allocation.width;
+  attributes.height = allocation.height;
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.event_mask = gtk_widget_get_events (widget)
                          | GDK_VISIBILITY_NOTIFY_MASK
diff --git a/gtk/gtktoolpalette.c b/gtk/gtktoolpalette.c
index a525823..93481bf 100644
--- a/gtk/gtktoolpalette.c
+++ b/gtk/gtktoolpalette.c
@@ -420,11 +420,8 @@ gtk_tool_palette_size_request (GtkWidget      *widget,
 {
   GtkToolPalette *palette = GTK_TOOL_PALETTE (widget);
   GtkRequisition child_requisition;
-  guint border_width;
   guint i;
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-
   requisition->width = 0;
   requisition->height = 0;
 
@@ -449,9 +446,6 @@ gtk_tool_palette_size_request (GtkWidget      *widget,
           requisition->height = MAX (requisition->height, child_requisition.height);
         }
     }
-
-  requisition->width += border_width * 2;
-  requisition->height += border_width * 2;
 }
 
 static void
@@ -494,7 +488,6 @@ gtk_tool_palette_size_allocate (GtkWidget     *widget,
   gint total_size, page_size;
   gint offset = 0;
   guint i;
-  guint border_width;
 
   gint min_offset = -1, max_offset = -1;
 
@@ -503,7 +496,6 @@ gtk_tool_palette_size_allocate (GtkWidget     *widget,
   gint *group_sizes = g_newa (gint, palette->priv->groups->len);
   GtkTextDirection direction;
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
   direction = gtk_widget_get_direction (widget);
 
   GTK_WIDGET_CLASS (gtk_tool_palette_parent_class)->size_allocate (widget, allocation);
@@ -526,9 +518,9 @@ gtk_tool_palette_size_allocate (GtkWidget     *widget,
     offset = -offset;
 
   if (GTK_ORIENTATION_VERTICAL == palette->priv->orientation)
-    child_allocation.width = allocation->width - border_width * 2;
+    child_allocation.width = allocation->width;
   else
-    child_allocation.height = allocation->height - border_width * 2;
+    child_allocation.height = allocation->height;
 
   if (GTK_ORIENTATION_VERTICAL == palette->priv->orientation)
     remaining_space = allocation->height;
@@ -613,8 +605,8 @@ gtk_tool_palette_size_allocate (GtkWidget     *widget,
   if (remaining_space > 0)
     offset = 0;
 
-  x = border_width;
-  child_allocation.y = border_width;
+  x = 0;
+  child_allocation.y = 0;
 
   if (GTK_ORIENTATION_VERTICAL == palette->priv->orientation)
     child_allocation.y -= offset;
@@ -664,14 +656,12 @@ gtk_tool_palette_size_allocate (GtkWidget     *widget,
 
   if (GTK_ORIENTATION_VERTICAL == palette->priv->orientation)
     {
-      child_allocation.y += border_width;
       child_allocation.y += offset;
 
       total_size = child_allocation.y;
     }
   else
     {
-      x += border_width;
       x += offset;
 
       total_size = x;
@@ -716,19 +706,16 @@ gtk_tool_palette_realize (GtkWidget *widget)
   GdkWindow *window;
   GdkWindowAttr attributes;
   gint attributes_mask;
-  guint border_width;
 
   gtk_widget_set_realized (widget, TRUE);
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (widget));
-
   gtk_widget_get_allocation (widget, &allocation);
 
   attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.x = allocation.x + border_width;
-  attributes.y = allocation.y + border_width;
-  attributes.width = allocation.width - border_width * 2;
-  attributes.height = allocation.height - border_width * 2;
+  attributes.x = allocation.x;
+  attributes.y = allocation.y;
+  attributes.width = allocation.width;
+  attributes.height = allocation.height;
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.event_mask = gtk_widget_get_events (widget)
                          | GDK_VISIBILITY_NOTIFY_MASK
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index d03e47e..70dda49 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -11203,7 +11203,6 @@ gtk_tree_view_ensure_interactive_directory (GtkTreeView *tree_view)
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_widget_show (vbox);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
-  gtk_container_set_border_width (GTK_CONTAINER (vbox), 3);
 
   /* add entry */
   tree_view->priv->search_entry = gtk_entry_new ();
diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
index 1f7b494..ff6ffba 100644
--- a/gtk/gtkviewport.c
+++ b/gtk/gtkviewport.c
@@ -394,7 +394,6 @@ gtk_viewport_class_init (GtkViewportClass *class)
 
   container_class->remove = gtk_viewport_remove;
   container_class->add = gtk_viewport_add;
-  gtk_container_class_handle_border_width (container_class);
 
   /* GtkScrollable implementation */
   g_object_class_override_property (gobject_class, PROP_HADJUSTMENT,    "hadjustment");
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 9a329cc..93ad171 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -7294,7 +7294,6 @@ _gtk_window_set_allocation (GtkWindow           *window,
   GtkWidget *widget = (GtkWidget *)window;
   GtkWindowPrivate *priv = window->priv;
   GtkAllocation child_allocation;
-  gint border_width;
   GtkBorder window_border = { 0 };
   GList *link;
 
@@ -7356,12 +7355,6 @@ _gtk_window_set_allocation (GtkWindow           *window,
                               allocation->width, allocation->height);
     }
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (window));
-  child_allocation.x += border_width;
-  child_allocation.y += border_width;
-  child_allocation.width = MAX (1, child_allocation.width - border_width * 2);
-  child_allocation.height = MAX (1, child_allocation.height - border_width * 2);
-
   *allocation_out = child_allocation;
 
   link = priv->popovers;
@@ -8174,7 +8167,6 @@ gtk_window_get_preferred_width (GtkWidget *widget,
   GtkWindow *window;
   GtkWidget *child;
   GtkWindowPrivate *priv;
-  guint border_width;
   gint title_min = 0, title_nat = 0;
   gint child_min = 0, child_nat = 0;
   GtkBorder window_border = { 0 };
@@ -8185,8 +8177,6 @@ gtk_window_get_preferred_width (GtkWidget *widget,
   child  = gtk_bin_get_child (GTK_BIN (window));
   has_size_request = gtk_widget_has_size_request (widget);
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (window));
-
   if (priv->decorated &&
       !priv->fullscreen)
     {
@@ -8208,10 +8198,8 @@ gtk_window_get_preferred_width (GtkWidget *widget,
 
       if (child_nat == 0 && !has_size_request)
         child_nat = NO_CONTENT_CHILD_NAT;
-      child_min += border_width * 2 +
-                   window_border.left + window_border.right;
-      child_nat += border_width * 2 +
-                   window_border.left + window_border.right;
+      child_min += window_border.left + window_border.right;
+      child_nat += window_border.left + window_border.right;
     }
   else if (!has_size_request)
     {
@@ -8232,7 +8220,6 @@ gtk_window_get_preferred_width_for_height (GtkWidget *widget,
   GtkWindow *window;
   GtkWidget *child;
   GtkWindowPrivate *priv;
-  guint border_width;
   gint title_min = 0, title_nat = 0;
   gint child_min = 0, child_nat = 0;
   gint title_height = 0;
@@ -8244,10 +8231,6 @@ gtk_window_get_preferred_width_for_height (GtkWidget *widget,
   child  = gtk_bin_get_child (GTK_BIN (window));
   has_size_request = gtk_widget_has_size_request (widget);
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (window));
-
-  height -= 2 * border_width;
-
   if (priv->decorated &&
       !priv->fullscreen)
     {
@@ -8279,10 +8262,8 @@ gtk_window_get_preferred_width_for_height (GtkWidget *widget,
 
       if (child_nat == 0 && height == 0 && !has_size_request)
         child_nat = NO_CONTENT_CHILD_NAT;
-      child_min += border_width * 2 +
-                   window_border.left + window_border.right;
-      child_nat += border_width * 2 +
-                   window_border.left + window_border.right;
+      child_min += window_border.left + window_border.right;
+      child_nat += window_border.left + window_border.right;
     }
   else if (!has_size_request)
     {
@@ -8301,7 +8282,6 @@ gtk_window_get_preferred_height (GtkWidget *widget,
   GtkWindow *window;
   GtkWindowPrivate *priv;
   GtkWidget *child;
-  guint border_width;
   int title_min = 0;
   int title_height = 0;
   GtkBorder window_border = { 0 };
@@ -8315,8 +8295,6 @@ gtk_window_get_preferred_height (GtkWidget *widget,
   *minimum_size = 0;
   *natural_size = 0;
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (window));
-
   if (priv->decorated &&
       !priv->fullscreen)
     {
@@ -8343,8 +8321,8 @@ gtk_window_get_preferred_height (GtkWidget *widget,
 
       if (child_nat == 0 && !has_size_request)
         child_nat = NO_CONTENT_CHILD_NAT;
-      *minimum_size += child_min + 2 * border_width;
-      *natural_size += child_nat + 2 * border_width;
+      *minimum_size += child_min;
+      *natural_size += child_nat;
     }
   else if (!has_size_request)
     {
@@ -8362,7 +8340,6 @@ gtk_window_get_preferred_height_for_width (GtkWidget *widget,
   GtkWindow *window;
   GtkWindowPrivate *priv;
   GtkWidget *child;
-  guint border_width;
   int title_min = 0;
   int title_height = 0;
   GtkBorder window_border = { 0 };
@@ -8376,10 +8353,6 @@ gtk_window_get_preferred_height_for_width (GtkWidget *widget,
   *minimum_size = 0;
   *natural_size = 0;
 
-  border_width = gtk_container_get_border_width (GTK_CONTAINER (window));
-
-  width -= 2 * border_width;
-
   if (priv->decorated &&
       !priv->fullscreen)
     {
@@ -8410,8 +8383,8 @@ gtk_window_get_preferred_height_for_width (GtkWidget *widget,
 
       if (child_nat == 0 && width == 0 && !has_size_request)
         child_nat = NO_CONTENT_CHILD_NAT;
-      *minimum_size += child_min + 2 * border_width;
-      *natural_size += child_nat + 2 * border_width;
+      *minimum_size += child_min;
+      *natural_size += child_nat;
     }
   else if (!has_size_request)
     {
diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui
index 9dca96d..aaa9ac2 100644
--- a/gtk/ui/gtkaboutdialog.ui
+++ b/gtk/ui/gtkaboutdialog.ui
@@ -6,7 +6,6 @@
     <property name="icon-name">help-about</property>
   </object>
   <template class="GtkAboutDialog" parent="GtkDialog">
-    <property name="border-width">5</property>
     <property name="resizable">0</property>
     <property name="type-hint">dialog</property>
     <child internal-child="headerbar">
@@ -28,7 +27,6 @@
         <child>
           <object class="GtkBox" id="box">
             <property name="visible">1</property>
-            <property name="border-width">5</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
@@ -169,7 +167,6 @@
                                 <property name="visible">1</property>
                                 <property name="halign">center</property>
                                 <property name="valign">start</property>
-                                <property name="border-width">5</property>
                                 <property name="orientation">vertical</property>
                                 <property name="row-spacing">2</property>
                                 <property name="column-spacing">8</property>
diff --git a/gtk/ui/gtkcolorchooserdialog.ui b/gtk/ui/gtkcolorchooserdialog.ui
index f3d250d..0bcc50a 100644
--- a/gtk/ui/gtkcolorchooserdialog.ui
+++ b/gtk/ui/gtkcolorchooserdialog.ui
@@ -2,7 +2,6 @@
 <interface domain="gtk30">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkColorChooserDialog" parent="GtkDialog">
-    <property name="border-width">5</property>
     <property name="title" translatable="yes">Select a Color</property>
     <property name="type-hint">dialog</property>
     <property name="resizable">0</property>
@@ -13,7 +12,6 @@
         <child>
           <object class="GtkColorChooserWidget" id="chooser">
             <property name="visible">1</property>
-            <property name="border-width">5</property>
             <property name="orientation">vertical</property>
             <property name="rgba">rgb(255,255,255)</property>
             <signal name="color-activated" handler="color_activated_cb" swapped="no"/>
diff --git a/gtk/ui/gtkdialog.ui b/gtk/ui/gtkdialog.ui
index 0d88249..214cbd4 100644
--- a/gtk/ui/gtkdialog.ui
+++ b/gtk/ui/gtkdialog.ui
@@ -15,7 +15,6 @@
       <object class="GtkBox" id="vbox">
         <property name="visible">1</property>
         <property name="orientation">vertical</property>
-        <property name="border-width">0</property>
         <style>
           <class name="dialog-vbox"/>
         </style>
diff --git a/gtk/ui/gtkfilechooserdialog.ui b/gtk/ui/gtkfilechooserdialog.ui
index 9315717..9cf195d 100644
--- a/gtk/ui/gtkfilechooserdialog.ui
+++ b/gtk/ui/gtkfilechooserdialog.ui
@@ -9,10 +9,8 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
-        <property name="border-width">0</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
-            <property name="border-width">6</property>
             <property name="layout-style">end</property>
           </object>
           <packing>
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index b42c2cc..42545de 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -54,7 +54,6 @@
                               <object class="GtkBox">
                                 <property name="visible">1</property>
                                 <property name="spacing">6</property>
-                                <property name="border-width">6</property>
                                 <child>
                                   <object class="GtkPathBar" id="browse_path_bar">
                                     <property name="visible">True</property>
@@ -94,7 +93,6 @@
                                 <property name="visible">1</property>
                                 <property name="no-show-all">1</property>
                                 <property name="spacing">6</property>
-                                <property name="border-width">6</property>
                               </object>
                               <packing>
                                 <property name="name">location</property>
@@ -105,7 +103,6 @@
                                 <property name="visible">1</property>
                                 <property name="no-show-all">1</property>
                                 <property name="spacing">6</property>
-                                <property name="border-width">6</property>
                                 <child type="center">
                                   <object class="GtkSearchEntry" id="search_entry">
                                     <property name="visible">1</property>
diff --git a/gtk/ui/gtkfontchooserdialog.ui b/gtk/ui/gtkfontchooserdialog.ui
index 9689103..78e766d 100644
--- a/gtk/ui/gtkfontchooserdialog.ui
+++ b/gtk/ui/gtkfontchooserdialog.ui
@@ -2,7 +2,6 @@
 <interface domain="gtk30">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkFontChooserDialog" parent="GtkDialog">
-    <property name="border-width">5</property>
     <property name="title" translatable="yes">Select Font</property>
     <property name="type-hint">dialog</property>
     <child internal-child="vbox">
@@ -12,7 +11,6 @@
         <child>
           <object class="GtkFontChooserWidget" id="fontchooser">
             <property name="visible">1</property>
-            <property name="border-width">5</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <signal name="font-activated" handler="font_activated_cb" swapped="no"/>
diff --git a/gtk/ui/gtkinfobar.ui b/gtk/ui/gtkinfobar.ui
index f8c57b0..f3bacb2 100644
--- a/gtk/ui/gtkinfobar.ui
+++ b/gtk/ui/gtkinfobar.ui
@@ -11,7 +11,6 @@
             <child>
               <object class="GtkBox" id="content_area">
                 <property name="visible">1</property>
-                <property name="border-width">8</property>
                 <property name="spacing">16</property>
                 <property name="hexpand">1</property>
               </object>
@@ -22,7 +21,6 @@
             <child>
               <object class="GtkButtonBox" id="action_area">
                 <property name="visible">1</property>
-                <property name="border-width">6</property>
                 <property name="spacing">6</property>
                 <property name="layout-style">end</property>
               </object>
@@ -33,7 +31,6 @@
             <child>
               <object class="GtkButton" id="close_button">
                 <property name="can-focus">1</property>
-                <property name="border-width">6</property>
                 <property name="relief">none</property>
                 <property name="valign">center</property>
                 <style>
diff --git a/gtk/ui/gtkmessagedialog.ui b/gtk/ui/gtkmessagedialog.ui
index bc3532f..ed0626c 100644
--- a/gtk/ui/gtkmessagedialog.ui
+++ b/gtk/ui/gtkmessagedialog.ui
@@ -15,7 +15,6 @@
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
         <property name="spacing">20</property>
-        <property name="border-width">0</property>
         <child>
           <object class="GtkBox" id="box">
             <property name="visible">1</property>
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui
index ae52ba0..0954cd5 100644
--- a/gtk/ui/gtkpagesetupunixdialog.ui
+++ b/gtk/ui/gtkpagesetupunixdialog.ui
@@ -25,7 +25,6 @@
   </object>
   <template class="GtkPageSetupUnixDialog" parent="GtkDialog">
     <property name="can-focus">False</property>
-    <property name="border-width">5</property>
     <property name="resizable">False</property>
     <property name="type-hint">dialog</property>
     <property name="title" translatable="yes">Page Setup</property>
@@ -36,7 +35,6 @@
         <child>
           <object class="GtkGrid" id="grid1">
             <property name="visible">1</property>
-            <property name="border-width">5</property>
             <property name="row-spacing">6</property>
             <property name="column-spacing">12</property>
             <child>
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index 9774049..2765d08 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -20,7 +20,6 @@
     <child>
       <object class="GtkBox">
         <property name="visible">1</property>
-        <property name="border-width">18</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
@@ -281,7 +280,6 @@
         <child>
           <object class="GtkBox">
             <property name="visible">1</property>
-            <property name="border-width">12</property>
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <child>
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index 0d14d40..11aae48 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -56,7 +56,6 @@
       <object class="GtkBox" id="dialog-vbox1">
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
-        <property name="border-width">0</property>
         <style>
           <class name="view"/>
         </style>
@@ -72,7 +71,6 @@
                 <child>
                   <object class="GtkBox" id="general_main_box">
                     <property name="visible">1</property>
-                    <property name="border-width">12</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">18</property>
                     <child>
@@ -430,7 +428,6 @@
                 <child>
                   <object class="GtkBox" id="page_setup_main_box">
                     <property name="visible">1</property>
-                    <property name="border-width">12</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">18</property>
                     <child>
@@ -856,7 +853,6 @@
                 </child>
                 <child>
                   <object class="GtkGrid" id="job_page">
-                    <property name="border-width">12</property>
                     <property name="row-spacing">18</property>
                     <property name="column-spacing">18</property>
                     <child>
@@ -1190,7 +1186,6 @@
                         <child>
                           <object class="GtkGrid" id="image_quality_table">
                             <property name="visible">1</property>
-                            <property name="border-width">12</property>
                             <property name="row-spacing">6</property>
                             <property name="column-spacing">12</property>
                           </object>
@@ -1223,7 +1218,6 @@
                         <child>
                           <object class="GtkGrid" id="color_table">
                             <property name="visible">1</property>
-                            <property name="border-width">12</property>
                             <property name="row-spacing">6</property>
                             <property name="column-spacing">12</property>
                           </object>
@@ -1256,7 +1250,6 @@
                         <child>
                           <object class="GtkGrid" id="finishing_table">
                             <property name="visible">1</property>
-                            <property name="border-width">12</property>
                             <property name="row-spacing">6</property>
                             <property name="column-spacing">12</property>
                           </object>
@@ -1289,7 +1282,6 @@
                         <child>
                           <object class="GtkBox" id="advanced_vbox">
                             <property name="visible">1</property>
-                            <property name="border-width">12</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">18</property>
                           </object>
diff --git a/gtk/ui/gtksearchbar.ui b/gtk/ui/gtksearchbar.ui
index 0f2aa1c..93bd05d 100644
--- a/gtk/ui/gtksearchbar.ui
+++ b/gtk/ui/gtksearchbar.ui
@@ -9,7 +9,6 @@
         <child>
           <object class="GtkBox" id="tool_box">
             <property name="visible">1</property>
-            <property name="border-width">6</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkBox" id="box_left">
diff --git a/tests/gdkgears.c b/tests/gdkgears.c
index dfe80d8..584c3fa 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 610ddd8..f8e2f00 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 efdee69..fd24973 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 6041fde..30ebd14 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 62a2a4c..e2cea6b 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 aa8ffd0..2dd60f9 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 6641730..25666df 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 95def5a..bf37cd5 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 3d6fab7..de0d4f1 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 842d813..c9648a5 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 7d2db0b..c0880d1 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 9b5c1ec..c8c7762 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 9d1397e..18b6508 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 19f0aa1..3d8ee80 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 a45c2c9..4bb0124 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 d9921ed..1025c0a 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 ec537aa..96deb11 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 ce79ba7..779ee4d 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 644ece9..7db27bc 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 85b6fe5..7410c6e 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 ef2bec8..187637d 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 ef81c8c..bb3b186 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 23e0ac2..3a2dcfb 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 1bc63e7..66e9531 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 dec82da..94bd6b8 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 96b6891..f64cea8 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 670b9ee..d51133e 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 7ea85a1..59d1856 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 5b8412b..0b28b47 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 be78ca6..436baab 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 329973b..7da1bef 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 9941cb1..cecc177 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 3fb0756..7176985 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 c348ba9..ee0a569 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 dc1522b..d284b52 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 027bdac..4a8884d 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 67257d6..d6d3d77 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 c152c0f..c3ade30 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 e7bab70..6c73ab6 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 f760775..6841101 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 2bf0253..8239ad2 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 42d3da1..8a76399 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 dc7e9b5..f930a38 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)
diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index b4bba90..ca3e5d5 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -922,7 +922,6 @@ test_object_properties (void)
     "    <child>"
     "      <object class=\"GtkBox\" id=\"vbox\">"
     "        <property name=\"orientation\">vertical</property>"
-    "        <property name=\"border-width\">10</property>"
     "        <child>"
     "          <object class=\"GtkLabel\" id=\"label1\">"
     "            <property name=\"mnemonic-widget\">spinbutton1</property>"
@@ -979,10 +978,8 @@ test_children (void)
     "    <child internal-child=\"vbox\">"
     "      <object class=\"GtkBox\" id=\"dialog1-vbox\">"
     "        <property name=\"orientation\">vertical</property>"
-    "        <property name=\"border-width\">10</property>"
     "          <child internal-child=\"action_area\">"
     "            <object class=\"GtkButtonBox\" id=\"dialog1-action_area\">"
-    "              <property name=\"border-width\">20</property>"
     "              <property name=\"orientation\">horizontal</property>"
     "            </object>"
     "          </child>"
@@ -1022,7 +1019,6 @@ test_children (void)
   g_assert (GTK_IS_BOX (vbox));
   g_assert (gtk_orientable_get_orientation (GTK_ORIENTABLE (vbox)) == GTK_ORIENTATION_VERTICAL);
   g_assert (strcmp (gtk_buildable_get_name (GTK_BUILDABLE (gtk_widget_get_parent (GTK_WIDGET (vbox)))), 
"dialog1") == 0);
-  g_assert (gtk_container_get_border_width (GTK_CONTAINER (vbox)) == 10);
   g_assert (strcmp (gtk_buildable_get_name (GTK_BUILDABLE (content_area)), "dialog1-vbox") == 0);
 
   action_area = gtk_builder_get_object (builder, "dialog1-action_area");
@@ -1033,7 +1029,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
   g_assert (GTK_IS_BUTTON_BOX (action_area));
   g_assert (gtk_orientable_get_orientation (GTK_ORIENTABLE (action_area)) == GTK_ORIENTATION_HORIZONTAL);
   g_assert (gtk_widget_get_parent (GTK_WIDGET (action_area)) != NULL);
-  g_assert (gtk_container_get_border_width (GTK_CONTAINER (action_area)) == 20);
   g_assert (dialog_action_area != NULL);
   g_assert (gtk_buildable_get_name (GTK_BUILDABLE (action_area)) != NULL);
   g_assert (strcmp (gtk_buildable_get_name (GTK_BUILDABLE (dialog_action_area)), "dialog1-action_area") == 
0);
diff --git a/testsuite/reftests/background-area.ref.ui b/testsuite/reftests/background-area.ref.ui
index b9b096c..9d9b72b 100644
--- a/testsuite/reftests/background-area.ref.ui
+++ b/testsuite/reftests/background-area.ref.ui
@@ -10,7 +10,6 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
-        <property name="border-width">5</property>
         <child>
          <object class="GtkButton" id="button1">
            <property name="name">reference1</property>
diff --git a/testsuite/reftests/background-area.ui b/testsuite/reftests/background-area.ui
index 1fc44e8..53dfab8 100644
--- a/testsuite/reftests/background-area.ui
+++ b/testsuite/reftests/background-area.ui
@@ -10,7 +10,6 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
-        <property name="border-width">5</property>
         <child>
          <object class="GtkButton" id="button1">
            <property name="name">button1</property>
diff --git a/testsuite/reftests/background-image-multiple.ref.ui 
b/testsuite/reftests/background-image-multiple.ref.ui
index c4cf4fe..bf16bc4 100644
--- a/testsuite/reftests/background-image-multiple.ref.ui
+++ b/testsuite/reftests/background-image-multiple.ref.ui
@@ -10,7 +10,6 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
-        <property name="border-width">5</property>
         <child>
          <object class="GtkButton" id="ref1">
            <property name="name">ref1</property>
diff --git a/testsuite/reftests/background-image-multiple.ui b/testsuite/reftests/background-image-multiple.ui
index 7ee4311..a444f74 100644
--- a/testsuite/reftests/background-image-multiple.ui
+++ b/testsuite/reftests/background-image-multiple.ui
@@ -10,7 +10,6 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
-        <property name="border-width">5</property>
         <child>
          <object class="GtkButton" id="button1">
            <property name="name">button1</property>
diff --git a/testsuite/reftests/background-origin.ui b/testsuite/reftests/background-origin.ui
index 6cc188b..1f22d32 100644
--- a/testsuite/reftests/background-origin.ui
+++ b/testsuite/reftests/background-origin.ui
@@ -10,7 +10,6 @@
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">5</property>
-        <property name="border-width">5</property>
         <child>
          <object class="GtkButton" id="button1">
            <property name="name">button1</property>
diff --git a/testsuite/reftests/info-bar-message-types.ui b/testsuite/reftests/info-bar-message-types.ui
index 1c38d80..dbf7d7d 100644
--- a/testsuite/reftests/info-bar-message-types.ui
+++ b/testsuite/reftests/info-bar-message-types.ui
@@ -18,7 +18,6 @@
             <child internal-child="content_area">
               <object class="GtkBox" id="infobar-content_area1">
                 <property name="can_focus">False</property>
-                <property name="border_width">8</property>
                 <property name="spacing">16</property>
                 <child>
                   <object class="GtkLabel" id="label1">
@@ -37,7 +36,6 @@
             <child internal-child="action_area">
               <object class="GtkButtonBox" id="infobar-action_area1">
                 <property name="can_focus">False</property>
-                <property name="border_width">0</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <property name="layout_style">end</property>
@@ -61,7 +59,6 @@
             <child internal-child="content_area">
               <object class="GtkBox" id="infobar-content_area2">
                 <property name="can_focus">False</property>
-                <property name="border_width">8</property>
                 <property name="spacing">16</property>
                 <child>
                   <object class="GtkLabel" id="label2">
@@ -80,7 +77,6 @@
             <child internal-child="action_area">
               <object class="GtkButtonBox" id="infobar-action_area2">
                 <property name="can_focus">False</property>
-                <property name="border_width">0</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <property name="layout_style">end</property>
@@ -104,7 +100,6 @@
             <child internal-child="content_area">
               <object class="GtkBox" id="infobar-content_area3">
                 <property name="can_focus">False</property>
-                <property name="border_width">8</property>
                 <property name="spacing">16</property>
                 <child>
                   <object class="GtkLabel" id="label3">
@@ -123,7 +118,6 @@
             <child internal-child="action_area">
               <object class="GtkButtonBox" id="infobar-action_area3">
                 <property name="can_focus">False</property>
-                <property name="border_width">0</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <property name="layout_style">end</property>
@@ -147,7 +141,6 @@
             <child internal-child="content_area">
               <object class="GtkBox" id="infobar-content_area4">
                 <property name="can_focus">False</property>
-                <property name="border_width">8</property>
                 <property name="spacing">16</property>
                 <child>
                   <object class="GtkLabel" id="label4">
@@ -166,7 +159,6 @@
             <child internal-child="action_area">
               <object class="GtkButtonBox" id="infobar-action_area4">
                 <property name="can_focus">False</property>
-                <property name="border_width">0</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <property name="layout_style">end</property>
@@ -190,7 +182,6 @@
             <child internal-child="content_area">
               <object class="GtkBox" id="infobar-content_area5">
                 <property name="can_focus">False</property>
-                <property name="border_width">8</property>
                 <property name="spacing">16</property>
                 <child>
                   <object class="GtkLabel" id="label5">
@@ -209,7 +200,6 @@
             <child internal-child="action_area">
               <object class="GtkButtonBox" id="infobar-action_area5">
                 <property name="can_focus">False</property>
-                <property name="border_width">0</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <property name="layout_style">end</property>
diff --git a/testsuite/reftests/messagedialog-secondarytext.ref.ui 
b/testsuite/reftests/messagedialog-secondarytext.ref.ui
index 6f7381c..a85e722 100644
--- a/testsuite/reftests/messagedialog-secondarytext.ref.ui
+++ b/testsuite/reftests/messagedialog-secondarytext.ref.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkMessageDialog" id="messagedialog1">
     <property name="can_focus">False</property>
-    <property name="border_width">5</property>
     <property name="type">popup</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
diff --git a/testsuite/reftests/messagedialog-secondarytext.ui 
b/testsuite/reftests/messagedialog-secondarytext.ui
index ed1767b..7c9be82 100644
--- a/testsuite/reftests/messagedialog-secondarytext.ui
+++ b/testsuite/reftests/messagedialog-secondarytext.ui
@@ -3,7 +3,6 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkMessageDialog" id="messagedialog1">
     <property name="can_focus">False</property>
-    <property name="border_width">5</property>
     <property name="type">popup</property>
     <property name="type_hint">dialog</property>
     <property name="skip_taskbar_hint">True</property>
diff --git a/testsuite/reftests/window-border-width.ref.ui b/testsuite/reftests/window-border-width.ref.ui
index 0d6af7e..4bb1942 100644
--- a/testsuite/reftests/window-border-width.ref.ui
+++ b/testsuite/reftests/window-border-width.ref.ui
@@ -6,7 +6,6 @@
     <property name="type">popup</property>
     <child>
       <object class="GtkBox" id="box1">
-        <property name="border-width">20</property>
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <child>
diff --git a/testsuite/reftests/window-border-width.ui b/testsuite/reftests/window-border-width.ui
index 51f1e08..60d2348 100644
--- a/testsuite/reftests/window-border-width.ui
+++ b/testsuite/reftests/window-border-width.ui
@@ -4,7 +4,6 @@
   <object class="GtkWindow" id="window_information_collection">
     <property name="can_focus">False</property>
     <property name="type">popup</property>
-    <property name="border-width">20</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="visible">True</property>
diff --git a/testsuite/reftests/window-height-for-width.ref.ui 
b/testsuite/reftests/window-height-for-width.ref.ui
index 1675a5e..e5eeb3b 100644
--- a/testsuite/reftests/window-height-for-width.ref.ui
+++ b/testsuite/reftests/window-height-for-width.ref.ui
@@ -2,7 +2,6 @@
 <interface>
   <object class="GtkDialog" id="window1">
     <property name="can_focus">False</property>
-    <property name="border_width">5</property>
     <property name="title" translatable="yes">Dubstep</property>
     <property name="type_hint">dialog</property>
     <property name="resizable">False</property>
diff --git a/testsuite/reftests/window-height-for-width.ui b/testsuite/reftests/window-height-for-width.ui
index f29766a..f23ca45 100644
--- a/testsuite/reftests/window-height-for-width.ui
+++ b/testsuite/reftests/window-height-for-width.ui
@@ -2,7 +2,6 @@
 <interface>
   <object class="GtkDialog" id="window1">
     <property name="can_focus">False</property>
-    <property name="border_width">5</property>
     <property name="title" translatable="yes">Dubstep</property>
     <property name="type_hint">dialog</property>
     <property name="resizable">False</property>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]