[gimp/metadata-browser] plug-ins: use gtk_box_new()



commit 0e40e64a09c6d96db17057699d8ee59e312a6425
Author: Michael Natterer <mitch gimp org>
Date:   Fri Sep 30 12:17:53 2011 +0200

    plug-ins: use gtk_box_new()

 plug-ins/color-rotate/color-rotate-dialog.c        |   26 ++++++++--------
 plug-ins/common/alien-map.c                        |    6 ++--
 plug-ins/common/animation-play.c                   |    6 ++--
 plug-ins/common/apply-canvas.c                     |    2 +-
 plug-ins/common/blinds.c                           |    4 +-
 plug-ins/common/blur-gauss-selective.c             |    2 +-
 plug-ins/common/blur-gauss.c                       |    4 +-
 plug-ins/common/blur-motion.c                      |    6 ++--
 plug-ins/common/border-average.c                   |    6 ++--
 plug-ins/common/bump-map.c                         |   10 +++---
 plug-ins/common/cartoon.c                          |    2 +-
 plug-ins/common/channel-mixer.c                    |    8 ++--
 plug-ins/common/checkerboard.c                     |    4 +-
 plug-ins/common/cml-explorer.c                     |   10 +++---
 plug-ins/common/color-cube-analyze.c               |    4 +-
 plug-ins/common/color-exchange.c                   |    6 ++--
 plug-ins/common/color-to-alpha.c                   |    4 +-
 plug-ins/common/colorify.c                         |    2 +-
 plug-ins/common/colormap-remap.c                   |    2 +-
 plug-ins/common/compose.c                          |    8 ++--
 plug-ins/common/contrast-retinex.c                 |    2 +-
 plug-ins/common/convolution-matrix.c               |   18 +++++-----
 plug-ins/common/cubism.c                           |    2 +-
 plug-ins/common/curve-bend.c                       |   20 ++++++------
 plug-ins/common/decompose.c                        |    6 ++--
 plug-ins/common/deinterlace.c                      |    2 +-
 plug-ins/common/depth-merge.c                      |    4 +-
 plug-ins/common/despeckle.c                        |    4 +-
 plug-ins/common/destripe.c                         |    2 +-
 plug-ins/common/diffraction.c                      |    4 +-
 plug-ins/common/displace.c                         |    4 +-
 plug-ins/common/edge-dog.c                         |    2 +-
 plug-ins/common/edge-neon.c                        |    2 +-
 plug-ins/common/edge-sobel.c                       |    2 +-
 plug-ins/common/edge.c                             |    4 +-
 plug-ins/common/emboss.c                           |    2 +-
 plug-ins/common/engrave.c                          |    2 +-
 plug-ins/common/file-aa.c                          |    2 +-
 plug-ins/common/file-csource.c                     |    2 +-
 plug-ins/common/file-gih.c                         |    4 +-
 plug-ins/common/file-html-table.c                  |    6 ++--
 plug-ins/common/file-mng.c                         |    8 ++--
 plug-ins/common/file-pdf-load.c                    |    4 +-
 plug-ins/common/file-pdf-save.c                    |    8 ++--
 plug-ins/common/file-ps.c                          |   18 ++++++-----
 plug-ins/common/file-raw.c                         |    4 +-
 plug-ins/common/file-svg.c                         |   10 +++---
 plug-ins/common/file-tga.c                         |    4 +-
 plug-ins/common/file-tiff-load.c                   |    2 +-
 plug-ins/common/file-tiff-save.c                   |    4 +-
 plug-ins/common/file-wmf.c                         |   10 +++---
 plug-ins/common/file-xbm.c                         |    2 +-
 plug-ins/common/file-xmc.c                         |    2 +-
 plug-ins/common/film.c                             |   19 ++++++-----
 plug-ins/common/filter-pack.c                      |   16 +++++-----
 plug-ins/common/fractal-trace.c                    |    4 +-
 plug-ins/common/grid.c                             |    4 +-
 plug-ins/common/hot.c                              |    4 +-
 plug-ins/common/illusion.c                         |    2 +-
 plug-ins/common/iwarp.c                            |   13 ++++---
 plug-ins/common/jigsaw.c                           |    2 +-
 plug-ins/common/lcms.c                             |   10 +++---
 plug-ins/common/lens-apply.c                       |    6 ++--
 plug-ins/common/lens-distortion.c                  |    2 +-
 plug-ins/common/lens-flare.c                       |    4 +-
 plug-ins/common/mail.c                             |    2 +-
 plug-ins/common/max-rgb.c                          |    2 +-
 plug-ins/common/mosaic.c                           |    6 ++--
 plug-ins/common/newsprint.c                        |   20 ++++++------
 plug-ins/common/nl-filter.c                        |    2 +-
 plug-ins/common/noise-hsv.c                        |    2 +-
 plug-ins/common/noise-randomize.c                  |    2 +-
 plug-ins/common/noise-rgb.c                        |    4 +-
 plug-ins/common/noise-solid.c                      |    2 +-
 plug-ins/common/noise-spread.c                     |    2 +-
 plug-ins/common/nova.c                             |    4 +-
 plug-ins/common/oilify.c                           |    2 +-
 plug-ins/common/photocopy.c                        |    2 +-
 plug-ins/common/pixelize.c                         |    2 +-
 plug-ins/common/plasma.c                           |    2 +-
 plug-ins/common/polar-coords.c                     |    5 ++-
 plug-ins/common/qbist.c                            |    2 +-
 plug-ins/common/red-eye-removal.c                  |    2 +-
 plug-ins/common/ripple.c                           |    4 +-
 plug-ins/common/sample-colorize.c                  |   18 ++++++-----
 plug-ins/common/screenshot.c                       |   12 +++---
 plug-ins/common/sharpen.c                          |    2 +-
 plug-ins/common/shift.c                            |    2 +-
 plug-ins/common/sinus.c                            |   20 ++++++------
 plug-ins/common/softglow.c                         |    2 +-
 plug-ins/common/sparkle.c                          |    6 ++--
 plug-ins/common/sphere-designer.c                  |   22 +++++++------
 plug-ins/common/threshold-alpha.c                  |    2 +-
 plug-ins/common/tile-glass.c                       |    2 +-
 plug-ins/common/tile-paper.c                       |    6 ++--
 plug-ins/common/tile-small.c                       |   11 +++---
 plug-ins/common/tile.c                             |    2 +-
 plug-ins/common/unsharp-mask.c                     |    2 +-
 plug-ins/common/value-propagate.c                  |    6 ++--
 plug-ins/common/van-gogh-lic.c                     |    4 +-
 plug-ins/common/video.c                            |    6 ++--
 plug-ins/common/warp.c                             |    6 ++--
 plug-ins/common/waves.c                            |    2 +-
 plug-ins/common/web-page.c                         |   10 +++---
 plug-ins/common/whirl-pinch.c                      |    2 +-
 plug-ins/common/wind.c                             |    2 +-
 plug-ins/file-bmp/bmp-write.c                      |   10 +++---
 plug-ins/file-fits/fits.c                          |    2 +-
 plug-ins/file-ico/ico-dialog.c                     |    8 ++--
 plug-ins/file-jpeg/jpeg-exif.c                     |    6 ++--
 plug-ins/file-jpeg/jpeg-save.c                     |    6 ++--
 plug-ins/flame/flame.c                             |   16 +++++-----
 .../fractal-explorer/fractal-explorer-dialogs.c    |   33 +++++++++++---------
 plug-ins/gfig/gfig-bezier.c                        |    2 +-
 plug-ins/gfig/gfig-dialog.c                        |   20 ++++++------
 plug-ins/gfig/gfig-preview.c                       |    9 +++--
 plug-ins/gimpressionist/brush.c                    |   10 +++---
 plug-ins/gimpressionist/color.c                    |    2 +-
 plug-ins/gimpressionist/general.c                  |   10 +++---
 plug-ins/gimpressionist/gimpressionist.c           |    2 +-
 plug-ins/gimpressionist/orientation.c              |   12 +++---
 plug-ins/gimpressionist/orientmap.c                |    9 +++--
 plug-ins/gimpressionist/paper.c                    |    6 ++--
 plug-ins/gimpressionist/placement.c                |    2 +-
 plug-ins/gimpressionist/presets.c                  |   14 ++++----
 plug-ins/gimpressionist/preview.c                  |    5 ++-
 plug-ins/gimpressionist/size.c                     |   12 +++---
 plug-ins/gimpressionist/sizemap.c                  |    5 ++-
 plug-ins/gradient-flare/gradient-flare.c           |   26 ++++++++--------
 plug-ins/help-browser/dialog.c                     |    6 ++--
 plug-ins/ifs-compose/ifs-compose.c                 |   14 ++++----
 plug-ins/imagemap/imap_browse.c                    |    2 +-
 plug-ins/imagemap/imap_cmd_gimp_guides.c           |    6 ++--
 plug-ins/imagemap/imap_cmd_guides.c                |    2 +-
 plug-ins/imagemap/imap_default_dialog.c            |    2 +-
 plug-ins/imagemap/imap_edit_area_info.c            |    6 ++--
 plug-ins/imagemap/imap_grid.c                      |    2 +-
 plug-ins/imagemap/imap_main.c                      |    4 +-
 plug-ins/imagemap/imap_polygon.c                   |    4 ++-
 plug-ins/imagemap/imap_preferences.c               |    4 +-
 plug-ins/imagemap/imap_selection.c                 |    2 +-
 plug-ins/imagemap/imap_settings.c                  |    2 +-
 plug-ins/imagemap/imap_statusbar.c                 |    4 ++-
 plug-ins/lighting/lighting-ui.c                    |   20 ++++++------
 plug-ins/map-object/map-object-ui.c                |   28 ++++++++--------
 plug-ins/maze/maze-dialog.c                        |   10 +++---
 plug-ins/pagecurl/pagecurl.c                       |    5 ++-
 plug-ins/print/print-page-layout.c                 |   14 ++++----
 plug-ins/script-fu/script-fu-console.c             |    4 +-
 plug-ins/script-fu/script-fu-interface.c           |    4 +-
 plug-ins/win-snap/winsnap.c                        |    4 +-
 151 files changed, 497 insertions(+), 475 deletions(-)
---
diff --git a/plug-ins/color-rotate/color-rotate-dialog.c b/plug-ins/color-rotate/color-rotate-dialog.c
index cd6cdf3..8d9abaa 100644
--- a/plug-ins/color-rotate/color-rotate-dialog.c
+++ b/plug-ins/color-rotate/color-rotate-dialog.c
@@ -109,9 +109,9 @@ rcm_create_previews (void)
   GtkWidget *button;
   GtkWidget *combo;
 
-  top_vbox = gtk_vbox_new (FALSE, 12);
+  top_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (top_vbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
@@ -129,7 +129,7 @@ rcm_create_previews (void)
                           G_CALLBACK (rcm_render_preview),
                           NULL);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (top_vbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
@@ -147,7 +147,7 @@ rcm_create_previews (void)
                           G_CALLBACK (rcm_render_preview),
                           NULL);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (top_vbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -160,7 +160,7 @@ rcm_create_previews (void)
                     G_CALLBACK (rcm_preview_as_you_drag),
                     &(Current.RealTime));
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -375,7 +375,7 @@ rcm_create_main (void)
   Current.From = rcm_create_one_circle (SUM, C_("color-rotate", "From:"));
   Current.To   = rcm_create_one_circle (SUM, C_("color-rotate", "To:"));
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_widget_show (vbox);
 
@@ -409,7 +409,7 @@ rcm_create_gray (void)
   st->hue   = 0;
   st->satur = 0;
 
-  top_vbox = gtk_vbox_new (FALSE, 12);
+  top_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (top_vbox), 12);
   gtk_widget_show (top_vbox);
 
