diff --git a/demos/gtk-demo/button_box.c b/demos/gtk-demo/button_box.c
index a535bf9ce9..8b53d33f95 100644
--- a/demos/gtk-demo/button_box.c
+++ b/demos/gtk-demo/button_box.c
@@ -18,9 +18,9 @@ create_bbox (gint  horizontal,
   frame = gtk_frame_new (title);
 
   if (horizontal)
-    bbox = gtk_hbutton_box_new ();
+    bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   else
-    bbox = gtk_vbutton_box_new ();
+    bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
 
   gtk_container_set_border_width (GTK_CONTAINER (bbox), 5);
   gtk_container_add (GTK_CONTAINER (frame), bbox);
diff --git a/examples/buttonbox/buttonbox.c b/examples/buttonbox/buttonbox.c
index 1809154d8d..72df6e8599 100644
--- a/examples/buttonbox/buttonbox.c
+++ b/examples/buttonbox/buttonbox.c
@@ -16,9 +16,9 @@ static GtkWidget *create_bbox( gint  horizontal,
   frame = gtk_frame_new (title);
 
   if (horizontal)
-    bbox = gtk_hbutton_box_new ();
+    bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   else
-    bbox = gtk_vbutton_box_new ();
+    bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
 
   gtk_container_set_border_width (GTK_CONTAINER (bbox), 5);
   gtk_container_add (GTK_CONTAINER (frame), bbox);
diff --git a/examples/calendar/calendar.c b/examples/calendar/calendar.c
index b884b25722..2f472137fe 100644
--- a/examples/calendar/calendar.c
+++ b/examples/calendar/calendar.c
@@ -286,7 +286,7 @@ static void create_calendar( void )
 
   hbox = gtk_hbox_new (FALSE, DEF_PAD);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, DEF_PAD);
-  hbbox = gtk_hbutton_box_new ();
+  hbbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_box_pack_start (GTK_BOX (hbox), hbbox, FALSE, FALSE, DEF_PAD);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (hbbox), GTK_BUTTONBOX_SPREAD);
   gtk_box_set_spacing (GTK_BOX (hbbox), 5);
@@ -384,7 +384,7 @@ static void create_calendar( void )
   calendar_data.prev2_sig = gtk_label_new ("");
   gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev2_sig, FALSE, TRUE, 0);
 
-  bbox = gtk_hbutton_box_new ();
+  bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_END);
 
diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
index cf9592710a..681899389f 100644
--- a/gtk/gtkdialog.c
+++ b/gtk/gtkdialog.c
@@ -262,7 +262,7 @@ gtk_dialog_init (GtkDialog *dialog)
   gtk_container_add (GTK_CONTAINER (dialog), priv->vbox);
   gtk_widget_show (priv->vbox);
 
-  priv->action_area = gtk_hbutton_box_new ();
+  priv->action_area = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
 
   gtk_button_box_set_layout (GTK_BUTTON_BOX (priv->action_area),
                              GTK_BUTTONBOX_END);
diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index fb6a87fec8..273be407a1 100644
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -616,7 +616,7 @@ gtk_info_bar_init (GtkInfoBar *info_bar)
   gtk_widget_show (content_area);
   gtk_box_pack_start (GTK_BOX (info_bar), content_area, TRUE, TRUE, 0);
 
-  action_area = gtk_vbutton_box_new ();
+  action_area = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
   gtk_widget_show (action_area);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (action_area), GTK_BUTTONBOX_END);
   gtk_box_pack_start (GTK_BOX (info_bar), action_area, FALSE, TRUE, 0);