@@ -417,11 +417,11 @@ rcm_create_gray (void)
   gtk_box_pack_start (GTK_BOX (top_vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -512,7 +512,7 @@ rcm_create_gray (void)
   gtk_box_pack_start (GTK_BOX (top_vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  radio_box = gtk_vbox_new (FALSE, 6);
+  radio_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), radio_box);
   gtk_widget_show (radio_box);
 
@@ -546,7 +546,7 @@ rcm_create_gray (void)
   gtk_box_pack_start (GTK_BOX (top_vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
 
@@ -586,7 +586,7 @@ rcm_create_units (void)
   gtk_container_set_border_width (GTK_CONTAINER (frame), 12);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -671,7 +671,7 @@ color_rotate_dialog (void)
   Current.Bna->bna_frame = previews = rcm_create_previews ();
 
   /* H-Box */
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       hbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/alien-map.c b/plug-ins/common/alien-map.c
index a89b554..64c4d60 100644
--- a/plug-ins/common/alien-map.c
+++ b/plug-ins/common/alien-map.c
@@ -406,7 +406,7 @@ alienmap2_dialog (void)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -507,7 +507,7 @@ alienmap2_dialog (void)
                     &wvals.blueangle);
 
   /*  Mode toggle box  */
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_table_attach (GTK_TABLE (top_table), hbox, 1, 2, 0, 1,
                     GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 0);
   gtk_widget_show (hbox);
@@ -524,7 +524,7 @@ alienmap2_dialog (void)
 
   gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/animation-play.c b/plug-ins/common/animation-play.c
index e4a40fc..a4d17d3 100644
--- a/plug-ins/common/animation-play.c
+++ b/plug-ins/common/animation-play.c
@@ -606,7 +606,7 @@ build_dialog (GimpImageBaseType  basetype,
 
   ui_manager = ui_manager_new (window);
 
-  main_vbox = gtk_vbox_new (FALSE, 0);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (window), main_vbox);
   gtk_widget_show (main_vbox);
 
@@ -620,7 +620,7 @@ build_dialog (GimpImageBaseType  basetype,
   gtk_separator_tool_item_set_draw (GTK_SEPARATOR_TOOL_ITEM (item), FALSE);
   gtk_tool_item_set_expand (item, TRUE);
 
-  vbox = gtk_vbox_new (FALSE, 2);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -643,7 +643,7 @@ build_dialog (GimpImageBaseType  basetype,
                     G_CALLBACK (button_press),
                     NULL);
 
-  hbox = gtk_hbox_new (FALSE, 2);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/apply-canvas.c b/plug-ins/common/apply-canvas.c
index abd71e0..4d1c94c 100644
--- a/plug-ins/common/apply-canvas.c
+++ b/plug-ins/common/apply-canvas.c
@@ -1276,7 +1276,7 @@ struc_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c
index c87d077..d2a24e0 100644
--- a/plug-ins/common/blinds.c
+++ b/plug-ins/common/blinds.c
@@ -236,7 +236,7 @@ blinds_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -250,7 +250,7 @@ blinds_dialog (GimpDrawable *drawable)
                             G_CALLBACK (dialog_update_preview),
                             drawable);
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/blur-gauss-selective.c b/plug-ins/common/blur-gauss-selective.c
index 3431f04..1d589c9 100644
--- a/plug-ins/common/blur-gauss-selective.c
+++ b/plug-ins/common/blur-gauss-selective.c
@@ -245,7 +245,7 @@ sel_gauss_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/blur-gauss.c b/plug-ins/common/blur-gauss.c
index 303a3c4..f100562 100644
--- a/plug-ins/common/blur-gauss.c
+++ b/plug-ins/common/blur-gauss.c
@@ -491,7 +491,7 @@ gauss_dialog (gint32        image_ID,
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -501,7 +501,7 @@ gauss_dialog (gint32        image_ID,
   gtk_box_pack_start (GTK_BOX (main_vbox), preview, TRUE, TRUE, 0);
   gtk_widget_show (preview);
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/blur-motion.c b/plug-ins/common/blur-motion.c
index c406322..01976fc 100644
--- a/plug-ins/common/blur-motion.c
+++ b/plug-ins/common/blur-motion.c
@@ -1021,7 +1021,7 @@ mblur_dialog (gint32        image_ID,
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -1035,7 +1035,7 @@ mblur_dialog (gint32        image_ID,
                             G_CALLBACK (mblur),
                             drawable);
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -1056,7 +1056,7 @@ mblur_dialog (gint32        image_ID,
   gtk_box_pack_start (GTK_BOX (hbox), center, FALSE, FALSE, 0);
   gtk_widget_show (center);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_add (GTK_CONTAINER (center), vbox);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/border-average.c b/plug-ins/common/border-average.c
index 0c33162..be265fb 100644
--- a/plug-ins/common/border-average.c
+++ b/plug-ins/common/border-average.c
@@ -360,7 +360,7 @@ borderaverage_dialog (gint32        image_ID,
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -370,7 +370,7 @@ borderaverage_dialog (gint32        image_ID,
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
 
@@ -413,7 +413,7 @@ borderaverage_dialog (gint32        image_ID,
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/bump-map.c b/plug-ins/common/bump-map.c
index 6dfb42c..309aedf 100644
--- a/plug-ins/common/bump-map.c
+++ b/plug-ins/common/bump-map.c
@@ -790,11 +790,11 @@ bumpmap_dialog (void)
                       paned, TRUE, TRUE, 0);
   gtk_widget_show (paned);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_paned_pack1 (GTK_PANED (paned), hbox, TRUE, FALSE);
   gtk_widget_show (hbox);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
@@ -809,16 +809,16 @@ bumpmap_dialog (void)
   g_signal_connect (GIMP_PREVIEW (preview)->area, "event",
                     G_CALLBACK (dialog_preview_events), preview);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_paned_pack2 (GTK_PANED (paned), hbox, FALSE, FALSE);
   gtk_widget_show (hbox);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/cartoon.c b/plug-ins/common/cartoon.c
index 5dd076d..3b008b7 100644
--- a/plug-ins/common/cartoon.c
+++ b/plug-ins/common/cartoon.c
@@ -822,7 +822,7 @@ cartoon_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/channel-mixer.c b/plug-ins/common/channel-mixer.c
index 613a3c2..976cfce 100644
--- a/plug-ins/common/channel-mixer.c
+++ b/plug-ins/common/channel-mixer.c
@@ -505,7 +505,7 @@ cm_dialog (CmParamsType *mix,
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -523,7 +523,7 @@ cm_dialog (CmParamsType *mix,
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_frame_set_label_widget (GTK_FRAME (frame), hbox);
   gtk_widget_show (hbox);
 
@@ -628,7 +628,7 @@ cm_dialog (CmParamsType *mix,
                     G_CALLBACK (cm_blue_scale_callback),
                     mix);
 
-  vbox = gtk_vbox_new (6, FALSE);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -661,7 +661,7 @@ cm_dialog (CmParamsType *mix,
 
   /*........................................................... */
   /*  Horizontal box for file i/o  */
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_end (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/checkerboard.c b/plug-ins/common/checkerboard.c
index 2d15654..74c4bac 100644
--- a/plug-ins/common/checkerboard.c
+++ b/plug-ins/common/checkerboard.c
@@ -359,7 +359,7 @@ checkerboard_dialog (gint32        image_ID,
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       vbox, TRUE, TRUE, 0);
@@ -372,7 +372,7 @@ checkerboard_dialog (gint32        image_ID,
                             G_CALLBACK (do_checkerboard_pattern),
                             drawable);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/cml-explorer.c b/plug-ins/common/cml-explorer.c
index 5bf1b30..6d2e7b2 100644
--- a/plug-ins/common/cml-explorer.c
+++ b/plug-ins/common/cml-explorer.c
@@ -1197,13 +1197,13 @@ CML_explorer_dialog (void)
 
   CML_preview_defer = TRUE;
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -1313,7 +1313,7 @@ CML_explorer_dialog (void)
       GtkWidget    *vbox;
       GtkObject    *adj;
 
-      vbox = gtk_vbox_new (FALSE, 12);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
       gtk_widget_show (vbox);
 
@@ -1418,7 +1418,7 @@ CML_explorer_dialog (void)
       GtkWidget    *combo;
       GtkWidget    *vbox;
 
-      vbox = gtk_vbox_new (FALSE, 12);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
       gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
       gtk_widget_show (vbox);
 
@@ -1712,7 +1712,7 @@ CML_dialog_advanced_panel_new (void)
   gint       channel_id;
   CML_PARAM *param;
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/color-cube-analyze.c b/plug-ins/common/color-cube-analyze.c
index 89d95fa..4e6dd79 100644
--- a/plug-ins/common/color-cube-analyze.c
+++ b/plug-ins/common/color-cube-analyze.c
@@ -363,12 +363,12 @@ doDialog (void)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       vbox, TRUE, TRUE, 0);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
   frame = gtk_frame_new (NULL);
diff --git a/plug-ins/common/color-exchange.c b/plug-ins/common/color-exchange.c
index b89a0b7..1135875 100644
--- a/plug-ins/common/color-exchange.c
+++ b/plug-ins/common/color-exchange.c
@@ -301,7 +301,7 @@ exchange_dialog (GimpDrawable *drawable)
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
   /* do some boxes here */
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -340,7 +340,7 @@ exchange_dialog (GimpDrawable *drawable)
 
   /* and our scales */
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -356,7 +356,7 @@ exchange_dialog (GimpDrawable *drawable)
       gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
       gtk_widget_show (frame);
 
-      vbox = gtk_vbox_new (FALSE, 0);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_container_add (GTK_CONTAINER (frame), vbox);
       gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/color-to-alpha.c b/plug-ins/common/color-to-alpha.c
index 95973e0..3f8a5a1 100644
--- a/plug-ins/common/color-to-alpha.c
+++ b/plug-ins/common/color-to-alpha.c
@@ -390,7 +390,7 @@ color_to_alpha_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -404,7 +404,7 @@ color_to_alpha_dialog (GimpDrawable *drawable)
                     G_CALLBACK (color_to_alpha_preview),
                     drawable);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/colorify.c b/plug-ins/common/colorify.c
index 87507e9..cdc3c7d 100644
--- a/plug-ins/common/colorify.c
+++ b/plug-ins/common/colorify.c
@@ -268,7 +268,7 @@ colorify_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/colormap-remap.c b/plug-ins/common/colormap-remap.c
index 03e91cd..a7d3ea5 100644
--- a/plug-ins/common/colormap-remap.c
+++ b/plug-ins/common/colormap-remap.c
@@ -611,7 +611,7 @@ remap_dialog (gint32  image_ID,
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c
index 6a0153c..2c9cc65 100644
--- a/plug-ins/common/compose.c
+++ b/plug-ins/common/compose.c
@@ -1500,7 +1500,7 @@ compose_dialog (const gchar *compose_type,
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -1512,7 +1512,7 @@ compose_dialog (const gchar *compose_type,
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
 
@@ -1554,7 +1554,7 @@ compose_dialog (const gchar *compose_type,
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -1574,7 +1574,7 @@ compose_dialog (const gchar *compose_type,
       GtkTreeModel *model;
       GdkPixbuf    *ico;
 
-      hbox = gtk_hbox_new (FALSE, 6);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
       gtk_table_attach (GTK_TABLE (table), hbox, 0, 1, j, j + 1,
                         GTK_FILL, GTK_FILL, 0, 0);
       gtk_widget_show (hbox);
diff --git a/plug-ins/common/contrast-retinex.c b/plug-ins/common/contrast-retinex.c
index 7f468c1..2f565a1 100644
--- a/plug-ins/common/contrast-retinex.c
+++ b/plug-ins/common/contrast-retinex.c
@@ -298,7 +298,7 @@ retinex_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/convolution-matrix.c b/plug-ins/common/convolution-matrix.c
index 562787b..56f9187 100644
--- a/plug-ins/common/convolution-matrix.c
+++ b/plug-ins/common/convolution-matrix.c
@@ -922,7 +922,7 @@ convolve_image_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -936,17 +936,17 @@ convolve_image_dialog (GimpDrawable *drawable)
                             G_CALLBACK (convolve_image),
                             drawable);
 
-  main_hbox = gtk_hbox_new (FALSE, 12);
+  main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (main_vbox), main_hbox, FALSE, FALSE, 0);
   gtk_widget_show (main_hbox),
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (main_hbox), vbox, TRUE, TRUE, 0);
 
   frame = gimp_frame_new (_("Matrix"));
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
-  inbox = gtk_vbox_new (FALSE, 12);
+  inbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_add (GTK_CONTAINER (frame), inbox);
 
   table = gtk_table_new (MATRIX_SIZE, MATRIX_SIZE, FALSE);
@@ -973,7 +973,7 @@ convolve_image_dialog (GimpDrawable *drawable)
 
   gtk_widget_show (table);
 
-  box = gtk_hbox_new (FALSE, 6);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (inbox), box, FALSE, FALSE, 0);
 
 
@@ -1032,7 +1032,7 @@ convolve_image_dialog (GimpDrawable *drawable)
   gtk_widget_show (inbox);
   gtk_widget_show (frame);
 
-  box = gtk_vbox_new (FALSE, 6);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, FALSE, 0);
 
   widget_set.autoset = button =
@@ -1064,13 +1064,13 @@ convolve_image_dialog (GimpDrawable *drawable)
   gtk_widget_show (box);
   gtk_widget_show (vbox);
 
-  inbox = gtk_vbox_new (FALSE, 12);
+  inbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (main_hbox), inbox, FALSE, FALSE, 0);
 
   frame = gimp_frame_new (_("Border"));
   gtk_box_pack_start (GTK_BOX (inbox), frame, FALSE, FALSE, 0);
 
-  box = gtk_vbox_new (FALSE, 2);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add (GTK_CONTAINER (frame), box);
 
   group = NULL;
@@ -1097,7 +1097,7 @@ convolve_image_dialog (GimpDrawable *drawable)
   frame = gimp_frame_new (_("Channels"));
   gtk_box_pack_start (GTK_BOX (inbox), frame, FALSE, FALSE, 0);
 
-  box = gtk_vbox_new (FALSE, 2);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add (GTK_CONTAINER (frame), box);
 
   for (i = 0; i < CHANNELS; i++)
diff --git a/plug-ins/common/cubism.c b/plug-ins/common/cubism.c
index ad2e3f4..bf36a1f 100644
--- a/plug-ins/common/cubism.c
+++ b/plug-ins/common/cubism.c
@@ -281,7 +281,7 @@ cubism_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/curve-bend.c b/plug-ins/common/curve-bend.c
index 54ddca9..ce8652d 100644
--- a/plug-ins/common/curve-bend.c
+++ b/plug-ins/common/curve-bend.c
@@ -1247,14 +1247,14 @@ bender_new_dialog (GimpDrawable *drawable)
   cd->cursor_busy = gdk_cursor_new_for_display (display, GDK_WATCH);
 
   /*  The main hbox  */
-  main_hbox = gtk_hbox_new (FALSE, 12);
+  main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (cd->shell))),
                       main_hbox, TRUE, TRUE, 0);
   gtk_widget_show (main_hbox);
 
   /* Left side column */
-  vbox =  gtk_vbox_new (FALSE, 12);
+  vbox =  gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (main_hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
@@ -1263,7 +1263,7 @@ bender_new_dialog (GimpDrawable *drawable)
   gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
-  vbox2 = gtk_vbox_new (FALSE, 6);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox2);
   gtk_widget_show (vbox2);
 
@@ -1283,7 +1283,7 @@ bender_new_dialog (GimpDrawable *drawable)
   gtk_container_add (GTK_CONTAINER (frame), cd->pv_widget);
   gtk_widget_show (cd->pv_widget);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_end (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -1311,12 +1311,12 @@ bender_new_dialog (GimpDrawable *drawable)
   gtk_box_pack_end (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
   /* Render Options  */
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -1374,7 +1374,7 @@ bender_new_dialog (GimpDrawable *drawable)
   gtk_box_pack_start (GTK_BOX (main_hbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -1394,7 +1394,7 @@ bender_new_dialog (GimpDrawable *drawable)
                     G_CALLBACK (bender_graph_events),
                     cd);
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -1428,7 +1428,7 @@ bender_new_dialog (GimpDrawable *drawable)
   gtk_widget_show (frame);
 
   /*  hbox for curve options  */
-  hbox = gtk_hbox_new (FALSE, 4);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -1482,7 +1482,7 @@ bender_new_dialog (GimpDrawable *drawable)
                     cd);
 
   /*  hbox for curve load and save  */
-  hbox = gtk_hbox_new (FALSE, 4);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c
index a0a5236..6f2c2a7 100644
--- a/plug-ins/common/decompose.c
+++ b/plug-ins/common/decompose.c
@@ -1505,7 +1505,7 @@ decompose_dialog (void)
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -1515,11 +1515,11 @@ decompose_dialog (void)
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/deinterlace.c b/plug-ins/common/deinterlace.c
index a5f18f0..9753a48 100644
--- a/plug-ins/common/deinterlace.c
+++ b/plug-ins/common/deinterlace.c
@@ -336,7 +336,7 @@ deinterlace_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/depth-merge.c b/plug-ins/common/depth-merge.c
index 7d8bc93..9c51f6f 100644
--- a/plug-ins/common/depth-merge.c
+++ b/plug-ins/common/depth-merge.c
@@ -664,14 +664,14 @@ DepthMerge_dialog (DepthMerge *dm)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
   /* Preview */
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/despeckle.c b/plug-ins/common/despeckle.c
index 13b4fe0..0a48033 100644
--- a/plug-ins/common/despeckle.c
+++ b/plug-ins/common/despeckle.c
@@ -454,7 +454,7 @@ despeckle_dialog (void)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -472,7 +472,7 @@ despeckle_dialog (void)
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c
index dcbdc50..c0160cc 100644
--- a/plug-ins/common/destripe.c
+++ b/plug-ins/common/destripe.c
@@ -453,7 +453,7 @@ destripe_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/diffraction.c b/plug-ins/common/diffraction.c
index de4b84c..d6ea7fc 100644
--- a/plug-ins/common/diffraction.c
+++ b/plug-ins/common/diffraction.c
@@ -452,7 +452,7 @@ diffraction_dialog (void)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       hbox, FALSE, FALSE, 0);
@@ -460,7 +460,7 @@ diffraction_dialog (void)
 
   /* Preview */
 
-  vbox = gtk_vbox_new (FALSE, 2);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/displace.c b/plug-ins/common/displace.c
index e4d9f3e..d86aed8 100644
--- a/plug-ins/common/displace.c
+++ b/plug-ins/common/displace.c
@@ -339,7 +339,7 @@ displace_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -457,7 +457,7 @@ displace_dialog (GimpDrawable *drawable)
                           combo,    "sensitive",
                           G_BINDING_SYNC_CREATE);
 
-  hbox = gtk_hbox_new (FALSE, 24);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 24);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/edge-dog.c b/plug-ins/common/edge-dog.c
index 8c260fd..8c75803 100644
--- a/plug-ins/common/edge-dog.c
+++ b/plug-ins/common/edge-dog.c
@@ -315,7 +315,7 @@ dog_dialog (gint32        image_ID,
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/edge-neon.c b/plug-ins/common/edge-neon.c
index 40fc24c..313ae90 100644
--- a/plug-ins/common/edge-neon.c
+++ b/plug-ins/common/edge-neon.c
@@ -709,7 +709,7 @@ neon_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/edge-sobel.c b/plug-ins/common/edge-sobel.c
index 3847491..f6b0c83 100644
--- a/plug-ins/common/edge-sobel.c
+++ b/plug-ins/common/edge-sobel.c
@@ -244,7 +244,7 @@ sobel_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/edge.c b/plug-ins/common/edge.c
index 1532b98..be48adc 100644
--- a/plug-ins/common/edge.c
+++ b/plug-ins/common/edge.c
@@ -642,7 +642,7 @@ edge_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -698,7 +698,7 @@ edge_dialog (GimpDrawable *drawable)
 
   /*  Radio buttons WRAP, SMEAR, BLACK  */
 
-  hbox = gtk_hbox_new (FALSE, 4);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_table_attach (GTK_TABLE (table), hbox, 0, 3, 2, 3,
                     GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (hbox);
diff --git a/plug-ins/common/emboss.c b/plug-ins/common/emboss.c
index ba1b1b8..0c0a608 100644
--- a/plug-ins/common/emboss.c
+++ b/plug-ins/common/emboss.c
@@ -460,7 +460,7 @@ emboss_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/engrave.c b/plug-ins/common/engrave.c
index f7f6d5a..d0645bb 100644
--- a/plug-ins/common/engrave.c
+++ b/plug-ins/common/engrave.c
@@ -222,7 +222,7 @@ engrave_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/file-aa.c b/plug-ins/common/file-aa.c
index f7f11c0..1a08cf1 100644
--- a/plug-ins/common/file-aa.c
+++ b/plug-ins/common/file-aa.c
@@ -348,7 +348,7 @@ aa_dialog (gint selected)
   /* Create the actual window. */
   dialog = gimp_export_dialog_new (_("Text"), PLUG_IN_BINARY, SAVE_PROC);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (dialog)),
                       hbox, FALSE, FALSE, 0);
diff --git a/plug-ins/common/file-csource.c b/plug-ins/common/file-csource.c
index c006384..7e8997c 100644
--- a/plug-ins/common/file-csource.c
+++ b/plug-ins/common/file-csource.c
@@ -704,7 +704,7 @@ run_save_dialog (Config *config)
 
   dialog = gimp_export_dialog_new (_("C-Source"), PLUG_IN_BINARY, SAVE_PROC);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (dialog)),
                       vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/file-gih.c b/plug-ins/common/file-gih.c
index 1bf9349..47ccef5 100644
--- a/plug-ins/common/file-gih.c
+++ b/plug-ins/common/file-gih.c
@@ -900,7 +900,7 @@ gih_save_dialog (gint32 image_ID)
   /*
    * Cell size: __ x __ pixels
    */
-  box = gtk_hbox_new (FALSE, 4);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
 
   spinbutton = gimp_spin_button_new (&adjustment,
                                      gihparams.cellwidth,
@@ -975,7 +975,7 @@ gih_save_dialog (gint32 image_ID)
   /*
    * Display as: __ rows x __ cols
    */
-  box = gtk_hbox_new (FALSE, 0);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
   g_snprintf (buffer, sizeof (buffer), "%2d", gihparams.rows);
   label = gtk_label_new (buffer);
diff --git a/plug-ins/common/file-html-table.c b/plug-ins/common/file-html-table.c
index 66a1656..82362aa 100644
--- a/plug-ins/common/file-html-table.c
+++ b/plug-ins/common/file-html-table.c
@@ -410,7 +410,7 @@ save_dialog (gint32 image_ID)
 
   dialog = gimp_export_dialog_new (_("HTML table"), PLUG_IN_BINARY, SAVE_PROC);
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (dialog)),
                       main_vbox, TRUE, TRUE, 0);
@@ -425,7 +425,7 @@ save_dialog (gint32 image_ID)
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
 
-      hbox = gtk_hbox_new (FALSE, 12);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
       gtk_container_add (GTK_CONTAINER (frame), hbox);
 
       eek = gtk_image_new_from_stock (GIMP_STOCK_WILBER_EEK,
@@ -444,7 +444,7 @@ save_dialog (gint32 image_ID)
   frame = gimp_frame_new (_("HTML Page Options"));
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/file-mng.c b/plug-ins/common/file-mng.c
index 6044ffe..6801a20 100644
--- a/plug-ins/common/file-mng.c
+++ b/plug-ins/common/file-mng.c
@@ -1334,7 +1334,7 @@ mng_save_dialog (gint32 image_id)
 
   dialog = gimp_export_dialog_new (_("MNG"), PLUG_IN_BINARY, SAVE_PROC);
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (dialog)),
                       main_vbox, TRUE, TRUE, 0);
@@ -1342,7 +1342,7 @@ mng_save_dialog (gint32 image_id)
   frame = gimp_frame_new (_("MNG Options"));
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
 
   toggle = gtk_check_button_new_with_label (_("Interlace"));
@@ -1503,7 +1503,7 @@ mng_save_dialog (gint32 image_id)
   frame = gimp_frame_new (_("Animated MNG Options"));
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
 
   toggle = gtk_check_button_new_with_label (_("Loop"));
@@ -1517,7 +1517,7 @@ mng_save_dialog (gint32 image_id)
 
   gtk_widget_show (toggle);
 
-  hbox = gtk_hbox_new (FALSE, 4);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
   label = gtk_label_new (_("Default frame delay:"));
diff --git a/plug-ins/common/file-pdf-load.c b/plug-ins/common/file-pdf-load.c
index 5a29a82..c55f780 100644
--- a/plug-ins/common/file-pdf-load.c
+++ b/plug-ins/common/file-pdf-load.c
@@ -1083,7 +1083,7 @@ load_dialog (PopplerDocument  *doc,
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       vbox, TRUE, TRUE, 0);
@@ -1136,7 +1136,7 @@ load_dialog (PopplerDocument  *doc,
 
   /* Resolution */
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/file-pdf-save.c b/plug-ins/common/file-pdf-save.c
index 4655817..2671778 100644
--- a/plug-ins/common/file-pdf-save.c
+++ b/plug-ins/common/file-pdf-save.c
@@ -701,7 +701,7 @@ gui_single (void)
 
   window = gimp_export_dialog_new ("PDF", PLUG_IN_ROLE, SAVE_PROC);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (window)),
                       vbox, TRUE, TRUE, 0);
 
@@ -763,13 +763,13 @@ gui_multi (void)
 
   window = gimp_export_dialog_new ("PDF", PLUG_IN_ROLE, SAVE_MULTI_PROC);
 
-  vbox = gtk_vbox_new (FALSE, 10);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
   gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (window)),
                       vbox, TRUE, TRUE, 0);
 
   gtk_container_set_border_width (GTK_CONTAINER (window), 12);
 
-  file_hbox = gtk_hbox_new (FALSE, 5);
+  file_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
   file_label = gtk_label_new ("Choose the place to save the file in:");
   file_entry = gtk_entry_new ();
   if (file_name != NULL)
@@ -813,7 +813,7 @@ gui_multi (void)
 
   gtk_box_pack_start (GTK_BOX (vbox), h_but_box, FALSE, FALSE, 0);
 
-  h_box = gtk_hbox_new (FALSE, 5);
+  h_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
 
   img_combo = gimp_image_combo_box_new (NULL, NULL);
   gtk_box_pack_start (GTK_BOX (h_box), img_combo, FALSE, FALSE, 0);
diff --git a/plug-ins/common/file-ps.c b/plug-ins/common/file-ps.c
index 857023b..099a82e 100644
--- a/plug-ins/common/file-ps.c
+++ b/plug-ins/common/file-ps.c
@@ -3112,7 +3112,7 @@ load_dialog (const gchar *filename,
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -3134,7 +3134,8 @@ load_dialog (const gchar *filename,
                                 dialog);
     }
 
-  hbox = gtk_hbox_new (TRUE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -3142,7 +3143,7 @@ load_dialog (const gchar *filename,
   frame = gimp_frame_new (_("Rendering"));
   gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
 
   /* Resolution/Width/Height/Pages labels */
@@ -3242,7 +3243,8 @@ load_dialog (const gchar *filename,
   gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, TRUE, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (TRUE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -3339,7 +3341,7 @@ save_dialog (void)
   dialog = gimp_export_dialog_new (_("PostScript"), PLUG_IN_BINARY, SAVE_PS_PROC);
 
   /* Main hbox */
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (dialog)),
                       hbox, FALSE, FALSE, 0);
@@ -3347,7 +3349,7 @@ save_dialog (void)
 
   for (j = 0; j < G_N_ELEMENTS (main_vbox); j++)
     {
-      main_vbox[j] = gtk_vbox_new (FALSE, 12);
+      main_vbox[j] = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
       gtk_box_pack_start (GTK_BOX (hbox), main_vbox[j], FALSE, TRUE, 0);
       gtk_widget_show (main_vbox[j]);
     }
@@ -3356,7 +3358,7 @@ save_dialog (void)
   frame = gimp_frame_new (_("Image Size"));
   gtk_box_pack_start (GTK_BOX (main_vbox[0]), frame, FALSE, TRUE, 0);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
 
   /* Width/Height/X-/Y-offset labels */
@@ -3452,7 +3454,7 @@ save_dialog (void)
   frame = gimp_frame_new (_("Output"));
   gtk_box_pack_start (GTK_BOX (main_vbox[1]), frame, TRUE, TRUE, 0);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
 
   toggle = gtk_check_button_new_with_mnemonic (_("_PostScript level 2"));
diff --git a/plug-ins/common/file-raw.c b/plug-ins/common/file-raw.c
index dc1ba9d..edc1b05 100644
--- a/plug-ins/common/file-raw.c
+++ b/plug-ins/common/file-raw.c
@@ -1067,7 +1067,7 @@ load_dialog (const gchar *filename)
                                            GTK_RESPONSE_CANCEL,
                                            -1);
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -1232,7 +1232,7 @@ save_dialog (const gchar *filename,
 
   dialog = gimp_export_dialog_new (_("Raw Image"), PLUG_IN_BINARY, SAVE_PROC);
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (dialog)),
                       main_vbox, FALSE, FALSE, 0);