diff --git a/modules/other/gail/tests/testlib.c b/modules/other/gail/tests/testlib.c
index 8323e290b3..87a17c60cf 100644
--- a/modules/other/gail/tests/testlib.c
+++ b/modules/other/gail/tests/testlib.c
@@ -588,7 +588,7 @@ _create_select_tests_window (AtkObject    *obj,
       /* Setup Layout */
       md[window_no]->vbox = gtk_vbox_new (TRUE, 0);
       md[window_no]->button = gtk_button_new_with_mnemonic ("_Run Tests");
-      hbuttonbox = gtk_hbutton_box_new ();
+      hbuttonbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox),
                                  GTK_BUTTONBOX_SPREAD);
       gtk_box_pack_end (GTK_BOX (hbuttonbox),
diff --git a/tests/testbbox.c b/tests/testbbox.c
index 49a9b8de97..404836e865 100644
--- a/tests/testbbox.c
+++ b/tests/testbbox.c
@@ -137,7 +137,7 @@ main (int    argc,
   
   /* GtkHButtonBox */
   
-  hbbox = gtk_hbutton_box_new ();
+  hbbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_box_pack_start (GTK_BOX (vbox), hbbox, TRUE, TRUE, 5);
   
   for (i = 0; i < N_BUTTONS; i++) {
@@ -148,7 +148,7 @@ main (int    argc,
   bbox = hbbox;
   
   /* GtkVButtonBox */
-  vbbox = gtk_vbutton_box_new ();
+  vbbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
   gtk_box_pack_start (GTK_BOX (vbox), vbbox, TRUE, TRUE, 5);
   
   /* Options */
diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index 47e9a25aba..33af80a030 100644
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -642,7 +642,7 @@ create_calendar(void)
    *  Glue everything together
    */
 
-  bbox = gtk_hbutton_box_new ();
+  bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_button_box_set_layout(GTK_BUTTON_BOX(bbox), GTK_BUTTONBOX_END);
 
   button = gtk_button_new_with_label ("Close");
diff --git a/tests/testfilechooser.c b/tests/testfilechooser.c
index 61cd591704..4e6da60f44 100644
--- a/tests/testfilechooser.c
+++ b/tests/testfilechooser.c
@@ -644,7 +644,7 @@ main (int argc, char **argv)
 
   control_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-  vbbox = gtk_vbutton_box_new ();
+  vbbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
   gtk_container_add (GTK_CONTAINER (control_window), vbbox);
 
   button = gtk_button_new_with_mnemonic ("_Select all");
diff --git a/tests/testgtk.c b/tests/testgtk.c
index f240b3fd0a..d2a8e4bd25 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -1088,9 +1088,9 @@ create_bbox (gint  horizontal,
   frame = gtk_frame_new (title);
 
   if (horizontal)
-    bbox = gtk_hbutton_box_new ();
+    bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   else
-    bbox = gtk_vbutton_box_new ();
+    bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
 
   gtk_container_set_border_width (GTK_CONTAINER (bbox), 5);
   gtk_container_add (GTK_CONTAINER (frame), bbox);
@@ -5194,7 +5194,7 @@ create_forward_back (const char       *title,
 		     GtkTextDirection  text_dir)
 {
   GtkWidget *frame = gtk_frame_new (title);
-  GtkWidget *bbox = gtk_hbutton_box_new ();
+  GtkWidget *bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   GtkWidget *back_button = gtk_button_new_from_stock (GTK_STOCK_GO_BACK);
   GtkWidget *forward_button = gtk_button_new_from_stock (GTK_STOCK_GO_FORWARD);
 
@@ -5652,7 +5652,7 @@ create_display_screen (GtkWidget *widget)
   gtk_table_attach_defaults (GTK_TABLE (table), radio_scr, 0, 1, 1, 2);
   gtk_table_attach_defaults (GTK_TABLE (table), combo_dpy, 1, 2, 0, 1);
 
-  bbox = gtk_hbutton_box_new ();
+  bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   applyb = gtk_button_new_from_stock (GTK_STOCK_APPLY);
   cancelb = gtk_button_new_from_stock (GTK_STOCK_CANCEL);
   
diff --git a/tests/testiconview.c b/tests/testiconview.c
index 9e076b3624..8220c91113 100644
--- a/tests/testiconview.c
+++ b/tests/testiconview.c
@@ -558,7 +558,7 @@ main (gint argc, gchar **argv)
 
   gtk_paned_add2 (GTK_PANED (paned), scrolled_window);
 
-  bbox = gtk_hbutton_box_new ();
+  bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START);
   gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
 
@@ -582,7 +582,7 @@ main (gint argc, gchar **argv)
   g_signal_connect (button, "clicked", G_CALLBACK (swap_rows), icon_list);
   gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE, 0);
 
-  bbox = gtk_hbutton_box_new ();
+  bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START);
   gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
 
diff --git a/tests/testorientable.c b/tests/testorientable.c
index 024816f745..e906708c33 100644
--- a/tests/testorientable.c
+++ b/tests/testorientable.c
@@ -75,7 +75,7 @@ main (int argc, char **argv)
                   TRUE, TRUE, 0);
 
   /* GtkButtonBox */
-  box = gtk_hbutton_box_new ();
+  box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   orientables = g_list_prepend (orientables, box);
   gtk_table_attach_defaults (GTK_TABLE (table), box, 1, 2, 1, 2);
   gtk_box_pack_start (GTK_BOX (box),
diff --git a/tests/testrecentchooser.c b/tests/testrecentchooser.c
index 36a2c9783e..4761583b03 100644
--- a/tests/testrecentchooser.c
+++ b/tests/testrecentchooser.c
@@ -176,7 +176,7 @@ main (int   argc,
 
   control_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 
-  vbbox = gtk_vbutton_box_new ();
+  vbbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
   gtk_container_add (GTK_CONTAINER (control_window), vbbox);
 
   button = gtk_button_new_with_mnemonic ("_Select all");
diff --git a/tests/testtext.c b/tests/testtext.c
index a98d7b58b1..aeab1f7c65 100644
--- a/tests/testtext.c
+++ b/tests/testtext.c
@@ -272,7 +272,7 @@ msgbox_run (GtkWindow  *parent,
   separator = gtk_hseparator_new ();
   gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, 0);
 
-  button_box = gtk_hbutton_box_new ();
+  button_box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_box_pack_start (GTK_BOX (vbox), button_box, FALSE, FALSE, 0);
   gtk_container_set_border_width (GTK_CONTAINER (button_box), 8);
   
diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c
index b8358f5134..425c345a74 100644
--- a/tests/testtreecolumns.c
+++ b/tests/testtreecolumns.c
@@ -840,7 +840,7 @@ main (int argc, char *argv[])
   vbox2 = gtk_vbox_new (FALSE, 8);
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
   
-  bbox = gtk_vbutton_box_new ();
+  bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD);
   gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE, TRUE, 0);
 
@@ -858,7 +858,7 @@ main (int argc, char *argv[])
                     "changed", G_CALLBACK (selection_changed), button);
   gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0);
 
-  bbox = gtk_vbutton_box_new ();
+  bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD);
   gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE, TRUE, 0);