diff --git a/plug-ins/common/file-svg.c b/plug-ins/common/file-svg.c
index 4acbfbe..b062617 100644
--- a/plug-ins/common/file-svg.c
+++ b/plug-ins/common/file-svg.c
@@ -759,14 +759,14 @@ load_dialog (const gchar  *filename,
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       hbox, TRUE, TRUE, 0);
   gtk_widget_show (hbox);
 
   /*  The SVG preview  */
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -818,7 +818,7 @@ load_dialog (const gchar  *filename,
                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
   gtk_widget_show (label);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_table_attach (GTK_TABLE (table), hbox, 1, 2, 0, 1,
                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
   gtk_widget_show (hbox);
@@ -828,7 +828,7 @@ load_dialog (const gchar  *filename,
   gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
   gtk_widget_show (spinbutton);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_table_attach (GTK_TABLE (table), hbox, 1, 2, 1, 2,
                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
   gtk_widget_show (hbox);
@@ -861,7 +861,7 @@ load_dialog (const gchar  *filename,
                     NULL);
 
   /*  Scale ratio  */
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_table_attach (GTK_TABLE (table), hbox, 1, 2, 2, 4,
                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
   gtk_widget_show (hbox);
diff --git a/plug-ins/common/file-tga.c b/plug-ins/common/file-tga.c
index bc7e826..c1d05dd 100644
--- a/plug-ins/common/file-tga.c
+++ b/plug-ins/common/file-tga.c
@@ -1371,7 +1371,7 @@ save_dialog (void)
 
   dialog = gimp_export_dialog_new (_("TGA"), PLUG_IN_BINARY, SAVE_PROC);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (dialog)),
                       vbox, TRUE, TRUE, 0);
@@ -1388,7 +1388,7 @@ save_dialog (void)
                     &tsvals.rle);
 
   /*  origin  */
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/file-tiff-load.c b/plug-ins/common/file-tiff-load.c
index dac17ca..32943d1 100644
--- a/plug-ins/common/file-tiff-load.c
+++ b/plug-ins/common/file-tiff-load.c
@@ -492,7 +492,7 @@ load_dialog (TIFF              *tif,
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/file-tiff-save.c b/plug-ins/common/file-tiff-save.c
index 7f2ad98..c3af7de 100644
--- a/plug-ins/common/file-tiff-save.c
+++ b/plug-ins/common/file-tiff-save.c
@@ -1061,7 +1061,7 @@ save_dialog (gboolean has_alpha,
 
   dialog = gimp_export_dialog_new (_("TIFF"), PLUG_IN_BINARY, SAVE_PROC);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (dialog)),
                       vbox, FALSE, TRUE, 0);
@@ -1111,7 +1111,7 @@ save_dialog (gboolean has_alpha,
                     &tsvals.save_transp_pixels);
 
   /* comment entry */
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/file-wmf.c b/plug-ins/common/file-wmf.c
index e9d16dc..31ef005 100644
--- a/plug-ins/common/file-wmf.c
+++ b/plug-ins/common/file-wmf.c
@@ -515,14 +515,14 @@ load_dialog (const gchar *filename)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       hbox, TRUE, TRUE, 0);
   gtk_widget_show (hbox);
 
   /*  The WMF preview  */
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -580,7 +580,7 @@ load_dialog (const gchar *filename)
                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
   gtk_widget_show (label);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_table_attach (GTK_TABLE (table), hbox, 1, 2, 0, 1,
                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
   gtk_widget_show (hbox);
@@ -590,7 +590,7 @@ load_dialog (const gchar *filename)
   gtk_box_pack_start (GTK_BOX (hbox), spinbutton, FALSE, FALSE, 0);
   gtk_widget_show (spinbutton);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_table_attach (GTK_TABLE (table), hbox, 1, 2, 1, 2,
                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
   gtk_widget_show (hbox);
@@ -623,7 +623,7 @@ load_dialog (const gchar *filename)
                     NULL);
 
   /*  Scale ratio  */
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_table_attach (GTK_TABLE (table), hbox, 1, 2, 2, 4,
                     GTK_SHRINK | GTK_FILL, GTK_SHRINK | GTK_FILL, 0, 0);
   gtk_widget_show (hbox);
diff --git a/plug-ins/common/file-xbm.c b/plug-ins/common/file-xbm.c
index 6cd39e4..bd61119 100644
--- a/plug-ins/common/file-xbm.c
+++ b/plug-ins/common/file-xbm.c
@@ -1194,7 +1194,7 @@ save_dialog (gint32 drawable_ID)
                       frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
 
   /*  X10 format  */
diff --git a/plug-ins/common/file-xmc.c b/plug-ins/common/file-xmc.c
index f299bec..8e432b9 100644
--- a/plug-ins/common/file-xmc.c
+++ b/plug-ins/common/file-xmc.c
@@ -1186,7 +1186,7 @@ save_dialog (const gint32 image_ID, GimpParamRegion *hotspotRange)
    * delay
    */
   /* spin button */
-  box = gtk_hbox_new (FALSE, 6);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_widget_show (box);
   tmpwidget = gimp_spin_button_new (&adjustment,
                                     xmcvals.delay, CURSOR_MINIMUM_DELAY,
diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c
index 1c0d344..c670d84 100644
--- a/plug-ins/common/film.c
+++ b/plug-ins/common/film.c
@@ -872,7 +872,7 @@ add_image_list (gboolean   add_box_flag,
   GtkTreeSelection *sel;
   gint              i;
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
@@ -961,13 +961,13 @@ create_selection_tab (GtkWidget *notebook,
   gint32       *image_id_list;
   gint          nimages, j;
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_notebook_append_page (GTK_NOTEBOOK (notebook), hbox,
                             gtk_label_new_with_mnemonic (_("Selection")));
   gtk_widget_show (hbox);
 
-  vbox2 = gtk_vbox_new (FALSE, 12);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE, 0);
   gtk_widget_show (vbox2);
 
@@ -978,7 +978,7 @@ create_selection_tab (GtkWidget *notebook,
   gtk_box_pack_start (GTK_BOX (vbox2), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -1040,7 +1040,7 @@ create_selection_tab (GtkWidget *notebook,
   gtk_box_pack_start (GTK_BOX (vbox2), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -1105,7 +1105,8 @@ create_selection_tab (GtkWidget *notebook,
   gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (TRUE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
 
   /* Get a list of all image names */
@@ -1135,7 +1136,7 @@ create_advanced_tab (GtkWidget *notebook)
                             gtk_label_new_with_mnemonic (_("Ad_vanced")));
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -1226,7 +1227,7 @@ create_advanced_tab (GtkWidget *notebook)
                     G_CALLBACK (gimp_double_adjustment_update),
                     &filmvals.number_height);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -1265,7 +1266,7 @@ film_dialog (gint32 image_ID)
 
   gimp_window_set_transient (GTK_WINDOW (dlg));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/filter-pack.c b/plug-ins/common/filter-pack.c
index d4fbee6..c8209da 100644
--- a/plug-ins/common/filter-pack.c
+++ b/plug-ins/common/filter-pack.c
@@ -631,7 +631,7 @@ fp_create_rough (void)
   frame = gimp_frame_new (_("Roughness"));
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -693,7 +693,7 @@ fp_create_control (void)
 
   frame = gimp_frame_new (_("Windows"));
 
-  box = gtk_vbox_new (FALSE, 6);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), box);
   gtk_widget_show (box);
 
@@ -924,7 +924,7 @@ fp_create_table_entry (GtkWidget   **box,
   GtkWidget *button;
   GtkWidget *table;
 
-  *box = gtk_vbox_new (FALSE, 1);
+  *box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
   gtk_container_set_border_width (GTK_CONTAINER (*box), PR_BX_BRDR);
   gtk_widget_show (*box);
 
@@ -1310,7 +1310,7 @@ fp_advanced_dialog (GtkWidget *parent)
                     G_CALLBACK (sub_dialog_destroy),
                     NULL);
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_container_add (GTK_CONTAINER (AW.window), hbox);
   gtk_widget_show (hbox);
@@ -1319,7 +1319,7 @@ fp_advanced_dialog (GtkWidget *parent)
   gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -1329,7 +1329,7 @@ fp_advanced_dialog (GtkWidget *parent)
   gtk_box_pack_start (GTK_BOX (vbox), graphFrame, FALSE, FALSE, 0);
   gtk_widget_show (graphFrame);
 
-  inner_vbox = gtk_vbox_new (FALSE, 0);
+  inner_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (graphFrame), inner_vbox);
   gtk_widget_show (inner_vbox);
 
@@ -1337,7 +1337,7 @@ fp_advanced_dialog (GtkWidget *parent)
   gtk_box_pack_start (GTK_BOX (inner_vbox), alignment, TRUE, TRUE, 0);
   gtk_widget_show (alignment);
 
-  innermost_vbox = gtk_vbox_new (FALSE, 0);
+  innermost_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (alignment), innermost_vbox);
   gtk_widget_show (innermost_vbox);
 
@@ -1418,7 +1418,7 @@ fp_advanced_dialog (GtkWidget *parent)
   gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/fractal-trace.c b/plug-ins/common/fractal-trace.c
index 6ed8598..47331e3 100644
--- a/plug-ins/common/fractal-trace.c
+++ b/plug-ins/common/fractal-trace.c
@@ -704,13 +704,13 @@ dialog_show (void)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  mainbox = gtk_vbox_new (FALSE, 12);
+  mainbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (mainbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       mainbox, TRUE, TRUE, 0);
   gtk_widget_show (mainbox);
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (mainbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c
index 88f1e01..effd12a 100644
--- a/plug-ins/common/grid.c
+++ b/plug-ins/common/grid.c
@@ -653,7 +653,7 @@ dialog (gint32        image_ID,
   gimp_image_get_resolution (image_ID, &xres, &yres);
   unit = gimp_image_get_unit (image_ID);
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
                       main_vbox, TRUE, TRUE, 0);
@@ -667,7 +667,7 @@ dialog (gint32        image_ID,
                     G_CALLBACK (update_preview),
                     drawable);
 
-  vbox = gtk_vbox_new (FALSE, 2);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/hot.c b/plug-ins/common/hot.c
index e157dd7..4fcdcf7 100644
--- a/plug-ins/common/hot.c
+++ b/plug-ins/common/hot.c
@@ -600,13 +600,13 @@ plugin_dialog (piArgs *argp)
 
   gimp_window_set_transient (GTK_WINDOW (dlg));
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
                       hbox, TRUE, TRUE, 0);
   gtk_widget_show (hbox);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/illusion.c b/plug-ins/common/illusion.c
index 60d8f39..99d4dd1 100644
--- a/plug-ins/common/illusion.c
+++ b/plug-ins/common/illusion.c
@@ -363,7 +363,7 @@ illusion_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/iwarp.c b/plug-ins/common/iwarp.c
index 69f79ef..072bd2c 100644
--- a/plug-ins/common/iwarp.c
+++ b/plug-ins/common/iwarp.c
@@ -1022,7 +1022,7 @@ iwarp_animate_dialog (GtkWidget *dialog,
   GtkWidget *button;
   GtkObject *scale_data;
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 
   frame = gimp_frame_new (NULL);
@@ -1098,14 +1098,15 @@ iwarp_settings_dialog (GtkWidget *dialog,
   GtkWidget *widget[3];
   gint       i;
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 
   frame = gimp_frame_new (_("Deform Mode"));
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (TRUE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
 
@@ -1126,7 +1127,7 @@ iwarp_settings_dialog (GtkWidget *dialog,
   gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE, 0);
   gtk_widget_show (vbox2);
 
-  vbox3 = gtk_vbox_new (FALSE, 2);
+  vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_box_pack_start (GTK_BOX (hbox), vbox3, TRUE, TRUE, 0);
   gtk_widget_show (vbox3);
 
@@ -1311,13 +1312,13 @@ iwarp_dialog (void)
                     G_CALLBACK (gtk_main_quit),
                     NULL);
 
-  main_hbox = gtk_hbox_new (FALSE, 12);
+  main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_hbox, TRUE, TRUE, 0);
   gtk_widget_show (main_hbox);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (main_hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/jigsaw.c b/plug-ins/common/jigsaw.c
index d509a50..9574afb 100644
--- a/plug-ins/common/jigsaw.c
+++ b/plug-ins/common/jigsaw.c
@@ -2430,7 +2430,7 @@ jigsaw_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/lcms.c b/plug-ins/common/lcms.c
index 61d8820..d2661d8 100644
--- a/plug-ins/common/lcms.c
+++ b/plug-ins/common/lcms.c
@@ -1145,7 +1145,7 @@ lcms_icc_profile_src_label_new (gint32       image,
   gchar     *desc;
   gchar     *text;
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 
   name = gimp_image_get_name (image);
   text = g_strdup_printf (_("The image '%s' has an embedded color profile:"),
@@ -1245,7 +1245,7 @@ lcms_icc_apply_dialog (gint32       image,
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       vbox, TRUE, TRUE, 0);
@@ -1471,7 +1471,7 @@ lcms_dialog (GimpColorConfig *config,
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -1508,11 +1508,11 @@ lcms_dialog (GimpColorConfig *config,
       GtkWidget *hbox;
       GtkWidget *toggle;
 
-      vbox = gtk_vbox_new (FALSE, 6);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
       gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
       gtk_widget_show (vbox);
 
-      hbox = gtk_hbox_new (FALSE, 6);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
       gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/lens-apply.c b/plug-ins/common/lens-apply.c
index 8a2bcd9..ef564d3 100644
--- a/plug-ins/common/lens-apply.c
+++ b/plug-ins/common/lens-apply.c
@@ -407,7 +407,7 @@ lens_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -421,7 +421,7 @@ lens_dialog (GimpDrawable *drawable)
                             G_CALLBACK (drawlens),
                             drawable);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -471,7 +471,7 @@ lens_dialog (GimpDrawable *drawable)
                                 preview);
   }
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
 
   label = gtk_label_new_with_mnemonic (_("_Lens refraction index:"));
diff --git a/plug-ins/common/lens-distortion.c b/plug-ins/common/lens-distortion.c
index c05e7ec..121bff8 100644
--- a/plug-ins/common/lens-distortion.c
+++ b/plug-ins/common/lens-distortion.c
@@ -496,7 +496,7 @@ lens_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/lens-flare.c b/plug-ins/common/lens-flare.c
index 3f97de8..054a2ca 100644
--- a/plug-ins/common/lens-flare.c
+++ b/plug-ins/common/lens-flare.c
@@ -314,7 +314,7 @@ flare_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -750,7 +750,7 @@ flare_center_create (GimpDrawable *drawable,
                             G_CALLBACK (g_free),
                             center);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/mail.c b/plug-ins/common/mail.c
index b52610c..caf4a46 100644
--- a/plug-ins/common/mail.c
+++ b/plug-ins/common/mail.c
@@ -420,7 +420,7 @@ save_dialog (void)
 
   gimp_window_set_transient (GTK_WINDOW (dlg));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/max-rgb.c b/plug-ins/common/max-rgb.c
index 8a92072..135902f 100644
--- a/plug-ins/common/max-rgb.c
+++ b/plug-ins/common/max-rgb.c
@@ -272,7 +272,7 @@ max_rgb_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/mosaic.c b/plug-ins/common/mosaic.c
index 6a54843..ffe4ab5 100644
--- a/plug-ins/common/mosaic.c
+++ b/plug-ins/common/mosaic.c
@@ -606,7 +606,7 @@ mosaic_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -621,7 +621,7 @@ mosaic_dialog (GimpDrawable *drawable)
                             drawable);
 
   /*  The hbox -- splits the scripts and the info vbox  */
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -725,7 +725,7 @@ mosaic_dialog (GimpDrawable *drawable)
                             preview);
 
   /*  the vertical box and its toggle buttons  */
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/newsprint.c b/plug-ins/common/newsprint.c
index 3c97c47..5b69c50 100644
--- a/plug-ins/common/newsprint.c
+++ b/plug-ins/common/newsprint.c
@@ -977,7 +977,7 @@ new_channel (const chan_tmpl *ct, GtkWidget *preview)
   /* create the channel state record */
   chst = new_preview (ct->spotfn);
 
-  chst->vbox = gtk_vbox_new (FALSE, 6);
+  chst->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_set_border_width (GTK_CONTAINER (chst->vbox), 12);
 
   table = gtk_table_new (1, 3, FALSE);
@@ -1007,7 +1007,7 @@ new_channel (const chan_tmpl *ct, GtkWidget *preview)
                             preview);
 
   /* spot function popup */
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (chst->vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -1015,7 +1015,7 @@ new_channel (const chan_tmpl *ct, GtkWidget *preview)
   gtk_box_pack_start (GTK_BOX (hbox), abox, FALSE, FALSE, 0);
   gtk_widget_show (abox);
 
-  hbox2 = gtk_hbox_new (FALSE, 6);
+  hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_add (GTK_CONTAINER (abox), hbox2);
   gtk_widget_show (hbox2);
 
@@ -1198,11 +1198,11 @@ newsprint_dialog (GimpDrawable *drawable)
                       paned, TRUE, TRUE, 0);
   gtk_widget_show (paned);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_paned_pack1 (GTK_PANED (paned), hbox, TRUE, FALSE);
   gtk_widget_show (hbox);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
   gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
@@ -1215,16 +1215,16 @@ newsprint_dialog (GimpDrawable *drawable)
                             G_CALLBACK (newsprint),
                             drawable);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_paned_pack2 (GTK_PANED (paned), hbox, FALSE, FALSE);
   gtk_widget_show (hbox);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
@@ -1291,7 +1291,7 @@ newsprint_dialog (GimpDrawable *drawable)
   frame = gimp_frame_new (_("Screen"));
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
-  st.vbox = gtk_vbox_new (FALSE, 12);
+  st.vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_add (GTK_CONTAINER (frame), st.vbox);
 
   /* optional portion begins */
@@ -1323,7 +1323,7 @@ newsprint_dialog (GimpDrawable *drawable)
                                 preview);
 
       /* RGB / CMYK / Luminance select */
-      hbox = gtk_hbox_new (FALSE, 6);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
       gtk_box_pack_start (GTK_BOX (st.vbox), hbox, FALSE, FALSE, 0);
 
       /*  pack the scaleentry table  */
diff --git a/plug-ins/common/nl-filter.c b/plug-ins/common/nl-filter.c
index d391aa6..65c6686 100644
--- a/plug-ins/common/nl-filter.c
+++ b/plug-ins/common/nl-filter.c
@@ -1030,7 +1030,7 @@ nlfilter_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/noise-hsv.c b/plug-ins/common/noise-hsv.c
index 5c3112f..d9f644e 100644
--- a/plug-ins/common/noise-hsv.c
+++ b/plug-ins/common/noise-hsv.c
@@ -377,7 +377,7 @@ scatter_hsv_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/noise-randomize.c b/plug-ins/common/noise-randomize.c
index e20085a..d7fc400 100644
--- a/plug-ins/common/noise-randomize.c
+++ b/plug-ins/common/noise-randomize.c
@@ -745,7 +745,7 @@ randomize_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dlg));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/noise-rgb.c b/plug-ins/common/noise-rgb.c
index 5d7928a..bb7532a 100644
--- a/plug-ins/common/noise-rgb.c
+++ b/plug-ins/common/noise-rgb.c
@@ -463,7 +463,7 @@ noisify_dialog (GimpDrawable *drawable,
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -477,7 +477,7 @@ noisify_dialog (GimpDrawable *drawable,
                     G_CALLBACK (noisify),
                     NULL);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (main_vbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/noise-solid.c b/plug-ins/common/noise-solid.c
index 4bebfe5..72354c9 100644
--- a/plug-ins/common/noise-solid.c
+++ b/plug-ins/common/noise-solid.c
@@ -576,7 +576,7 @@ solid_noise_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/noise-spread.c b/plug-ins/common/noise-spread.c
index 5248f8f..62f2b2a 100644
--- a/plug-ins/common/noise-spread.c
+++ b/plug-ins/common/noise-spread.c
@@ -357,7 +357,7 @@ spread_dialog (gint32        image_ID,
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/nova.c b/plug-ins/common/nova.c
index ff7a19c..43f1897 100644
--- a/plug-ins/common/nova.c
+++ b/plug-ins/common/nova.c
@@ -312,7 +312,7 @@ nova_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -440,7 +440,7 @@ nova_center_create (GimpDrawable *drawable,
                             G_CALLBACK (g_free),
                             center);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/oilify.c b/plug-ins/common/oilify.c
index b38b48f..beb77e2 100644
--- a/plug-ins/common/oilify.c
+++ b/plug-ins/common/oilify.c
@@ -791,7 +791,7 @@ oilify_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/photocopy.c b/plug-ins/common/photocopy.c
index b8ff649..b39ef91 100644
--- a/plug-ins/common/photocopy.c
+++ b/plug-ins/common/photocopy.c
@@ -853,7 +853,7 @@ photocopy_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/pixelize.c b/plug-ins/common/pixelize.c
index 885bf82..da85c17 100644
--- a/plug-ins/common/pixelize.c
+++ b/plug-ins/common/pixelize.c
@@ -329,7 +329,7 @@ pixelize_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/plasma.c b/plug-ins/common/plasma.c
index 6377104..62690e4 100644
--- a/plug-ins/common/plasma.c
+++ b/plug-ins/common/plasma.c
@@ -313,7 +313,7 @@ plasma_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/polar-coords.c b/plug-ins/common/polar-coords.c
index d15a659..5cce828 100644
--- a/plug-ins/common/polar-coords.c
+++ b/plug-ins/common/polar-coords.c
@@ -606,7 +606,7 @@ polarize_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -654,7 +654,8 @@ polarize_dialog (GimpDrawable *drawable)
                             preview);
 
   /* togglebuttons for backwards, top, polar->rectangular */
-  hbox = gtk_hbox_new (TRUE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
 
   toggle = gtk_check_button_new_with_mnemonic (_("_Map backwards"));
diff --git a/plug-ins/common/qbist.c b/plug-ins/common/qbist.c
index afcadab..5c4380e 100644
--- a/plug-ins/common/qbist.c
+++ b/plug-ins/common/qbist.c
@@ -823,7 +823,7 @@ dialog_run (void)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       vbox, FALSE, FALSE, 0);
diff --git a/plug-ins/common/red-eye-removal.c b/plug-ins/common/red-eye-removal.c
index 7092c47..b7f1f73 100644
--- a/plug-ins/common/red-eye-removal.c
+++ b/plug-ins/common/red-eye-removal.c
@@ -153,7 +153,7 @@ dialog (gint32        image_id,
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/ripple.c b/plug-ins/common/ripple.c
index acad7e6..1588eb4 100644
--- a/plug-ins/common/ripple.c
+++ b/plug-ins/common/ripple.c
@@ -499,7 +499,7 @@ ripple_dialog (GimpDrawable *drawable)
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
   /*  The main vbox  */
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -525,7 +525,7 @@ ripple_dialog (GimpDrawable *drawable)
                     GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
   gtk_widget_show (frame);
 
-  toggle_vbox = gtk_vbox_new (FALSE, 6);
+  toggle_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), toggle_vbox);
   gtk_widget_show (toggle_vbox);
 
diff --git a/plug-ins/common/sample-colorize.c b/plug-ins/common/sample-colorize.c
index 6392139..42ca3fc 100644
--- a/plug-ins/common/sample-colorize.c
+++ b/plug-ins/common/sample-colorize.c
@@ -1402,7 +1402,7 @@ smp_dialog (void)
   ty++;
 
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_table_attach (GTK_TABLE (table), hbox, 0, 2, ty, ty + 1,
                     GTK_FILL, 0, 0, 0);
   gtk_widget_show (hbox);
@@ -1429,7 +1429,7 @@ smp_dialog (void)
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
                                 g_di.dst_show_color);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_table_attach (GTK_TABLE (table), hbox, 3, 5, ty, ty + 1,
                     GTK_FILL, 0, 0, 0);
   gtk_widget_show (hbox);
@@ -1491,7 +1491,7 @@ smp_dialog (void)
   /*  The levels graylevel prevev  */
   frame = gtk_frame_new (NULL);
 
-  vbox2 = gtk_vbox_new (FALSE, 2);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add (GTK_CONTAINER (frame), vbox2);
   gtk_table_attach (GTK_TABLE (table),
                     frame, 0, 2, ty, ty + 1, 0, 0, 0, 0);
@@ -1525,7 +1525,7 @@ smp_dialog (void)
   /*  The sample_colortable prevev  */
   frame = gtk_frame_new (NULL);
 
-  vbox2 = gtk_vbox_new (FALSE, 2);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add (GTK_CONTAINER (frame), vbox2);
   gtk_table_attach (GTK_TABLE (table),
                     frame, 3, 5, ty, ty + 1, 0, 0, 0, 0);
@@ -1555,7 +1555,8 @@ smp_dialog (void)
   ty++;
 
   /*  Horizontal box for INPUT levels text widget  */
-  hbox = gtk_hbox_new (TRUE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_table_attach (GTK_TABLE (table), hbox, 0, 2, ty, ty+1,
                     GTK_FILL, 0, 0, 0);
 
@@ -1605,7 +1606,8 @@ smp_dialog (void)
   gtk_widget_show (hbox);
 
   /*  Horizontal box for OUTPUT levels text widget  */
-  hbox = gtk_hbox_new (TRUE, 4);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_table_attach (GTK_TABLE (table), hbox, 3, 5, ty, ty+1,
                     GTK_FILL, 0, 0, 0);
 
@@ -1643,7 +1645,7 @@ smp_dialog (void)
 
   ty++;
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_table_attach (GTK_TABLE (table), hbox, 0, 2, ty, ty+1,
                     GTK_FILL, 0, 0, 0);
   gtk_widget_show (hbox);
@@ -1672,7 +1674,7 @@ smp_dialog (void)
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button),
                                 g_values.orig_inten);
 
-  hbox = gtk_hbox_new (FALSE, 4);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_table_attach (GTK_TABLE (table), hbox, 3, 5, ty, ty+1,
                     GTK_FILL, 0, 0, 0);
   gtk_widget_show (hbox);
diff --git a/plug-ins/common/screenshot.c b/plug-ins/common/screenshot.c
index f58c3e3..f511bd4 100644
--- a/plug-ins/common/screenshot.c
+++ b/plug-ins/common/screenshot.c
@@ -1107,7 +1107,7 @@ shoot_dialog (GdkScreen **screen)
       g_object_unref (pixbuf);
     }
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, FALSE, FALSE, 0);
@@ -1137,7 +1137,7 @@ shoot_dialog (GdkScreen **screen)
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -1159,7 +1159,7 @@ shoot_dialog (GdkScreen **screen)
 
 #ifdef HAVE_X11_XMU_WINUTIL_H
   /*  window decorations  */
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -1198,7 +1198,7 @@ shoot_dialog (GdkScreen **screen)
 
 #ifdef HAVE_XFIXES
   /*  mouse pointer  */
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -1242,11 +1242,11 @@ shoot_dialog (GdkScreen **screen)
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/sharpen.c b/plug-ins/common/sharpen.c
index 113a99b..1ddf463 100644
--- a/plug-ins/common/sharpen.c
+++ b/plug-ins/common/sharpen.c
@@ -486,7 +486,7 @@ sharpen_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/shift.c b/plug-ins/common/shift.c
index 615812d..c5218bb 100644
--- a/plug-ins/common/shift.c
+++ b/plug-ins/common/shift.c
@@ -369,7 +369,7 @@ shift_dialog (gint32        image_ID,
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/sinus.c b/plug-ins/common/sinus.c
index 19c79ab..c46c048 100644
--- a/plug-ins/common/sinus.c
+++ b/plug-ins/common/sinus.c
@@ -662,7 +662,7 @@ sinus_dialog (void)
 
   gimp_window_set_transient (GTK_WINDOW (dlg));
 
-  main_hbox = gtk_hbox_new (FALSE, 12);
+  main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
                       main_hbox, TRUE, TRUE, 0);
@@ -670,7 +670,7 @@ sinus_dialog (void)
 
   /* Create preview */
   /* ============== */
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (main_hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -685,7 +685,7 @@ sinus_dialog (void)
 
   /* Create the drawing settings frame */
   /* ================================= */
-  page = gtk_vbox_new (FALSE, 12);
+  page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 
   frame = gimp_frame_new (_("Drawing Settings"));
@@ -730,7 +730,7 @@ sinus_dialog (void)
   gtk_box_pack_start (GTK_BOX (page), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -775,7 +775,7 @@ sinus_dialog (void)
 
   /* Color settings dialog: */
   /* ====================== */
-  page = gtk_vbox_new (FALSE, 12);
+  page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 
   if (drawable_is_grayscale)
@@ -784,7 +784,7 @@ sinus_dialog (void)
       gtk_box_pack_start(GTK_BOX(page), frame, FALSE, FALSE, 0);
       gtk_widget_show (frame);
 
-      vbox = gtk_vbox_new (FALSE, 6);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
       gtk_container_add (GTK_CONTAINER (frame), vbox);
       gtk_widget_show (vbox);
 
@@ -814,7 +814,7 @@ sinus_dialog (void)
 
       vbox = gtk_bin_get_child (GTK_BIN (frame));
 
-      hbox = gtk_hbox_new (FALSE, 12);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
       push_col1 = gimp_color_button_new (_("First color"), 32, 32,
@@ -890,14 +890,14 @@ sinus_dialog (void)
 
   /* blend settings dialog: */
   /* ====================== */
-  page = gtk_vbox_new (FALSE, 12);
+  page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 
   frame = gimp_frame_new (_("Blend Settings"));
   gtk_box_pack_start (GTK_BOX (page), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -1033,7 +1033,7 @@ mw_preview_new (GtkWidget *parent,
   GtkWidget *vbox;
   GtkWidget *button;
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (parent), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/softglow.c b/plug-ins/common/softglow.c
index e180453..57ca563 100644
--- a/plug-ins/common/softglow.c
+++ b/plug-ins/common/softglow.c
@@ -646,7 +646,7 @@ softglow_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c
index 8c99041..fc26bd1 100644
--- a/plug-ins/common/sparkle.c
+++ b/plug-ins/common/sparkle.c
@@ -350,7 +350,7 @@ sparkle_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -488,11 +488,11 @@ sparkle_dialog (GimpDrawable *drawable)
                             G_CALLBACK (gimp_preview_invalidate),
                             preview);
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  vbox = gtk_vbox_new (FALSE, 2);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/sphere-designer.c b/plug-ins/common/sphere-designer.c
index e628ce5..56a7e77 100644
--- a/plug-ins/common/sphere-designer.c
+++ b/plug-ins/common/sphere-designer.c
@@ -2570,17 +2570,17 @@ makewindow (void)
                     G_CALLBACK (sphere_response),
                     NULL);
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
                       main_vbox, TRUE, TRUE, 0);
   gtk_widget_show (main_vbox);
 
-  main_hbox = gtk_hbox_new (FALSE, 12);
+  main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (main_vbox), main_hbox, TRUE, TRUE, 0);
   gtk_widget_show (main_hbox);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (main_hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -2597,7 +2597,8 @@ makewindow (void)
   g_signal_connect (drawarea, "expose-event",
                     G_CALLBACK (expose_event), NULL);
 
-  hbox = gtk_hbox_new (TRUE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -2617,7 +2618,7 @@ makewindow (void)
                     G_CALLBACK (savepreset),
                     window);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_end (GTK_BOX (main_hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
@@ -2654,7 +2655,8 @@ makewindow (void)
                                                   NULL);
   gtk_tree_view_append_column (texturelist, col);
 
-  hbox = gtk_hbox_new (TRUE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -2676,7 +2678,7 @@ makewindow (void)
                             G_CALLBACK (deltexture), NULL);
   gtk_widget_show (button);
 
-  main_hbox = gtk_hbox_new (FALSE, 12);
+  main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (main_vbox), main_hbox, FALSE, FALSE, 0);
   gtk_widget_show (main_hbox);
 
@@ -2684,7 +2686,7 @@ makewindow (void)
   gtk_box_pack_start (GTK_BOX (main_hbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -2726,7 +2728,7 @@ makewindow (void)
                              _("Texture:"), 0.0, 0.5,
                              texturemenu, 2, FALSE);
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gimp_table_attach_aligned (GTK_TABLE (table), 0, 2,
                              _("Colors:"), 0.0, 0.5,
                              hbox, 2, FALSE);
@@ -2786,7 +2788,7 @@ makewindow (void)
   gtk_box_pack_start (GTK_BOX (main_hbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/threshold-alpha.c b/plug-ins/common/threshold-alpha.c
index 85e275a..5168ecc 100644
--- a/plug-ins/common/threshold-alpha.c
+++ b/plug-ins/common/threshold-alpha.c
@@ -261,7 +261,7 @@ threshold_alpha_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/tile-glass.c b/plug-ins/common/tile-glass.c
index 6d9b6f7..ca47f66 100644
--- a/plug-ins/common/tile-glass.c
+++ b/plug-ins/common/tile-glass.c
@@ -263,7 +263,7 @@ glasstile_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/tile-paper.c b/plug-ins/common/tile-paper.c
index cdcab77..5ba1a3d 100644
--- a/plug-ins/common/tile-paper.c
+++ b/plug-ins/common/tile-paper.c
@@ -256,14 +256,14 @@ open_dialog (void)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_hbox = gtk_hbox_new (FALSE, 12);
+  main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_hbox, TRUE, TRUE, 0);
   gtk_widget_show (main_hbox);
 
   /* Left */
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (main_hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -344,7 +344,7 @@ open_dialog (void)
                     &p.params.centering);
 
   /* Right */
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (main_hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/tile-small.c b/plug-ins/common/tile-small.c
index 0f01ad9..c39abe1 100644
--- a/plug-ins/common/tile-small.c
+++ b/plug-ins/common/tile-small.c
@@ -384,17 +384,17 @@ tileit_dialog (void)
 
   gimp_window_set_transient (GTK_WINDOW (dlg));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
                       main_vbox, TRUE, TRUE, 0);
   gtk_widget_show (main_vbox);
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -422,11 +422,12 @@ tileit_dialog (void)
   gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
-  hbox = gtk_hbox_new (TRUE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/tile.c b/plug-ins/common/tile.c
index 22bbe75..131bd83 100644
--- a/plug-ins/common/tile.c
+++ b/plug-ins/common/tile.c
@@ -415,7 +415,7 @@ tile_dialog (gint32 image_ID,
 
   gimp_window_set_transient (GTK_WINDOW (dlg));
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
                       vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/unsharp-mask.c b/plug-ins/common/unsharp-mask.c
index 0a45145..539ce2b 100644
--- a/plug-ins/common/unsharp-mask.c
+++ b/plug-ins/common/unsharp-mask.c
@@ -843,7 +843,7 @@ unsharp_mask_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/value-propagate.c b/plug-ins/common/value-propagate.c
index 6d80607..7a823a4 100644
--- a/plug-ins/common/value-propagate.c
+++ b/plug-ins/common/value-propagate.c
@@ -1099,7 +1099,7 @@ vpropagate_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -1113,7 +1113,7 @@ vpropagate_dialog (GimpDrawable *drawable)
                             G_CALLBACK (value_propagate_body),
                             drawable);
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -1122,7 +1122,7 @@ vpropagate_dialog (GimpDrawable *drawable)
   gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  toggle_vbox = gtk_vbox_new (FALSE, 2);
+  toggle_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add (GTK_CONTAINER (frame), toggle_vbox);
   gtk_widget_show (toggle_vbox);
 
diff --git a/plug-ins/common/van-gogh-lic.c b/plug-ins/common/van-gogh-lic.c
index 5ca38c9..c2f6cd7 100644
--- a/plug-ins/common/van-gogh-lic.c
+++ b/plug-ins/common/van-gogh-lic.c
@@ -657,13 +657,13 @@ create_main_dialog (void)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/common/video.c b/plug-ins/common/video.c
index f0d9b1d..fdd4462 100644
--- a/plug-ins/common/video.c
+++ b/plug-ins/common/video.c
@@ -2030,7 +2030,7 @@ video_dialog (void)
 
   gimp_window_set_transient (GTK_WINDOW (dlg));
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
                       hbox, TRUE, TRUE, 0);
@@ -2042,7 +2042,7 @@ video_dialog (void)
   gtk_widget_show (frame);
 
   /* vbox for RGB pattern typees */
-  vbox = gtk_vbox_new (FALSE, 2);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -2067,7 +2067,7 @@ video_dialog (void)
     }
 
   /* vbox for preview and toggles */
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/common/warp.c b/plug-ins/common/warp.c
index 6b1c5eb..b136038 100644
--- a/plug-ins/common/warp.c
+++ b/plug-ins/common/warp.c
@@ -389,7 +389,7 @@ warp_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dlg));
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dlg))),
                       vbox, TRUE, TRUE, 0);
@@ -464,7 +464,7 @@ warp_dialog (GimpDrawable *drawable)
                     GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (label);
 
-  toggle_hbox = gtk_hbox_new (FALSE, 6);
+  toggle_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_table_attach (GTK_TABLE (table), toggle_hbox, 1, 3, 2, 3,
                     GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (toggle_hbox);
@@ -601,7 +601,7 @@ warp_dialog (GimpDrawable *drawable)
   gtk_widget_show (combo);
 
   /*  Magnitude Usage  */
-  toggle_hbox = gtk_hbox_new (FALSE, 4);
+  toggle_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (toggle_hbox), 1);
   gtk_table_attach (GTK_TABLE (table), toggle_hbox, 2, 3, 2, 3,
                     GTK_FILL, GTK_FILL, 0, 0);
diff --git a/plug-ins/common/waves.c b/plug-ins/common/waves.c
index 04e7189..ae73713 100644
--- a/plug-ins/common/waves.c
+++ b/plug-ins/common/waves.c
@@ -262,7 +262,7 @@ waves_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/web-page.c b/plug-ins/common/web-page.c
index ba147ed..1c7a394 100644
--- a/plug-ins/common/web-page.c
+++ b/plug-ins/common/web-page.c
@@ -246,13 +246,13 @@ webpage_dialog (void)
                                            -1);
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -260,7 +260,7 @@ webpage_dialog (void)
   gtk_box_pack_start (GTK_BOX (vbox), image, FALSE, FALSE, 0);
   gtk_widget_show (image);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
@@ -282,7 +282,7 @@ webpage_dialog (void)
   sizegroup = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
   /* Width */
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox),
                       hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
@@ -301,7 +301,7 @@ webpage_dialog (void)
   gtk_widget_show (spinbutton);
 
   /* Font size */
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox),
                       hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
diff --git a/plug-ins/common/whirl-pinch.c b/plug-ins/common/whirl-pinch.c
index e0633cd..b774d39 100644
--- a/plug-ins/common/whirl-pinch.c
+++ b/plug-ins/common/whirl-pinch.c
@@ -542,7 +542,7 @@ whirl_pinch_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/common/wind.c b/plug-ins/common/wind.c
index 0f6a438..be7e58a 100644
--- a/plug-ins/common/wind.c
+++ b/plug-ins/common/wind.c
@@ -894,7 +894,7 @@ dialog_box (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/file-bmp/bmp-write.c b/plug-ins/file-bmp/bmp-write.c
index 52e7a9f..53cffed 100644
--- a/plug-ins/file-bmp/bmp-write.c
+++ b/plug-ins/file-bmp/bmp-write.c
@@ -850,7 +850,7 @@ save_dialog (gint channels)
 
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 
-  vbox_main = gtk_vbox_new (FALSE, 12);
+  vbox_main = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox_main), 12);
   gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (dialog)),
                       vbox_main, TRUE, TRUE, 0);
@@ -875,7 +875,7 @@ save_dialog (gint channels)
   gtk_box_pack_start (GTK_BOX (vbox_main), expander, TRUE, TRUE, 0);
   gtk_widget_show (expander);
 
-  vbox2 = gtk_vbox_new (FALSE, 12);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox2), 12);
   gtk_container_add (GTK_CONTAINER (expander), vbox2);
   gtk_widget_show (vbox2);
@@ -906,7 +906,7 @@ save_dialog (gint channels)
   if (channels < 3)
     gtk_widget_set_sensitive (expander, FALSE);
 
-  vbox2 = gtk_vbox_new (FALSE, 12);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox2), 12);
   gtk_container_add (GTK_CONTAINER (expander), vbox2);
   gtk_widget_show (vbox2);
@@ -917,7 +917,7 @@ save_dialog (gint channels)
   gtk_box_pack_start (GTK_BOX (vbox2), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -970,7 +970,7 @@ save_dialog (gint channels)
   gtk_box_pack_start (GTK_BOX (vbox2), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/file-fits/fits.c b/plug-ins/file-fits/fits.c
index 94851ea..67d4a8c 100644
--- a/plug-ins/file-fits/fits.c
+++ b/plug-ins/file-fits/fits.c
@@ -1007,7 +1007,7 @@ load_dialog (void)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/file-ico/ico-dialog.c b/plug-ins/file-ico/ico-dialog.c
index 6d95862..49f810b 100644
--- a/plug-ins/file-ico/ico-dialog.c
+++ b/plug-ins/file-ico/ico-dialog.c
@@ -64,7 +64,7 @@ ico_dialog_new (IcoSaveInfo *info)
 
   g_object_set_data (G_OBJECT (dialog), "save_info", info);
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (dialog)),
                       main_vbox, TRUE, TRUE, 0);
@@ -80,7 +80,7 @@ ico_dialog_new (IcoSaveInfo *info)
   gtk_container_add (GTK_CONTAINER (frame), scrolledwindow);
   gtk_widget_show (scrolledwindow);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
   g_object_set_data (G_OBJECT (dialog), "icons_vbox", vbox);
   gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow),
@@ -135,7 +135,7 @@ ico_create_icon_hbox (GtkWidget   *icon_preview,
   GtkWidget *combo;
   GtkWidget *checkbox;
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 
   alignment = gtk_alignment_new (1.0, 0.5, 0, 0);
   gtk_box_pack_start (GTK_BOX (hbox), alignment, FALSE, FALSE, 0);
@@ -158,7 +158,7 @@ ico_create_icon_hbox (GtkWidget   *icon_preview,
 
   gtk_size_group_add_widget (size, alignment);
 
-  vbox = gtk_vbox_new (FALSE, 2);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/file-jpeg/jpeg-exif.c b/plug-ins/file-jpeg/jpeg-exif.c
index c49e464..bc6787d 100644
--- a/plug-ins/file-jpeg/jpeg-exif.c
+++ b/plug-ins/file-jpeg/jpeg-exif.c
@@ -365,13 +365,13 @@ jpeg_exif_rotate_query_dialog (gint32 image_ID)
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -403,7 +403,7 @@ jpeg_exif_rotate_query_dialog (gint32 image_ID)
       g_free (name);
     }
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-save.c
index 9ea465c..912d7d7 100644
--- a/plug-ins/file-jpeg/jpeg-save.c
+++ b/plug-ins/file-jpeg/jpeg-save.c
@@ -848,7 +848,7 @@ save_dialog (void)
 
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (dialog)),
                       vbox, TRUE, TRUE, 0);
@@ -906,7 +906,7 @@ save_dialog (void)
   gtk_box_pack_start (GTK_BOX (vbox), expander, TRUE, TRUE, 0);
   gtk_widget_show (expander);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_add (GTK_CONTAINER (expander), vbox);
   gtk_widget_show (vbox);
 
@@ -1175,7 +1175,7 @@ save_dialog (void)
 
   g_object_unref (text_buffer);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_content_area (dialog)),
                       vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c
index 8be9de0..6610b98 100644
--- a/plug-ins/flame/flame.c
+++ b/plug-ins/flame/flame.c
@@ -660,7 +660,7 @@ edit_callback (GtkWidget *widget,
                         G_CALLBACK (edit_response),
                         edit_dialog);
 
-      main_vbox = gtk_vbox_new (FALSE, 12);
+      main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
       gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
       gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (edit_dialog))),
                           main_vbox, FALSE, FALSE, 0);
@@ -705,7 +705,7 @@ edit_callback (GtkWidget *widget,
       gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
       gtk_widget_show (frame);
 
-      vbox = gtk_vbox_new (FALSE, 6);
+      vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
       gtk_container_add (GTK_CONTAINER (frame), vbox);
       gtk_widget_show (vbox);
 
@@ -728,7 +728,7 @@ edit_callback (GtkWidget *widget,
                         G_CALLBACK (set_edit_preview),
                         NULL);
 
-      hbox = gtk_hbox_new (FALSE, 6);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
       gtk_widget_show (hbox);
 
@@ -980,13 +980,13 @@ flame_dialog (void)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, FALSE, FALSE, 0);
   gtk_widget_show (main_vbox);
 
-  box = gtk_hbox_new (FALSE, 12);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (main_vbox), box, FALSE, FALSE, 0);
   gtk_widget_show (box);
 
@@ -1024,7 +1024,7 @@ flame_dialog (void)
     GtkWidget *vbox;
     GtkWidget *vbbox;
 
-    vbox = gtk_vbox_new (FALSE, 6);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
     gtk_box_pack_start (GTK_BOX (box), vbox, FALSE, FALSE, 0);
     gtk_widget_show (vbox);
 
@@ -1063,7 +1063,7 @@ flame_dialog (void)
   gtk_box_pack_start (GTK_BOX (main_vbox), notebook, FALSE, FALSE, 0);
   gtk_widget_show (notebook);
 
-  box = gtk_vbox_new (FALSE, 12);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (box), 12);
   label = gtk_label_new_with_mnemonic(_("_Rendering"));
   gtk_notebook_append_page (GTK_NOTEBOOK (notebook), box, label);
@@ -1156,7 +1156,7 @@ flame_dialog (void)
     GtkWidget *label;
     GtkWidget *combo;
 
-    hbox = gtk_hbox_new (FALSE, 6);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
     gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 0);
     gtk_widget_show (hbox);
 
diff --git a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
index 442107c..7242e2b 100644
--- a/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
+++ b/plug-ins/fractal-explorer/fractal-explorer-dialogs.c
@@ -583,18 +583,18 @@ explorer_dialog (void)
                     G_CALLBACK (gtk_main_quit),
                     NULL);
 
-  top_hbox = gtk_hbox_new (FALSE, 12);
+  top_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (top_hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       top_hbox, FALSE, FALSE, 0);
   gtk_widget_show (top_hbox);
 
-  left_vbox = gtk_vbox_new (FALSE, 12);
+  left_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (top_hbox), left_vbox, FALSE, FALSE, 0);
   gtk_widget_show (left_vbox);
 
   /*  Preview  */
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (left_vbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -657,11 +657,12 @@ explorer_dialog (void)
   gtk_box_pack_start (GTK_BOX (left_vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
-  bbox = gtk_hbox_new (TRUE, 6);
+  bbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_set_homogeneous (GTK_BOX (bbox), TRUE);
   gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
   gtk_widget_show (bbox);
 
@@ -681,7 +682,8 @@ explorer_dialog (void)
                     G_CALLBACK (dialog_step_out_callback),
                     dialog);
 
-  bbox = gtk_hbox_new (TRUE, 6);
+  bbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_set_homogeneous (GTK_BOX (bbox), TRUE);
   gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE, 0);
   gtk_widget_show (bbox);
 
@@ -711,7 +713,7 @@ explorer_dialog (void)
   gtk_widget_show (notebook);
 
   /*  "Parameters" page  */
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox,
                             gtk_label_new_with_mnemonic (_("_Parameters")));
@@ -795,7 +797,8 @@ explorer_dialog (void)
                     G_CALLBACK (explorer_double_adjustment_update),
                     &wvals.cy);
 
-  bbox = gtk_hbox_new (TRUE, 6);
+  bbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_set_homogeneous (GTK_BOX (bbox), TRUE);
   gtk_table_attach_defaults (GTK_TABLE (table), bbox, 0, 3, 7, 8);
   gtk_widget_show (bbox);
 
@@ -829,7 +832,7 @@ explorer_dialog (void)
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
 
@@ -859,7 +862,7 @@ explorer_dialog (void)
 
                               NULL);
 
-  toggle_vbox2 = gtk_vbox_new (FALSE, 2);
+  toggle_vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   for (i = TYPE_BARNSLEY_2; i <= TYPE_SPIDER; i++)
     {
       g_object_ref (elements->type[i]);
@@ -873,7 +876,7 @@ explorer_dialog (void)
       g_object_unref (elements->type[i]);
     }
 
-  toggle_vbox3 = gtk_vbox_new (FALSE, 2);
+  toggle_vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   for (i = TYPE_MAN_O_WAR; i <= TYPE_SIERPINSKI; i++)
     {
       g_object_ref (elements->type[i]);
@@ -897,7 +900,7 @@ explorer_dialog (void)
   gtk_widget_show (toggle_vbox3);
 
   /*  Color page  */
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox,
                             gtk_label_new_with_mnemonic (_("Co_lors")));
@@ -982,7 +985,7 @@ explorer_dialog (void)
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
 
@@ -1114,7 +1117,7 @@ explorer_dialog (void)
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  toggle_vbox = gtk_vbox_new (FALSE, 2);
+  toggle_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add (GTK_CONTAINER (frame), toggle_vbox);
   gtk_widget_show (toggle_vbox);
 
@@ -1135,7 +1138,7 @@ explorer_dialog (void)
                              "specified above (color density/function). The "
                              "result is visible in the preview image"), NULL);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (toggle_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/gfig/gfig-bezier.c b/plug-ins/gfig/gfig-bezier.c
index 6936b12..f9c283d 100644
--- a/plug-ins/gfig/gfig-bezier.c
+++ b/plug-ins/gfig/gfig-bezier.c
@@ -434,7 +434,7 @@ tool_options_bezier (GtkWidget *notebook)
   GtkWidget *vbox;
   GtkWidget *toggle;
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_notebook_append_page (GTK_NOTEBOOK (notebook), vbox, NULL);
   gtk_widget_show (vbox);
diff --git a/plug-ins/gfig/gfig-dialog.c b/plug-ins/gfig/gfig-dialog.c
index de0c4aa..7227353 100644
--- a/plug-ins/gfig/gfig-dialog.c
+++ b/plug-ins/gfig/gfig-dialog.c
@@ -319,7 +319,7 @@ gfig_dialog (void)
   gfig_dialog_action_set_sensitive ("undo", undo_level >= 0);
 
   /* Main box */
-  main_hbox = gtk_hbox_new (FALSE, 12);
+  main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12);
   gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (top_level_dlg))),
                     main_hbox, TRUE, TRUE, 0);
@@ -329,7 +329,7 @@ gfig_dialog (void)
 
   gtk_widget_show (gfig_context->preview);
 
-  right_vbox = gtk_vbox_new (FALSE, 12);
+  right_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (main_hbox), right_vbox, FALSE, FALSE, 0);
   gtk_widget_show (right_vbox);
 
@@ -357,11 +357,11 @@ gfig_dialog (void)
   gtk_frame_set_label_widget (GTK_FRAME (frame), toggle);
   gtk_widget_show (toggle);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -402,11 +402,11 @@ gfig_dialog (void)
   gtk_box_pack_start (GTK_BOX (right_vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -472,7 +472,7 @@ gfig_dialog (void)
                             gfig_context->gradient_select, NULL);
 
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (right_vbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -1240,7 +1240,7 @@ gfig_prefs_action_callback (GtkAction *widget,
                         G_CALLBACK (gtk_widget_destroy),
                         NULL);
 
-      main_vbox = gtk_vbox_new (FALSE, 0);
+      main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
       gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                           main_vbox, TRUE, TRUE, 0);
@@ -1388,13 +1388,13 @@ gfig_grid_action_callback (GtkAction *action,
                         G_CALLBACK (gtk_widget_destroy),
                         NULL);
 
-      main_vbox = gtk_vbox_new (FALSE, 0);
+      main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
       gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                           main_vbox, TRUE, TRUE, 0);
       gtk_widget_show (main_vbox);
 
-      hbox = gtk_hbox_new (FALSE, 6);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
       gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
       gtk_widget_show (hbox);
 
diff --git a/plug-ins/gfig/gfig-preview.c b/plug-ins/gfig/gfig-preview.c
index 4c25243..4090f5e 100644
--- a/plug-ins/gfig/gfig-preview.c
+++ b/plug-ins/gfig/gfig-preview.c
@@ -120,8 +120,8 @@ make_preview (void)
   gtk_widget_show (frame);
   gtk_widget_show (table);
 
-  vbox = gtk_vbox_new (FALSE, 12);
-  hbox = gtk_hbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_start (GTK_BOX (hbox), frame, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
@@ -327,7 +327,8 @@ make_pos_info (void)
 
   frame = gimp_frame_new (_("Object Details"));
 
-  hbox = gtk_hbox_new (TRUE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
 
   /* Add labels */
@@ -371,7 +372,7 @@ gfig_pos_labels (void)
   GtkWidget *hbox;
   gchar      buf[256];
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_widget_show (hbox);
 
   /* Position labels */
diff --git a/plug-ins/gimpressionist/brush.c b/plug-ins/gimpressionist/brush.c
index 5f9c742..1cd5e2c 100644
--- a/plug-ins/gimpressionist/brush.c
+++ b/plug-ins/gimpressionist/brush.c
@@ -505,11 +505,11 @@ create_brushpage (GtkNotebook *notebook)
 
   label = gtk_label_new_with_mnemonic (_("_Brush"));
 
-  thispage = gtk_vbox_new (FALSE, 12);
+  thispage = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (thispage), 12);
   gtk_widget_show (thispage);
 
-  box1 = gtk_hbox_new (FALSE, 12);
+  box1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (thispage), box1, TRUE,TRUE,0);
   gtk_widget_show (box1);
 
@@ -520,7 +520,7 @@ create_brushpage (GtkNotebook *notebook)
 
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
 
-  box2 = gtk_vbox_new (FALSE, 12);
+  box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
   gtk_widget_show (box2);
 
@@ -536,7 +536,7 @@ create_brushpage (GtkNotebook *notebook)
   g_signal_connect (brush_preview, "size-allocate",
                     G_CALLBACK (brush_preview_size_allocate), NULL);
 
-  box3 = gtk_vbox_new (FALSE, 2);
+  box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_box_pack_end (GTK_BOX (box2), box3, FALSE, FALSE,0);
   gtk_widget_show (box3);
 
@@ -560,7 +560,7 @@ create_brushpage (GtkNotebook *notebook)
   gimp_help_set_help_data
     (tmpw, _("Changes the gamma (brightness) of the selected brush"), NULL);
 
-  box3 = gtk_hbox_new (FALSE, 6);
+  box3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (thispage), box3, FALSE, FALSE,0);
   gtk_widget_show (box3);
 
diff --git a/plug-ins/gimpressionist/color.c b/plug-ins/gimpressionist/color.c
index de3cd5a..70dbe19 100644
--- a/plug-ins/gimpressionist/color.c
+++ b/plug-ins/gimpressionist/color.c
@@ -58,7 +58,7 @@ create_colorpage (GtkNotebook *notebook)
 
   label = gtk_label_new_with_mnemonic (_("Co_lor"));
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/gimpressionist/general.c b/plug-ins/gimpressionist/general.c
index 4efd30d..be2f817 100644
--- a/plug-ins/gimpressionist/general.c
+++ b/plug-ins/gimpressionist/general.c
@@ -132,7 +132,7 @@ create_generalpage (GtkNotebook *notebook)
 
   label = gtk_label_new_with_mnemonic (_("_General"));
 
-  thispage = gtk_vbox_new (FALSE, 12);
+  thispage = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (thispage), 12);
   gtk_widget_show (thispage);
 
@@ -140,7 +140,7 @@ create_generalpage (GtkNotebook *notebook)
   gtk_box_pack_start (GTK_BOX (thispage), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  box3 = gtk_vbox_new (FALSE, 6);
+  box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), box3);
   gtk_widget_show (box3);
 
@@ -156,7 +156,7 @@ create_generalpage (GtkNotebook *notebook)
                          _("Copy the texture of the selected paper as a background"),
                          &radio_group);
 
-  box4 = gtk_hbox_new (FALSE, 6);
+  box4 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (box3), box4, FALSE, FALSE, 0);
   gtk_widget_show (box4);
 
@@ -191,11 +191,11 @@ create_generalpage (GtkNotebook *notebook)
   gtk_toggle_button_set_active
     (GTK_TOGGLE_BUTTON (general_bg_radio[pcvals.general_background_type]), TRUE);
 
-  box1 = gtk_hbox_new (FALSE, 12);
+  box1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (thispage), box1, FALSE, FALSE, 0);
   gtk_widget_show (box1);
 
-  box2 = gtk_vbox_new (FALSE, 6);
+  box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
   gtk_widget_show (box2);
 
diff --git a/plug-ins/gimpressionist/gimpressionist.c b/plug-ins/gimpressionist/gimpressionist.c
index 0f9c8ac..9c186ba 100644
--- a/plug-ins/gimpressionist/gimpressionist.c
+++ b/plug-ins/gimpressionist/gimpressionist.c
@@ -158,7 +158,7 @@ create_dialog (void)
                     G_CALLBACK (gtk_main_quit),
                     NULL);
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       hbox, TRUE, TRUE, 0);
diff --git a/plug-ins/gimpressionist/orientation.c b/plug-ins/gimpressionist/orientation.c
index 5eaedde..b84cf8e 100644
--- a/plug-ins/gimpressionist/orientation.c
+++ b/plug-ins/gimpressionist/orientation.c
@@ -90,7 +90,7 @@ create_orientationpage (GtkNotebook *notebook)
 
   label = gtk_label_new_with_mnemonic (_("Or_ientation"));
 
-  thispage = gtk_vbox_new (FALSE, 12);
+  thispage = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (thispage), 12);
   gtk_widget_show (thispage);
 
@@ -136,11 +136,11 @@ create_orientationpage (GtkNotebook *notebook)
                     G_CALLBACK (gimp_double_adjustment_update),
                     &pcvals.orient_last);
 
-  box2 = gtk_hbox_new (FALSE, 12);
+  box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (thispage), box2, FALSE, FALSE, 0);
   gtk_widget_show (box2);
 
-  box3 = gtk_vbox_new (FALSE, 6);
+  box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (box2), box3, FALSE, FALSE, 0);
   gtk_widget_show (box3);
 
@@ -148,7 +148,7 @@ create_orientationpage (GtkNotebook *notebook)
   gtk_box_pack_start (GTK_BOX (box3), tmpw, FALSE, FALSE, 0);
   gtk_widget_show (tmpw);
 
-  box3 = gtk_vbox_new (FALSE, 6);
+  box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (box2), box3, FALSE, FALSE, 0);
   gtk_widget_show (box3);
 
@@ -168,7 +168,7 @@ create_orientationpage (GtkNotebook *notebook)
           _("Let the direction from the center determine the direction of the stroke"),
           &radio_group);
 
-  box3 = gtk_vbox_new (FALSE, 6);
+  box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (box2), box3, FALSE, FALSE, 0);
   gtk_widget_show (box3);
 
@@ -184,7 +184,7 @@ create_orientationpage (GtkNotebook *notebook)
           _("The direction that matches the original image the closest is selected"),
           &radio_group);
 
-  box4 = gtk_hbox_new (FALSE, 6);
+  box4 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (box3), box4, FALSE, FALSE, 0);
   gtk_widget_show (box4);
 
diff --git a/plug-ins/gimpressionist/orientmap.c b/plug-ins/gimpressionist/orientmap.c
index d60d274..93622ea 100644
--- a/plug-ins/gimpressionist/orientmap.c
+++ b/plug-ins/gimpressionist/orientmap.c
@@ -557,7 +557,7 @@ create_orientmap_dialog (GtkWidget *parent)
                     GTK_EXPAND, GTK_EXPAND, 0, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
 
@@ -599,7 +599,8 @@ create_orientmap_dialog (GtkWidget *parent)
   gtk_container_add (GTK_CONTAINER (tmpw2), tmpw);
   gtk_widget_show (tmpw);
 
-  hbox = tmpw = gtk_hbox_new (TRUE,0);
+  hbox = tmpw = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_container_set_border_width (GTK_CONTAINER (tmpw), 2);
   gtk_table_attach_defaults (GTK_TABLE (table1), tmpw, 0,1, 1,2);
   gtk_widget_show (tmpw);
@@ -628,12 +629,12 @@ create_orientmap_dialog (GtkWidget *parent)
   g_signal_connect (tmpw, "clicked", G_CALLBACK (delete_click_callback), NULL);
   gimp_help_set_help_data (tmpw, _("Delete selected vector"), NULL);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_set_spacing (GTK_BOX (hbox), 12);
   gtk_table_attach_defaults (GTK_TABLE (table1), hbox, 0, 2, 2, 3);
   gtk_widget_show (hbox);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/gimpressionist/paper.c b/plug-ins/gimpressionist/paper.c
index cff3c0c..d413a90 100644
--- a/plug-ins/gimpressionist/paper.c
+++ b/plug-ins/gimpressionist/paper.c
@@ -136,11 +136,11 @@ create_paperpage (GtkNotebook *notebook)
 
   label = gtk_label_new_with_mnemonic (_("P_aper"));
 
-  thispage = gtk_vbox_new (FALSE, 12);
+  thispage = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (thispage), 12);
   gtk_widget_show (thispage);
 
-  box1 = gtk_hbox_new (FALSE, 12);
+  box1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (thispage), box1, TRUE, TRUE, 0);
   gtk_widget_show (box1);
 
@@ -149,7 +149,7 @@ create_paperpage (GtkNotebook *notebook)
     GTK_LIST_STORE (gtk_tree_view_get_model (GTK_TREE_VIEW (view)));
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
 
-  box2 = gtk_vbox_new (FALSE, 12);
+  box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, FALSE, 0);
   gtk_widget_show (box2);
 
diff --git a/plug-ins/gimpressionist/placement.c b/plug-ins/gimpressionist/placement.c
index 3a1e59c..c49b45e 100644
--- a/plug-ins/gimpressionist/placement.c
+++ b/plug-ins/gimpressionist/placement.c
@@ -65,7 +65,7 @@ create_placementpage (GtkNotebook *notebook)
 
   label = gtk_label_new_with_mnemonic (_("Pl_acement"));
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_widget_show (vbox);
 
diff --git a/plug-ins/gimpressionist/presets.c b/plug-ins/gimpressionist/presets.c
index 9c78424..56effca 100644
--- a/plug-ins/gimpressionist/presets.c
+++ b/plug-ins/gimpressionist/presets.c
@@ -657,7 +657,7 @@ create_save_preset (GtkWidget *parent)
                     G_CALLBACK (gtk_widget_destroyed),
                     &window);
 
-  box = gtk_vbox_new (FALSE, 6);
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_set_border_width (GTK_CONTAINER (box), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))),
                       box, TRUE, TRUE, 0);
@@ -1014,11 +1014,11 @@ create_presetpage (GtkNotebook *notebook)
 
   label = gtk_label_new_with_mnemonic (_("_Presets"));
 
-  thispage = gtk_vbox_new (FALSE, 12);
+  thispage = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (thispage), 12);
   gtk_widget_show (thispage);
 
-  box1 = gtk_hbox_new (FALSE, 12);
+  box1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (thispage), box1, FALSE, FALSE, 0);
   gtk_widget_show (box1);
 
@@ -1037,7 +1037,7 @@ create_presetpage (GtkNotebook *notebook)
   gimp_help_set_help_data
     (tmpw, _("Save the current settings to the specified file"), NULL);
 
-  box1 = gtk_hbox_new (FALSE, 12);
+  box1 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (thispage), box1, TRUE, TRUE, 0);
   gtk_widget_show (box1);
 
@@ -1046,15 +1046,15 @@ create_presetpage (GtkNotebook *notebook)
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (view));
   add_factory_defaults ();
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (box1), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
-  box2 = gtk_vbox_new (FALSE, 6);
+  box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (hbox), box2, FALSE, FALSE, 0);
   gtk_widget_show (box2);
 
diff --git a/plug-ins/gimpressionist/preview.c b/plug-ins/gimpressionist/preview.c
index f45bed3..5782c3d 100644
--- a/plug-ins/gimpressionist/preview.c
+++ b/plug-ins/gimpressionist/preview.c
@@ -150,7 +150,7 @@ create_preview (void)
   GtkWidget *frame;
   GtkWidget *button;
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 
   frame = gtk_frame_new (NULL);
   gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
@@ -166,7 +166,8 @@ create_preview (void)
   g_signal_connect (preview, "size-allocate",
                     G_CALLBACK (preview_size_allocate), NULL);
 
-  hbox = gtk_hbox_new (TRUE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/gimpressionist/size.c b/plug-ins/gimpressionist/size.c
index 42604f8..86f75f5 100644
--- a/plug-ins/gimpressionist/size.c
+++ b/plug-ins/gimpressionist/size.c
@@ -93,7 +93,7 @@ create_sizepage (GtkNotebook *notebook)
 
   label = gtk_label_new_with_mnemonic (_("_Size"));
 
-  thispage = gtk_vbox_new (FALSE, 12);
+  thispage = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (thispage), 12);
   gtk_widget_show (thispage);
 
@@ -139,11 +139,11 @@ create_sizepage (GtkNotebook *notebook)
                     G_CALLBACK (gimp_double_adjustment_update),
                     &pcvals.size_last);
 
-  box2 = gtk_hbox_new (FALSE, 12);
+  box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (thispage), box2,FALSE,FALSE,0);
   gtk_widget_show (box2);
 
-  box3 = gtk_vbox_new (FALSE, 6);
+  box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (box2), box3, FALSE, FALSE, 0);
   gtk_widget_show (box3);
 
@@ -151,7 +151,7 @@ create_sizepage (GtkNotebook *notebook)
   gtk_box_pack_start (GTK_BOX (box3), tmpw,FALSE,FALSE,0);
   gtk_widget_show (tmpw);
 
-  box3 = gtk_vbox_new (FALSE, 6);
+  box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX( box2), box3, FALSE, FALSE, 0);
   gtk_widget_show (box3);
 
@@ -171,7 +171,7 @@ create_sizepage (GtkNotebook *notebook)
     _("Let the direction from the center determine the size of the stroke"),
     &radio_group);
 
-  box3 = gtk_vbox_new (FALSE, 6);
+  box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (box2), box3,FALSE,FALSE, 0);
   gtk_widget_show (box3);
 
@@ -188,7 +188,7 @@ create_sizepage (GtkNotebook *notebook)
     &radio_group);
 
 
-  box4 = gtk_hbox_new (FALSE, 6);
+  box4 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (box3), box4, FALSE, FALSE, 0);
   gtk_widget_show (box4);
 
diff --git a/plug-ins/gimpressionist/sizemap.c b/plug-ins/gimpressionist/sizemap.c
index ecb9c7b..a6f47b3 100644
--- a/plug-ins/gimpressionist/sizemap.c
+++ b/plug-ins/gimpressionist/sizemap.c
@@ -431,7 +431,7 @@ create_sizemap_dialog (GtkWidget *parent)
   gtk_table_attach (GTK_TABLE (table1), tmpw, 0,1,0,1,GTK_EXPAND,GTK_EXPAND,0,0);
   gtk_widget_show (tmpw);
 
-  tmpw = hbox = gtk_hbox_new (FALSE,0);
+  tmpw = hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL,0);
   gtk_container_add (GTK_CONTAINER (tmpw2), tmpw);
   gtk_widget_show (tmpw);
 
@@ -468,7 +468,8 @@ create_sizemap_dialog (GtkWidget *parent)
   gtk_container_add (GTK_CONTAINER (tmpw2), tmpw);
   gtk_widget_show (tmpw);
 
-  hbox = gtk_hbox_new (TRUE,0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
   gtk_table_attach_defaults (GTK_TABLE (table1), hbox, 0, 1, 1, 2);
   gtk_widget_show (hbox);
diff --git a/plug-ins/gradient-flare/gradient-flare.c b/plug-ins/gradient-flare/gradient-flare.c
index a8bb639..b3595f8 100644
--- a/plug-ins/gradient-flare/gradient-flare.c
+++ b/plug-ins/gradient-flare/gradient-flare.c
@@ -2371,7 +2371,7 @@ dlg_run (void)
    *    main hbox
    */
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (shell))),
                       hbox, FALSE, FALSE, 0);
@@ -2381,7 +2381,7 @@ dlg_run (void)
    *    Preview
    */
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -2706,7 +2706,7 @@ dlg_make_page_settings (GFlareDialog *dlg,
   gdouble    xres, yres;
   gint       row;
 
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
 
   frame = gimp_frame_new (_("Center"));
@@ -2931,7 +2931,7 @@ dlg_make_page_selector (GFlareDialog *dlg,
 
   DEBUG_PRINT (("dlg_make_page_selector\n"));
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 
   /*
@@ -2975,7 +2975,7 @@ dlg_make_page_selector (GFlareDialog *dlg,
    *    The buttons for the possible listbox operations
    */
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -3342,7 +3342,7 @@ ed_run (GtkWindow            *parent,
    *    main hbox
    */
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (shell))),
                       hbox, FALSE, FALSE, 0);
@@ -3439,7 +3439,7 @@ ed_make_page_general (GFlareEditor *ed,
   GtkWidget *combo;
   GtkObject *adj;
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 
   /*  Glow  */
@@ -3546,7 +3546,7 @@ ed_make_page_glow (GFlareEditor *ed,
   GtkObject    *adj;
   gint          row;
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 
   /*
@@ -3649,7 +3649,7 @@ ed_make_page_rays (GFlareEditor *ed,
   GtkObject    *adj;
   gint          row;
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 
   /*
@@ -3788,7 +3788,7 @@ ed_make_page_sflare (GFlareEditor *ed,
   gchar         buf[256];
   gint          row;
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 
   /*
@@ -3880,7 +3880,7 @@ ed_make_page_sflare (GFlareEditor *ed,
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  shape_vbox = gtk_vbox_new (FALSE, 2);
+  shape_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add (GTK_CONTAINER (frame), shape_vbox);
   gtk_widget_show (shape_vbox);
 
@@ -3896,7 +3896,7 @@ ed_make_page_sflare (GFlareEditor *ed,
   gtk_box_pack_start (GTK_BOX (shape_vbox), toggle, FALSE, FALSE, 0);
   gtk_widget_show (toggle);
 
-  polygon_hbox = gtk_hbox_new (FALSE, 6);
+  polygon_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (shape_vbox), polygon_hbox, FALSE, FALSE, 0);
   gtk_widget_show (polygon_hbox);
 
@@ -3931,7 +3931,7 @@ ed_make_page_sflare (GFlareEditor *ed,
    *    Random Seed Entry
    */
 
-  seed_hbox = gtk_hbox_new (FALSE, 6);
+  seed_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox), seed_hbox, FALSE, FALSE, 0);
   gtk_widget_show (seed_hbox);
 
diff --git a/plug-ins/help-browser/dialog.c b/plug-ins/help-browser/dialog.c
index 6fcd4e0..76a82eb 100644
--- a/plug-ins/help-browser/dialog.c
+++ b/plug-ins/help-browser/dialog.c
@@ -194,7 +194,7 @@ browser_dialog_open (const gchar *plug_in_binary)
 
   window_set_icons (window);
 
-  vbox = gtk_vbox_new (FALSE, 2);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add (GTK_CONTAINER (window), vbox);
   gtk_widget_show (vbox);
 
@@ -266,7 +266,7 @@ browser_dialog_open (const gchar *plug_in_binary)
                     NULL);
 
   /*  HTML view  */
-  main_vbox = gtk_vbox_new (FALSE, 0);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_widget_show (main_vbox);
   gtk_paned_pack2 (GTK_PANED (paned), main_vbox, TRUE, TRUE);
 
@@ -1151,7 +1151,7 @@ build_searchbar (void)
   GtkWidget *hbox;
   GtkWidget *label;
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
 
   label = gtk_label_new (_("Find:"));
   gtk_widget_show (label);
diff --git a/plug-ins/ifs-compose/ifs-compose.c b/plug-ins/ifs-compose/ifs-compose.c
index 4bc7cf8..0c992b8 100644
--- a/plug-ins/ifs-compose/ifs-compose.c
+++ b/plug-ins/ifs-compose/ifs-compose.c
@@ -508,7 +508,7 @@ ifs_compose_trans_page (void)
   GtkWidget *table;
   GtkWidget *label;
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 
   table = gtk_table_new (3, 6, FALSE);
@@ -626,7 +626,7 @@ ifs_compose_color_page (void)
   GSList    *group = NULL;
   GimpRGB    color;
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
 
   table = gtk_table_new (3, 5, FALSE);
@@ -806,14 +806,14 @@ ifs_compose_dialog (GimpDrawable *drawable)
   gtk_widget_show (toolbar);
 
   /*  The main vbox */
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       main_vbox, TRUE, TRUE, 0);
 
   /*  The design area */
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE, 0);
 
   aspect_frame = gtk_aspect_frame_new (NULL,
@@ -853,7 +853,7 @@ ifs_compose_dialog (GimpDrawable *drawable)
   gtk_box_pack_start (GTK_BOX (main_vbox), ifsD->current_frame,
                       FALSE, FALSE, 0);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (ifsD->current_frame), vbox);
 
   /* The notebook */
@@ -877,7 +877,7 @@ ifs_compose_dialog (GimpDrawable *drawable)
 
   /* The probability entry */
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
 
   label = gtk_label_new (_("Relative probability:"));
@@ -2002,7 +2002,7 @@ color_map_create (const gchar *name,
   gimp_rgb_set_alpha (data, 1.0);
   color_map->color       = data;
   color_map->fixed_point = fixed_point;
-  color_map->hbox        = gtk_hbox_new (FALSE, 2);
+  color_map->hbox        = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
 
   frame = gtk_frame_new (NULL);
   gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
diff --git a/plug-ins/imagemap/imap_browse.c b/plug-ins/imagemap/imap_browse.c
index 86addc1..cb65315 100644
--- a/plug-ins/imagemap/imap_browse.c
+++ b/plug-ins/imagemap/imap_browse.c
@@ -124,7 +124,7 @@ browse_widget_new (const gchar *name)
    browse->name = name;
    browse->filter = NULL;
 
-   browse->hbox = gtk_hbox_new (FALSE, 1);
+   browse->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
    gtk_widget_show (browse->hbox);
 
    browse->file = gtk_entry_new ();
diff --git a/plug-ins/imagemap/imap_cmd_gimp_guides.c b/plug-ins/imagemap/imap_cmd_gimp_guides.c
index 309567c..2a2ea92 100644
--- a/plug-ins/imagemap/imap_cmd_gimp_guides.c
+++ b/plug-ins/imagemap/imap_cmd_gimp_guides.c
@@ -151,7 +151,7 @@ make_gimp_guides_dialog(void)
    gtk_widget_show(frame);
    gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 1, 0, 1);
 
-   hbox = gtk_hbox_new( FALSE, 6);
+   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
    gtk_container_add(GTK_CONTAINER(frame), hbox);
    gtk_widget_show(hbox);
 
@@ -169,7 +169,7 @@ make_gimp_guides_dialog(void)
    gtk_widget_show(frame);
    gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 1, 1, 2);
 
-   vbox = gtk_vbox_new(FALSE, 2);
+   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
    gtk_container_add(GTK_CONTAINER(frame), vbox);
    gtk_widget_show(vbox);
 
@@ -189,7 +189,7 @@ make_gimp_guides_dialog(void)
    gtk_container_add(GTK_CONTAINER(vbox), data->lower_border);
    gtk_widget_show(data->lower_border);
 
-   hbox = gtk_hbox_new (FALSE, 6);
+   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
    gtk_table_attach_defaults(GTK_TABLE(table), hbox, 0, 2, 2, 3);
    gtk_widget_show(hbox);
 
diff --git a/plug-ins/imagemap/imap_cmd_guides.c b/plug-ins/imagemap/imap_cmd_guides.c
index f65beb2..6278010 100644
--- a/plug-ins/imagemap/imap_cmd_guides.c
+++ b/plug-ins/imagemap/imap_cmd_guides.c
@@ -204,7 +204,7 @@ make_guides_dialog (void)
    g_signal_connect (data->no_down, "changed",
                      G_CALLBACK(recalc_bounds), (gpointer) data);
 
-   hbox = gtk_hbox_new (FALSE, 6);
+   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
    gtk_box_pack_start (GTK_BOX (dialog->vbox), hbox, TRUE, TRUE, 0);
    gtk_widget_show(hbox);
 
diff --git a/plug-ins/imagemap/imap_default_dialog.c b/plug-ins/imagemap/imap_default_dialog.c
index d5cdd05..17dfbf8 100644
--- a/plug-ins/imagemap/imap_default_dialog.c
+++ b/plug-ins/imagemap/imap_default_dialog.c
@@ -119,7 +119,7 @@ make_default_dialog (const gchar *title)
                      G_CALLBACK (gtk_widget_destroyed),
                      &data->dialog);
 
-   data->vbox = gtk_vbox_new (FALSE, 12);
+   data->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
    gtk_container_set_border_width (GTK_CONTAINER (data->vbox), 12);
    gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (data->dialog))),
                        data->vbox, TRUE, TRUE, 0);
diff --git a/plug-ins/imagemap/imap_edit_area_info.c b/plug-ins/imagemap/imap_edit_area_info.c
index 231a17a..b3751be 100644
--- a/plug-ins/imagemap/imap_edit_area_info.c
+++ b/plug-ins/imagemap/imap_edit_area_info.c
@@ -175,7 +175,7 @@ append_page (GtkWidget *notebook, GtkWidget *page, const gchar *icon_name,
 {
    GtkWidget *hbox, *icon, *label;
 
-   hbox = gtk_hbox_new(FALSE, 1);
+   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
    gtk_widget_show(hbox);
 
    icon = gtk_image_new_from_stock (icon_name, GTK_ICON_SIZE_MENU);
@@ -312,7 +312,7 @@ create_info_tab(AreaInfoDialog_t *dialog, GtkWidget *notebook)
    GtkWidget *vbox, *frame, *preview;
    Object_t *obj = dialog->obj;
 
-   vbox = gtk_vbox_new(FALSE, 1);
+   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
    gtk_container_set_border_width(GTK_CONTAINER(vbox), 12);
    gtk_widget_show(vbox);
 
@@ -337,7 +337,7 @@ create_java_script_tab(AreaInfoDialog_t *dialog, GtkWidget *notebook)
 {
    GtkWidget *vbox, *table, *label;
 
-   vbox = gtk_vbox_new(FALSE, 1);
+   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
    gtk_widget_show(vbox);
 
    table = gtk_table_new(11, 1, FALSE);
diff --git a/plug-ins/imagemap/imap_grid.c b/plug-ins/imagemap/imap_grid.c
index 9a222bf..3a57139 100644
--- a/plug-ins/imagemap/imap_grid.c
+++ b/plug-ins/imagemap/imap_grid.c
@@ -206,7 +206,7 @@ create_grid_settings_dialog(void)
    data->type_frame = frame = gimp_frame_new(_("Grid Visibility and Type"));
    gtk_widget_show(frame);
    gtk_table_attach_defaults(GTK_TABLE(main_table), frame, 0, 2, 1, 2);
-   hbox = gtk_hbox_new(FALSE, 6);
+   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
    gtk_container_add(GTK_CONTAINER(frame), hbox);
    gtk_widget_show(hbox);
 
diff --git a/plug-ins/imagemap/imap_main.c b/plug-ins/imagemap/imap_main.c
index 5ff9f9c..51bb4cb 100644
--- a/plug-ins/imagemap/imap_main.c
+++ b/plug-ins/imagemap/imap_main.c
@@ -1247,7 +1247,7 @@ dialog(GimpDrawable *drawable)
                      G_CALLBACK (gtk_main_quit),
                      NULL);
 
-   main_vbox = gtk_vbox_new (FALSE, 0);
+   main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
    gtk_container_add (GTK_CONTAINER (dlg), main_vbox);
    gtk_widget_show (main_vbox);
 
@@ -1260,7 +1260,7 @@ dialog(GimpDrawable *drawable)
    make_toolbar(main_vbox, dlg);
 
    /*  Dialog area  */
-   hbox = gtk_hbox_new(FALSE, 1);
+   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
    gtk_box_pack_start (GTK_BOX (main_vbox), hbox, TRUE, TRUE, 0);
    gtk_widget_show(hbox);
 
diff --git a/plug-ins/imagemap/imap_polygon.c b/plug-ins/imagemap/imap_polygon.c
index a89e96b..8f522c6 100644
--- a/plug-ins/imagemap/imap_polygon.c
+++ b/plug-ins/imagemap/imap_polygon.c
@@ -27,6 +27,8 @@
 
 #include <gtk/gtk.h>
 
+#include <libgimpwidgets/gimpwidgets.h>
+
 #include "imap_commands.h"
 #include "imap_main.h"
 #include "imap_misc.h"
@@ -449,7 +451,7 @@ polygon_create_info_widget(GtkWidget *frame)
    GtkCellRenderer *renderer;
    GtkTreeViewColumn *column;
 
-   hbox = gtk_hbox_new(FALSE, 12);
+   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
    gtk_container_add(GTK_CONTAINER(frame), hbox);
    gtk_widget_show(hbox);
 
diff --git a/plug-ins/imagemap/imap_preferences.c b/plug-ins/imagemap/imap_preferences.c
index 92404ed..3cdaea5 100644
--- a/plug-ins/imagemap/imap_preferences.c
+++ b/plug-ins/imagemap/imap_preferences.c
@@ -338,7 +338,7 @@ create_tab(GtkWidget *notebook, const gchar *label, gint rows, gint cols)
    GtkWidget *table;
    GtkWidget *vbox;
 
-   vbox = gtk_vbox_new(FALSE, 1);
+   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
    gtk_widget_show(vbox);
 
    table = gtk_table_new(rows, cols, FALSE);
@@ -364,7 +364,7 @@ create_general_tab(PreferencesDialog_t *data, GtkWidget *notebook)
    frame = gimp_frame_new( _("Default Map Type"));
    gtk_widget_show(frame);
    gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 2, 0, 1);
-   hbox = gtk_hbox_new(FALSE, 1);
+   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
    gtk_container_add(GTK_CONTAINER(frame), hbox);
    gtk_widget_show(hbox);
    data->ncsa = gtk_radio_button_new_with_mnemonic_from_widget(NULL, "_NCSA");
diff --git a/plug-ins/imagemap/imap_selection.c b/plug-ins/imagemap/imap_selection.c
index d441589..d4ac561 100644
--- a/plug-ins/imagemap/imap_selection.c
+++ b/plug-ins/imagemap/imap_selection.c
@@ -328,7 +328,7 @@ make_selection(ObjectList_t *object_list)
   gtk_frame_set_shadow_type(GTK_FRAME(frame), GTK_SHADOW_IN);
   gtk_widget_show(frame);
 
-  hbox = gtk_hbox_new(FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_add(GTK_CONTAINER(frame), hbox);
   gtk_widget_show(hbox);
 
diff --git a/plug-ins/imagemap/imap_settings.c b/plug-ins/imagemap/imap_settings.c
index a17eb52..7deab9d 100644
--- a/plug-ins/imagemap/imap_settings.c
+++ b/plug-ins/imagemap/imap_settings.c
@@ -129,7 +129,7 @@ create_settings_dialog(void)
    frame = gimp_frame_new(_("Map File Format"));
    gtk_widget_show(frame);
    gtk_table_attach_defaults(GTK_TABLE(table), frame, 0, 2, 9, 10);
-   hbox = gtk_hbox_new(FALSE, 6);
+   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
    gtk_container_add(GTK_CONTAINER(frame), hbox);
    gtk_widget_show(hbox);
 
diff --git a/plug-ins/imagemap/imap_statusbar.c b/plug-ins/imagemap/imap_statusbar.c
index a11a6c1..a84b8a9 100644
--- a/plug-ins/imagemap/imap_statusbar.c
+++ b/plug-ins/imagemap/imap_statusbar.c
@@ -27,6 +27,8 @@
 
 #include <gtk/gtk.h>
 
+#include <libgimpwidgets/gimpwidgets.h>
+
 #include "imap_statusbar.h"
 #include "imap_stock.h"
 
@@ -36,7 +38,7 @@ make_statusbar(GtkWidget *main_vbox, GtkWidget *window)
    StatusBar_t  *statusbar = g_new(StatusBar_t, 1);
    GtkWidget    *hbox, *iconw;
 
-   hbox = gtk_hbox_new(FALSE, 1);
+   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
    gtk_box_pack_start(GTK_BOX(main_vbox), hbox, FALSE, FALSE, 0);
 
    /* Status info */
diff --git a/plug-ins/lighting/lighting-ui.c b/plug-ins/lighting/lighting-ui.c
index 3278fbb..f460e22 100644
--- a/plug-ins/lighting/lighting-ui.c
+++ b/plug-ins/lighting/lighting-ui.c
@@ -289,7 +289,7 @@ create_options_page (void)
   GtkWidget *table;
   GtkObject *adj;
 
-  page = gtk_vbox_new (FALSE, 12);
+  page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 
   /* General options */
@@ -298,7 +298,7 @@ create_options_page (void)
   gtk_box_pack_start (GTK_BOX (page), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -374,7 +374,7 @@ create_light_page (void)
   GtkWidget *label;
   gint       k = mapvals.light_selected;
 
-  page = gtk_vbox_new (FALSE, 12);
+  page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 
   frame = gimp_frame_new (_("Light Settings"));
@@ -617,14 +617,14 @@ create_material_page (void)
   GtkWidget    *button;
   GtkObject    *adj;
 
-  page = gtk_vbox_new (FALSE, 12);
+  page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 
   frame = gimp_frame_new (_("Material Properties"));
   gtk_box_pack_start (GTK_BOX (page), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
 
@@ -795,7 +795,7 @@ create_bump_page (void)
   GtkWidget *spinbutton;
   GtkObject *adj;
 
-  page = gtk_vbox_new (FALSE, 12);
+  page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 
   frame = gimp_frame_new (NULL);
@@ -887,7 +887,7 @@ create_environment_page (void)
   GtkWidget *frame;
   GtkWidget *combo;
 
-  page = gtk_vbox_new (FALSE, 12);
+  page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 
   frame = gimp_frame_new (NULL);
@@ -1036,7 +1036,7 @@ main_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (appwin));
 
-  main_hbox = gtk_hbox_new (FALSE, 12);
+  main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (appwin))),
                       main_hbox, FALSE, FALSE, 0);
@@ -1045,7 +1045,7 @@ main_dialog (GimpDrawable *drawable)
   /* Create the Preview */
   /* ================== */
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (main_hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -1075,7 +1075,7 @@ main_dialog (GimpDrawable *drawable)
   gtk_widget_show (previewarea);
 
   /* create preview options, frame and vbox */
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/map-object/map-object-ui.c b/plug-ins/map-object/map-object-ui.c
index 22db3ce..14db832 100644
--- a/plug-ins/map-object/map-object-ui.c
+++ b/plug-ins/map-object/map-object-ui.c
@@ -404,7 +404,7 @@ create_options_page (void)
   GtkWidget *spinbutton;
   GtkObject *adj;
 
-  page = gtk_vbox_new (FALSE, 12);
+  page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 
   /* General options */
@@ -413,11 +413,11 @@ create_options_page (void)
   gtk_box_pack_start (GTK_BOX (page), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -567,7 +567,7 @@ create_light_page (void)
   GtkWidget *spinbutton;
   GtkObject *adj;
 
-  page = gtk_vbox_new (FALSE, 12);
+  page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 
   frame = gimp_frame_new (_("Light Settings"));
@@ -738,14 +738,14 @@ create_material_page (void)
   GtkWidget    *image;
   GtkObject    *adj;
 
-  page = gtk_vbox_new (FALSE, 12);
+  page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 
   frame = gimp_frame_new (_("Intensity Levels"));
   gtk_box_pack_start (GTK_BOX (page), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
 
@@ -817,7 +817,7 @@ create_material_page (void)
   gtk_box_pack_start (GTK_BOX (page), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
 
@@ -934,7 +934,7 @@ create_orientation_page (void)
   GtkWidget    *table;
   GtkObject    *adj;
 
-  page = gtk_vbox_new (FALSE, 12);
+  page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 
   frame = gimp_frame_new (_("Position"));
@@ -1053,14 +1053,14 @@ create_box_page (void)
     N_("Left:"),  N_("Right:")
   };
 
-  page = gtk_vbox_new (FALSE, 12);
+  page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 
   frame = gimp_frame_new (_("Map Images to Box Faces"));
   gtk_box_pack_start (GTK_BOX (page), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -1146,7 +1146,7 @@ create_cylinder_page (void)
 
   static const gchar *labels[] = { N_("_Top:"), N_("_Bottom:") };
 
-  page = gtk_vbox_new (FALSE, 12);
+  page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (page), 12);
 
   frame = gimp_frame_new (_("Images for the Cap Faces"));
@@ -1304,7 +1304,7 @@ main_dialog (GimpDrawable *drawable)
 
   gimp_window_set_transient (GTK_WINDOW (appwin));
 
-  main_hbox = gtk_hbox_new (FALSE, 12);
+  main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (appwin))),
                       main_hbox, FALSE, FALSE, 0);
@@ -1312,7 +1312,7 @@ main_dialog (GimpDrawable *drawable)
 
   /* Create the Preview */
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (main_hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -1341,7 +1341,7 @@ main_dialog (GimpDrawable *drawable)
                     G_CALLBACK (preview_expose),
                     previewarea);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/maze/maze-dialog.c b/plug-ins/maze/maze-dialog.c
index e83afd0..778b9bb 100644
--- a/plug-ins/maze/maze-dialog.c
+++ b/plug-ins/maze/maze-dialog.c
@@ -175,7 +175,7 @@ maze_dialog (void)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       vbox, FALSE, FALSE, 0);
@@ -235,7 +235,7 @@ maze_dialog (void)
   gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
-  vbox2 = gtk_vbox_new (FALSE, 6);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox2);
   gtk_widget_show (vbox2);
 
@@ -302,7 +302,7 @@ divbox_new (guint      *max,
 #endif
 
   align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (align), hbox);
 
 #if DIVBOX_LOOKS_LIKE_SPINBUTTON
@@ -330,7 +330,7 @@ divbox_new (guint      *max,
   gtk_widget_set_size_request (*div_entry, ENTRY_WIDTH, -1);
 
 #if DIVBOX_LOOKS_LIKE_SPINBUTTON
-  buttonbox = gtk_vbox_new (FALSE, 0);
+  buttonbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
   gtk_box_pack_start (GTK_BOX (buttonbox), buttonr, FALSE, FALSE, 0);
   gtk_box_pack_start (GTK_BOX (buttonbox), buttonl, FALSE, FALSE, 0);
@@ -617,7 +617,7 @@ entscale_int_new (GtkWidget           *table,
                             userdata);
 
   /* start packing */
-  hbox = gtk_hbox_new (FALSE, 5);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
   gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE, 0);
   gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, TRUE, 0);
 
diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c
index e3b5126..18ea698 100644
--- a/plug-ins/pagecurl/pagecurl.c
+++ b/plug-ins/pagecurl/pagecurl.c
@@ -453,7 +453,7 @@ dialog (void)
 
   gimp_window_set_transient (GTK_WINDOW (dialog));
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       vbox, TRUE, TRUE, 0);
@@ -524,7 +524,8 @@ dialog (void)
   frame = gimp_frame_new (_("Curl Orientation"));
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
 
-  hbox = gtk_hbox_new (TRUE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
+  gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
 
   {
diff --git a/plug-ins/print/print-page-layout.c b/plug-ins/print/print-page-layout.c
index e883927..168745b 100644
--- a/plug-ins/print/print-page-layout.c
+++ b/plug-ins/print/print-page-layout.c
@@ -120,11 +120,11 @@ print_page_layout_gui (PrintData   *data,
     }
 
   /*  main hbox  */
-  main_hbox = gtk_hbox_new (FALSE, 12);
+  main_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (main_hbox), 12);
 
   /*  main vbox  */
-  main_vbox = gtk_vbox_new (FALSE, 12);
+  main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_box_pack_start (GTK_BOX (main_hbox), main_vbox, FALSE, FALSE, 0);
   gtk_widget_show (main_vbox);
 
@@ -230,13 +230,13 @@ print_size_frame (PrintData    *data,
 
   frame = gimp_frame_new (_("Size"));
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
   /*  the print size entry  */
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -277,7 +277,7 @@ print_size_frame (PrintData    *data,
 
   /*  the resolution entry  */
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -354,7 +354,7 @@ print_offset_frame (PrintData    *data,
 
   frame = gimp_frame_new (_("Position"));
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -447,7 +447,7 @@ print_offset_frame (PrintData    *data,
                     G_CALLBACK (print_size_info_size_changed),
                     NULL);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/script-fu/script-fu-console.c b/plug-ins/script-fu/script-fu-console.c
index 37d5397..7a38776 100644
--- a/plug-ins/script-fu/script-fu-console.c
+++ b/plug-ins/script-fu/script-fu-console.c
@@ -152,7 +152,7 @@ script_fu_console_interface (void)
                     &console);
 
   /*  The main vbox  */
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (console.dialog))),
                       vbox, TRUE, TRUE, 0);
@@ -219,7 +219,7 @@ script_fu_console_interface (void)
   }
 
   /*  The current command  */
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/plug-ins/script-fu/script-fu-interface.c b/plug-ins/script-fu/script-fu-interface.c
index bff875b..053c637 100644
--- a/plug-ins/script-fu/script-fu-interface.c
+++ b/plug-ins/script-fu/script-fu-interface.c
@@ -251,7 +251,7 @@ script_fu_interface (SFScript  *script,
 
   gtk_window_set_resizable (GTK_WINDOW (dialog), TRUE);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       vbox, TRUE, TRUE, 0);
@@ -561,7 +561,7 @@ script_fu_interface (SFScript  *script,
   g_object_unref (group);
 
   /* the script progress bar */
-  vbox2 = gtk_vbox_new (FALSE, 6);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_end (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0);
   gtk_widget_show (vbox2);
 
diff --git a/plug-ins/win-snap/winsnap.c b/plug-ins/win-snap/winsnap.c
index 4637497..7401044 100644
--- a/plug-ins/win-snap/winsnap.c
+++ b/plug-ins/win-snap/winsnap.c
@@ -871,7 +871,7 @@ snap_dialog (void)
                                            GTK_RESPONSE_CANCEL,
                                            -1);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       vbox, TRUE, TRUE, 0);
@@ -905,7 +905,7 @@ snap_dialog (void)
   radio_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (winsnapintf.root_button));
 
   /* with delay */
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 



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