[gimp] app: use gtk_box_new()



commit 3e336199b9bf2360d034fa8ad9d3f170920e70dc
Author: Michael Natterer <mitch gimp org>
Date:   Fri Sep 30 11:29:11 2011 +0200

    app: use gtk_box_new()

 app/actions/gradient-editor-commands.c      |    4 +-
 app/dialogs/channel-options-dialog.c        |    4 +-
 app/dialogs/convert-dialog.c                |    8 +++---
 app/dialogs/fade-dialog.c                   |    2 +-
 app/dialogs/file-open-location-dialog.c     |    6 ++--
 app/dialogs/image-merge-layers-dialog.c     |    2 +-
 app/dialogs/image-new-dialog.c              |    2 +-
 app/dialogs/keyboard-shortcuts-dialog.c     |    2 +-
 app/dialogs/layer-add-mask-dialog.c         |    2 +-
 app/dialogs/layer-options-dialog.c          |    2 +-
 app/dialogs/module-dialog.c                 |    4 +-
 app/dialogs/offset-dialog.c                 |    6 ++--
 app/dialogs/palette-import-dialog.c         |    6 ++--
 app/dialogs/preferences-dialog.c            |   28 +++++++++++++-------------
 app/dialogs/print-size-dialog.c             |    4 +-
 app/dialogs/resize-dialog.c                 |    6 ++--
 app/dialogs/resolution-calibrate-dialog.c   |    4 +-
 app/dialogs/scale-dialog.c                  |    6 ++--
 app/dialogs/stroke-dialog.c                 |    6 ++--
 app/dialogs/template-options-dialog.c       |    2 +-
 app/dialogs/tips-dialog.c                   |    8 +++---
 app/dialogs/vectors-import-dialog.c         |    2 +-
 app/dialogs/vectors-options-dialog.c        |    4 +-
 app/display/gimpcursorview.c                |   18 ++++++++++++----
 app/display/gimpdisplayshell-layer-select.c |    4 ++-
 app/display/gimpdisplayshell-scale-dialog.c |    4 +-
 app/display/gimpdisplayshell.c              |    6 ++--
 app/display/gimpimagewindow.c               |    6 ++--
 app/display/gimpnavigationeditor.c          |    2 +-
 app/gui/splash.c                            |    3 +-
 app/tools/gimpalignoptions.c                |   16 +++++++-------
 app/tools/gimpblendoptions.c                |    2 +-
 app/tools/gimpbucketfilloptions.c           |    2 +-
 app/tools/gimpcolorbalancetool.c            |    4 +-
 app/tools/gimpcolorizetool.c                |    2 +-
 app/tools/gimpcolorpickertool.c             |    2 +-
 app/tools/gimpcurvestool.c                  |   11 +++++----
 app/tools/gimpflipoptions.c                 |    2 +-
 app/tools/gimpforegroundselectoptions.c     |    4 +-
 app/tools/gimpgegltool.c                    |    2 +-
 app/tools/gimphuesaturationtool.c           |    6 ++--
 app/tools/gimpimagemaptool-settings.c       |    2 +-
 app/tools/gimpimagemaptool.c                |    4 +-
 app/tools/gimpinkoptions-gui.c              |    6 ++--
 app/tools/gimplevelstool.c                  |   24 +++++++++++-----------
 app/tools/gimpmoveoptions.c                 |    2 +-
 app/tools/gimppaintoptions-gui.c            |   14 ++++++------
 app/tools/gimpperspectiveclonetool.c        |    2 +-
 app/tools/gimprectangleoptions.c            |   12 +++++-----
 app/tools/gimpselectionoptions.c            |    2 +-
 app/tools/gimptextoptions.c                 |    6 ++--
 app/tools/gimptexttool.c                    |    2 +-
 app/tools/gimpthresholdtool.c               |    4 +-
 app/tools/gimptooloptions-gui.c             |    4 ++-
 app/tools/gimptransformoptions.c            |    4 +-
 app/widgets/gimpactioneditor.c              |    2 +-
 app/widgets/gimpbrusheditor.c               |    4 +-
 app/widgets/gimpbufferview.c                |    2 +-
 app/widgets/gimpcolordisplayeditor.c        |   13 ++++++-----
 app/widgets/gimpcoloreditor.c               |    8 ++++--
 app/widgets/gimpcolorframe.c                |    7 +++--
 app/widgets/gimpcontrollereditor.c          |    6 ++--
 app/widgets/gimpcontrollerlist.c            |    5 ++-
 app/widgets/gimpdeviceeditor.c              |    4 +-
 app/widgets/gimpdeviceinfoeditor.c          |    8 +++---
 app/widgets/gimpdevicestatus.c              |    6 ++--
 app/widgets/gimpdnd.c                       |    2 +-
 app/widgets/gimpdock.c                      |    4 +-
 app/widgets/gimpdockable.c                  |    2 +-
 app/widgets/gimpdockwindow.c                |    4 +-
 app/widgets/gimpeditor.c                    |    4 ++-
 app/widgets/gimperrordialog.c               |    2 +-
 app/widgets/gimpgradienteditor.c            |    6 ++--
 app/widgets/gimpgrideditor.c                |    4 +-
 app/widgets/gimphistogrambox.c              |    6 ++--
 app/widgets/gimphistogrameditor.c           |    2 +-
 app/widgets/gimpimagecommenteditor.c        |    2 +-
 app/widgets/gimpitemtreeview.c              |    6 ++--
 app/widgets/gimppaletteeditor.c             |    2 +-
 app/widgets/gimpsettingsbox.c               |    3 +-
 app/widgets/gimpsizebox.c                   |    6 ++--
 app/widgets/gimpstrokeeditor.c              |    4 +-
 app/widgets/gimptemplateeditor.c            |   10 ++++----
 app/widgets/gimptextstyleeditor.c           |    4 +-
 app/widgets/gimpthumbbox.c                  |    7 +++--
 app/widgets/gimptoolbox.c                   |    2 +-
 app/widgets/gimptooloptionseditor.c         |    2 +-
 app/widgets/gimptoolpreseteditor.c          |    4 +-
 app/widgets/gimpviewablebox.c               |    8 +++---
 app/widgets/gimpviewabledialog.c            |    4 +-
 app/widgets/gimpwidgets-constructors.c      |    2 +-
 app/widgets/gimpwidgets-utils.c             |    6 ++--
 92 files changed, 250 insertions(+), 227 deletions(-)
---
diff --git a/app/actions/gradient-editor-commands.c b/app/actions/gradient-editor-commands.c
index b37123b..66ccdb3 100644
--- a/app/actions/gradient-editor-commands.c
+++ b/app/actions/gradient-editor-commands.c
@@ -480,7 +480,7 @@ gradient_editor_replicate_cmd_callback (GtkAction *action,
                     G_CALLBACK (gradient_editor_replicate_response),
                     editor);
 
-  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);
@@ -583,7 +583,7 @@ gradient_editor_split_uniformly_cmd_callback (GtkAction *action,
                     editor);
 
   /*  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 (dialog))),
                       vbox, TRUE, TRUE, 0);
diff --git a/app/dialogs/channel-options-dialog.c b/app/dialogs/channel-options-dialog.c
index 1432c9c..778dbce 100644
--- a/app/dialogs/channel-options-dialog.c
+++ b/app/dialogs/channel-options-dialog.c
@@ -122,13 +122,13 @@ channel_options_dialog_new (GimpImage     *image,
                                            GTK_RESPONSE_CANCEL,
                                            -1);
 
-  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 (options->dialog))),
                       hbox, TRUE, TRUE, 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, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
diff --git a/app/dialogs/convert-dialog.c b/app/dialogs/convert-dialog.c
index 8b0a8fb..913b019 100644
--- a/app/dialogs/convert-dialog.c
+++ b/app/dialogs/convert-dialog.c
@@ -156,7 +156,7 @@ convert_dialog_new (GimpImage    *image,
 
   palette_box = convert_dialog_palette_box (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->dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -182,7 +182,7 @@ convert_dialog_new (GimpImage    *image,
   gtk_widget_show (frame);
 
   /*  max n_colors  */
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gimp_enum_radio_frame_add (GTK_FRAME (frame), hbox,
                              GIMP_MAKE_PALETTE, TRUE);
   gtk_widget_show (hbox);
@@ -235,11 +235,11 @@ convert_dialog_new (GimpImage    *image,
   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/app/dialogs/fade-dialog.c b/app/dialogs/fade-dialog.c
index e1881a0..de3111d 100644
--- a/app/dialogs/fade-dialog.c
+++ b/app/dialogs/fade-dialog.c
@@ -137,7 +137,7 @@ fade_dialog_new (GimpImage *image,
                     G_CALLBACK (fade_dialog_response),
                     private);
 
-  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/app/dialogs/file-open-location-dialog.c b/app/dialogs/file-open-location-dialog.c
index ca18096..47dd49a 100644
--- a/app/dialogs/file-open-location-dialog.c
+++ b/app/dialogs/file-open-location-dialog.c
@@ -88,13 +88,13 @@ file_open_location_dialog_new (Gimp *gimp)
                                            GTK_RESPONSE_CANCEL,
                                            -1);
 
-  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);
 
@@ -102,7 +102,7 @@ file_open_location_dialog_new (Gimp *gimp)
   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);
 
diff --git a/app/dialogs/image-merge-layers-dialog.c b/app/dialogs/image-merge-layers-dialog.c
index db98a6f..adf9f00 100644
--- a/app/dialogs/image-merge-layers-dialog.c
+++ b/app/dialogs/image-merge-layers-dialog.c
@@ -87,7 +87,7 @@ image_merge_layers_dialog_new (GimpImage     *image,
                                            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->dialog))),
                       vbox, TRUE, TRUE, 0);
diff --git a/app/dialogs/image-new-dialog.c b/app/dialogs/image-new-dialog.c
index 6a0816d..fffcdd1 100644
--- a/app/dialogs/image-new-dialog.c
+++ b/app/dialogs/image-new-dialog.c
@@ -120,7 +120,7 @@ image_new_dialog_new (GimpContext *context)
                                            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->dialog))),
                       main_vbox, TRUE, TRUE, 0);
diff --git a/app/dialogs/keyboard-shortcuts-dialog.c b/app/dialogs/keyboard-shortcuts-dialog.c
index 23c85fb..cf8f415 100644
--- a/app/dialogs/keyboard-shortcuts-dialog.c
+++ b/app/dialogs/keyboard-shortcuts-dialog.c
@@ -59,7 +59,7 @@ keyboard_shortcuts_dialog_new (Gimp *gimp)
                     G_CALLBACK (gtk_widget_destroy),
                     NULL);
 
-  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/app/dialogs/layer-add-mask-dialog.c b/app/dialogs/layer-add-mask-dialog.c
index 53b34a0..e7504d7 100644
--- a/app/dialogs/layer-add-mask-dialog.c
+++ b/app/dialogs/layer-add-mask-dialog.c
@@ -101,7 +101,7 @@ layer_add_mask_dialog_new (GimpLayer       *layer,
                                            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->dialog))),
                       vbox, TRUE, TRUE, 0);
diff --git a/app/dialogs/layer-options-dialog.c b/app/dialogs/layer-options-dialog.c
index d5d4ad2..26695ef 100644
--- a/app/dialogs/layer-options-dialog.c
+++ b/app/dialogs/layer-options-dialog.c
@@ -107,7 +107,7 @@ layer_options_dialog_new (GimpImage    *image,
                                            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 (options->dialog))),
                       vbox, TRUE, TRUE, 0);
diff --git a/app/dialogs/module-dialog.c b/app/dialogs/module-dialog.c
index b53540d..ba66938 100644
--- a/app/dialogs/module-dialog.c
+++ b/app/dialogs/module-dialog.c
@@ -141,7 +141,7 @@ module_dialog_new (Gimp *gimp)
                     G_CALLBACK (dialog_response),
                     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 (shell))),
                       vbox, TRUE, TRUE, 0);
@@ -201,7 +201,7 @@ module_dialog_new (Gimp *gimp)
   gtk_box_pack_start (GTK_BOX (vbox), dialog->table, FALSE, FALSE, 0);
   gtk_widget_show (dialog->table);
 
-  dialog->error_box = gtk_hbox_new (FALSE, 6);
+  dialog->error_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox), dialog->error_box, FALSE, FALSE, 0);
 
   image = gtk_image_new_from_stock (GIMP_STOCK_WARNING, GTK_ICON_SIZE_BUTTON);
diff --git a/app/dialogs/offset-dialog.c b/app/dialogs/offset-dialog.c
index 7899464..bd24089 100644
--- a/app/dialogs/offset-dialog.c
+++ b/app/dialogs/offset-dialog.c
@@ -142,7 +142,7 @@ offset_dialog_new (GimpDrawable *drawable,
                     G_CALLBACK (offset_response),
                     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->dialog))),
                       main_vbox, TRUE, TRUE, 0);
@@ -153,11 +153,11 @@ offset_dialog_new (GimpDrawable *drawable,
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (0, FALSE);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
 
-  vbox = gtk_vbox_new (6, FALSE);
+  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/app/dialogs/palette-import-dialog.c b/app/dialogs/palette-import-dialog.c
index 9cdd554..2c4a04e 100644
--- a/app/dialogs/palette-import-dialog.c
+++ b/app/dialogs/palette-import-dialog.c
@@ -187,13 +187,13 @@ palette_import_dialog_new (GimpContext *context)
                               import_dialog_drop_callback,
                               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->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);
 
@@ -362,7 +362,7 @@ palette_import_dialog_new (GimpContext *context)
   gtk_box_pack_start (GTK_BOX (main_hbox), 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/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c
index b099055..e9bf982 100644
--- a/app/dialogs/preferences-dialog.c
+++ b/app/dialogs/preferences-dialog.c
@@ -706,7 +706,7 @@ prefs_notebook_append_page (Gimp          *gimp,
 
   gimp_help_set_help_data (event_box, NULL, help_id);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_container_add (GTK_CONTAINER (event_box), vbox);
   gtk_widget_show (vbox);
 
@@ -904,7 +904,7 @@ prefs_frame_new (const gchar  *label,
 
   frame = gimp_frame_new (label);
 
-  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);
 
@@ -1080,7 +1080,7 @@ prefs_check_button_add_with_icon (GObject      *config,
   if (!button)
     return NULL;
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (vbox, hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -1253,11 +1253,11 @@ prefs_display_options_frame_add (Gimp         *gimp,
 
   vbox = prefs_frame_new (label, parent, FALSE);
 
-  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);
 
-  checks_vbox = gtk_vbox_new (FALSE, 2);
+  checks_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_box_pack_start (GTK_BOX (hbox), checks_vbox, TRUE, TRUE, 0);
   gtk_widget_show (checks_vbox);
 
@@ -1276,7 +1276,7 @@ prefs_display_options_frame_add (Gimp         *gimp,
                           _("Show s_tatusbar"),
                           GTK_BOX (checks_vbox));
 
-  checks_vbox = gtk_vbox_new (FALSE, 2);
+  checks_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_box_pack_start (GTK_BOX (hbox), checks_vbox, TRUE, TRUE, 0);
   gtk_widget_show (checks_vbox);
 
@@ -1413,7 +1413,7 @@ prefs_dialog_new (Gimp       *gimp,
                     dialog);
 
   /* The 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 (dialog))),
                       hbox, TRUE, TRUE, 0);
@@ -1450,7 +1450,7 @@ prefs_dialog_new (Gimp       *gimp,
 
   gtk_container_add (GTK_CONTAINER (frame), tv);
 
-  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);
 
@@ -1459,7 +1459,7 @@ prefs_dialog_new (Gimp       *gimp,
   gtk_box_pack_start (GTK_BOX (vbox), ebox, FALSE, TRUE, 0);
   gtk_widget_show (ebox);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
   gtk_container_add (GTK_CONTAINER (ebox), hbox);
   gtk_widget_show (hbox);
@@ -1750,7 +1750,7 @@ prefs_dialog_new (Gimp       *gimp,
                       gimp);
   }
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -1815,7 +1815,7 @@ prefs_dialog_new (Gimp       *gimp,
         text = _("The user manual is not installed locally.");
       }
 
-    hbox = gtk_hbox_new (FALSE, 6);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
     gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 2, 1, 2);
     gtk_widget_show (hbox);
 
@@ -2335,7 +2335,7 @@ prefs_dialog_new (Gimp       *gimp,
   gimp_size_entry_attach_label (GIMP_SIZE_ENTRY (entry),
                                 _("ppi"), 1, 4, 0.0);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
   gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE, 24);
   gtk_widget_show (entry);
@@ -2378,7 +2378,7 @@ prefs_dialog_new (Gimp       *gimp,
   if (! display_config->monitor_res_from_gdk)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -2504,7 +2504,7 @@ prefs_dialog_new (Gimp       *gimp,
 
     g_object_unref (store);
 
-    hbox = gtk_hbox_new (FALSE, 6);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
     gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 2, row, row + 1);
     gtk_widget_show (hbox);
     row++;
diff --git a/app/dialogs/print-size-dialog.c b/app/dialogs/print-size-dialog.c
index d8c7290..ac31433 100644
--- a/app/dialogs/print-size-dialog.c
+++ b/app/dialogs/print-size-dialog.c
@@ -176,7 +176,7 @@ print_size_dialog_new (GimpImage              *image,
                     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_defaults (GTK_TABLE (table), hbox, 1, 2, 0, 2);
   gtk_widget_show (hbox);
 
@@ -233,7 +233,7 @@ print_size_dialog_new (GimpImage              *image,
                     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_defaults (GTK_TABLE (table), hbox, 1, 2, 2, 4);
   gtk_widget_show (hbox);
 
diff --git a/app/dialogs/resize-dialog.c b/app/dialogs/resize-dialog.c
index cc6087a..6e92a73 100644
--- a/app/dialogs/resize-dialog.c
+++ b/app/dialogs/resize-dialog.c
@@ -182,7 +182,7 @@ resize_dialog_new (GimpViewable       *viewable,
                     G_CALLBACK (resize_dialog_response),
                     private);
 
-  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);
@@ -199,7 +199,7 @@ resize_dialog_new (GimpViewable       *viewable,
   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);
 
@@ -288,7 +288,7 @@ resize_dialog_new (GimpViewable       *viewable,
       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/app/dialogs/resolution-calibrate-dialog.c b/app/dialogs/resolution-calibrate-dialog.c
index be3d9b5..042d824 100644
--- a/app/dialogs/resolution-calibrate-dialog.c
+++ b/app/dialogs/resolution-calibrate-dialog.c
@@ -119,7 +119,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry,
                     GTK_SHRINK, GTK_SHRINK, 0, 0);
   gtk_widget_show (ruler);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_table_attach (GTK_TABLE (table), vbox, 1, 2, 1, 2,
                     GTK_SHRINK, GTK_SHRINK, 0, 0);
   gtk_widget_show (vbox);
@@ -135,7 +135,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry,
   gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
   gtk_widget_show (label);
 
-  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/app/dialogs/scale-dialog.c b/app/dialogs/scale-dialog.c
index dfaf1a9..23702a7 100644
--- a/app/dialogs/scale-dialog.c
+++ b/app/dialogs/scale-dialog.c
@@ -160,7 +160,7 @@ scale_dialog_new (GimpViewable          *viewable,
                     G_CALLBACK (scale_dialog_response),
                     private);
 
-  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);
@@ -177,11 +177,11 @@ scale_dialog_new (GimpViewable          *viewable,
   gtk_box_pack_start (GTK_BOX (vbox), 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);
 
-  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/app/dialogs/stroke-dialog.c b/app/dialogs/stroke-dialog.c
index 24c9ef9..118f1f2 100644
--- a/app/dialogs/stroke-dialog.c
+++ b/app/dialogs/stroke-dialog.c
@@ -121,7 +121,7 @@ stroke_dialog_new (GimpItem    *item,
   g_object_set_data_full (G_OBJECT (dialog), "gimp-stroke-options", options,
                           (GDestroyNotify) g_object_unref);
 
-  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);
@@ -199,7 +199,7 @@ stroke_dialog_new (GimpItem    *item,
     GtkWidget *combo;
     GtkWidget *button;
 
-    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);
 
@@ -207,7 +207,7 @@ stroke_dialog_new (GimpItem    *item,
                             vbox,        "sensitive",
                             G_BINDING_SYNC_CREATE);
 
-    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/app/dialogs/template-options-dialog.c b/app/dialogs/template-options-dialog.c
index a9b615d..14e307a 100644
--- a/app/dialogs/template-options-dialog.c
+++ b/app/dialogs/template-options-dialog.c
@@ -103,7 +103,7 @@ template_options_dialog_new (GimpTemplate *template,
   g_object_weak_ref (G_OBJECT (options->dialog),
                      (GWeakNotify) template_options_dialog_free, options);
 
-  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 (options->dialog))),
                       vbox, TRUE, TRUE, 0);
diff --git a/app/dialogs/tips-dialog.c b/app/dialogs/tips-dialog.c
index 0bbb904..d5fb810 100644
--- a/app/dialogs/tips-dialog.c
+++ b/app/dialogs/tips-dialog.c
@@ -154,18 +154,18 @@ tips_dialog_create (Gimp *gimp)
                     G_CALLBACK (tips_dialog_destroy),
                     config);
 
-  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 (tips_dialog))),
                       vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 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, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
@@ -184,7 +184,7 @@ tips_dialog_create (Gimp *gimp)
   gtk_box_pack_start (GTK_BOX (vbox), tip_label, TRUE, TRUE, 0);
   gtk_widget_show (tip_label);
 
-  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/app/dialogs/vectors-import-dialog.c b/app/dialogs/vectors-import-dialog.c
index d2a085c..e094081 100644
--- a/app/dialogs/vectors-import-dialog.c
+++ b/app/dialogs/vectors-import-dialog.c
@@ -101,7 +101,7 @@ vectors_import_dialog_new (GimpImage *image,
 
   gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog->dialog), filter);
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog->dialog), vbox);
   gtk_widget_show (vbox);
 
diff --git a/app/dialogs/vectors-options-dialog.c b/app/dialogs/vectors-options-dialog.c
index 4c6117e..1c883e7 100644
--- a/app/dialogs/vectors-options-dialog.c
+++ b/app/dialogs/vectors-options-dialog.c
@@ -99,13 +99,13 @@ vectors_options_dialog_new (GimpImage   *image,
   g_object_weak_ref (G_OBJECT (options->dialog),
                      (GWeakNotify) vectors_options_dialog_free, options);
 
-  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 (options->dialog))),
                       hbox, TRUE, TRUE, 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, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
diff --git a/app/display/gimpcursorview.c b/app/display/gimpcursorview.c
index 289cda1..7218b92 100644
--- a/app/display/gimpcursorview.c
+++ b/app/display/gimpcursorview.c
@@ -186,12 +186,18 @@ gimp_cursor_view_init (GimpCursorView *view)
 
   /* cursor information */
 
-  view->priv->coord_hbox = gtk_hbox_new (TRUE, content_spacing);
-  gtk_box_pack_start (GTK_BOX (view), view->priv->coord_hbox, FALSE, FALSE, 0);
+  view->priv->coord_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL,
+                                        content_spacing);
+  gtk_box_set_homogeneous (GTK_BOX (view->priv->coord_hbox), TRUE);
+  gtk_box_pack_start (GTK_BOX (view), view->priv->coord_hbox,
+                      FALSE, FALSE, 0);
   gtk_widget_show (view->priv->coord_hbox);
 
-  view->priv->selection_hbox = gtk_hbox_new (TRUE, content_spacing);
-  gtk_box_pack_start (GTK_BOX (view), view->priv->selection_hbox, FALSE, FALSE, 0);
+  view->priv->selection_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL,
+                                            content_spacing);
+  gtk_box_set_homogeneous (GTK_BOX (view->priv->selection_hbox), TRUE);
+  gtk_box_pack_start (GTK_BOX (view), view->priv->selection_hbox,
+                      FALSE, FALSE, 0);
   gtk_widget_show (view->priv->selection_hbox);
 
 
@@ -296,7 +302,9 @@ gimp_cursor_view_init (GimpCursorView *view)
 
   /* color information */
 
-  view->priv->color_hbox = gtk_hbox_new (TRUE, content_spacing);
+  view->priv->color_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL,
+                                        content_spacing);
+  gtk_box_set_homogeneous (GTK_BOX (view->priv->color_hbox), TRUE);
   gtk_box_pack_start (GTK_BOX (view), view->priv->color_hbox, FALSE, FALSE, 0);
   gtk_widget_show (view->priv->color_hbox);
 
diff --git a/app/display/gimpdisplayshell-layer-select.c b/app/display/gimpdisplayshell-layer-select.c
index 638d013..55a69fc 100644
--- a/app/display/gimpdisplayshell-layer-select.c
+++ b/app/display/gimpdisplayshell-layer-select.c
@@ -21,6 +21,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
+#include "libgimpwidgets/gimpwidgets.h"
+
 #include "display-types.h"
 
 #include "config/gimpcoreconfig.h"
@@ -138,7 +140,7 @@ layer_select_new (GimpImage *image,
   gtk_container_add (GTK_CONTAINER (frame1), frame2);
   gtk_widget_show (frame2);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
   gtk_container_add (GTK_CONTAINER (frame2), hbox);
   gtk_widget_show (hbox);
diff --git a/app/display/gimpdisplayshell-scale-dialog.c b/app/display/gimpdisplayshell-scale-dialog.c
index b2da8df..f4c269e 100644
--- a/app/display/gimpdisplayshell-scale-dialog.c
+++ b/app/display/gimpdisplayshell-scale-dialog.c
@@ -156,7 +156,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell)
 
   row = 0;
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
                              _("Zoom ratio:"), 0.0, 0.5,
                              hbox, 1, FALSE);
@@ -181,7 +181,7 @@ gimp_display_shell_scale_dialog (GimpDisplayShell *shell)
   gtk_box_pack_start (GTK_BOX (hbox), spin, TRUE, TRUE, 0);
   gtk_widget_show (spin);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gimp_table_attach_aligned (GTK_TABLE (table), 0, row++,
                              _("Zoom:"), 0.0, 0.5,
                              hbox, 1, FALSE);
diff --git a/app/display/gimpdisplayshell.c b/app/display/gimpdisplayshell.c
index e522823..4b97daf 100644
--- a/app/display/gimpdisplayshell.c
+++ b/app/display/gimpdisplayshell.c
@@ -454,7 +454,7 @@ gimp_display_shell_constructed (GObject *object)
   /*  first, set up the container hierarchy  *********************************/
 
   /*  a hbox for the inner_table and the vertical scrollbar  */
-  upper_hbox = gtk_hbox_new (FALSE, 0);
+  upper_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_start (GTK_BOX (shell), upper_hbox, TRUE, TRUE, 0);
   gtk_widget_show (upper_hbox);
 
@@ -466,14 +466,14 @@ gimp_display_shell_constructed (GObject *object)
   gtk_widget_show (inner_table);
 
   /*  the vbox containing the color button and the vertical scrollbar  */
-  right_vbox = gtk_vbox_new (FALSE, 1);
+  right_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 1);
   gtk_box_pack_start (GTK_BOX (upper_hbox), right_vbox, FALSE, FALSE, 0);
   gtk_widget_show (right_vbox);
 
   /*  the hbox containing the quickmask button, vertical scrollbar and
    *  the navigation button
    */
-  lower_hbox = gtk_hbox_new (FALSE, 1);
+  lower_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 1);
   gtk_box_pack_start (GTK_BOX (shell), lower_hbox, FALSE, FALSE, 0);
   gtk_widget_show (lower_hbox);
 
diff --git a/app/display/gimpimagewindow.c b/app/display/gimpimagewindow.c
index 55e1b55..85cf80d 100644
--- a/app/display/gimpimagewindow.c
+++ b/app/display/gimpimagewindow.c
@@ -328,7 +328,7 @@ gimp_image_window_constructed (GObject *object)
   config = GIMP_GUI_CONFIG (gimp_dialog_factory_get_context (private->dialog_factory)->gimp->config);
 
   /* Create the window toplevel container */
-  private->main_vbox = gtk_vbox_new (FALSE, 0);
+  private->main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (window), private->main_vbox);
   gtk_widget_show (private->main_vbox);
 
@@ -363,7 +363,7 @@ gimp_image_window_constructed (GObject *object)
     }
 
   /* Create the hbox that contains docks and images */
-  private->hbox = gtk_hbox_new (FALSE, 0);
+  private->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_start (GTK_BOX (private->main_vbox), private->hbox,
                       TRUE, TRUE, 0);
   gtk_widget_show (private->hbox);
@@ -1866,7 +1866,7 @@ gimp_image_window_create_tab_label (GimpImageWindow  *window,
   GtkWidget *button;
   GtkWidget *gtk_image;
 
-  hbox = gtk_hbox_new (FALSE, 2);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_widget_show (hbox);
 
   view = gimp_view_new_by_types (gimp_get_user_context (shell->display->gimp),
diff --git a/app/display/gimpnavigationeditor.c b/app/display/gimpnavigationeditor.c
index 01d7149..4172d5f 100644
--- a/app/display/gimpnavigationeditor.c
+++ b/app/display/gimpnavigationeditor.c
@@ -415,7 +415,7 @@ gimp_navigation_editor_new_private (GimpMenuFactory  *menu_factory,
 
       /* the zoom scale */
 
-      hbox = gtk_hbox_new (FALSE, 6);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
       gtk_box_pack_end (GTK_BOX (editor), hbox, FALSE, FALSE, 0);
       gtk_widget_show (hbox);
 
diff --git a/app/gui/splash.c b/app/gui/splash.c
index 7e23d18..9e3dd63 100644
--- a/app/gui/splash.c
+++ b/app/gui/splash.c
@@ -24,6 +24,7 @@
 #include "libgimpbase/gimpbase.h"
 #include "libgimpmath/gimpmath.h"
 #include "libgimpcolor/gimpcolor.h"
+#include "libgimpwidgets/gimpwidgets.h"
 
 #include "gui-types.h"
 
@@ -133,7 +134,7 @@ splash_create (gboolean be_verbose)
   gtk_container_add (GTK_CONTAINER (splash->window), frame);
   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/app/tools/gimpalignoptions.c b/app/tools/gimpalignoptions.c
index 95a9cb1..486e9ee 100644
--- a/app/tools/gimpalignoptions.c
+++ b/app/tools/gimpalignoptions.c
@@ -273,11 +273,11 @@ gimp_align_options_gui (GimpToolOptions *tool_options)
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  align_vbox = gtk_vbox_new (FALSE, 6);
+  align_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), align_vbox);
   gtk_widget_show (align_vbox);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (align_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -289,7 +289,7 @@ gimp_align_options_gui (GimpToolOptions *tool_options)
   gtk_container_add (GTK_CONTAINER (frame), combo);
   gtk_widget_show (combo);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (align_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -305,7 +305,7 @@ gimp_align_options_gui (GimpToolOptions *tool_options)
     gimp_align_options_button_new (options, GIMP_ALIGN_RIGHT, hbox,
                                    _("Align right edge of target"));
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (align_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -325,11 +325,11 @@ gimp_align_options_gui (GimpToolOptions *tool_options)
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  align_vbox = gtk_vbox_new (FALSE, 6);
+  align_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (frame), align_vbox);
   gtk_widget_show (align_vbox);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (align_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -345,7 +345,7 @@ gimp_align_options_gui (GimpToolOptions *tool_options)
     gimp_align_options_button_new (options, GIMP_ARRANGE_RIGHT, hbox,
                                    _("Distribute right edges of targets"));
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (align_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -361,7 +361,7 @@ gimp_align_options_gui (GimpToolOptions *tool_options)
     gimp_align_options_button_new (options, GIMP_ARRANGE_BOTTOM, hbox,
                                    _("Distribute bottoms of targets"));
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (align_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/app/tools/gimpblendoptions.c b/app/tools/gimpblendoptions.c
index a29a574..8b59675 100644
--- a/app/tools/gimpblendoptions.c
+++ b/app/tools/gimpblendoptions.c
@@ -256,7 +256,7 @@ gimp_blend_options_gui (GimpToolOptions *tool_options)
   gtk_widget_show (button);
 
   /*  supersampling options  */
-  vbox2 = gtk_vbox_new (FALSE, 2);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   frame = gimp_prop_expanding_frame_new (config, "supersample",
                                          _("Adaptive supersampling"),
                                          vbox2, NULL);
diff --git a/app/tools/gimpbucketfilloptions.c b/app/tools/gimpbucketfilloptions.c
index 6e1f630..f637d12 100644
--- a/app/tools/gimpbucketfilloptions.c
+++ b/app/tools/gimpbucketfilloptions.c
@@ -261,7 +261,7 @@ gimp_bucket_fill_options_gui (GimpToolOptions *tool_options)
                           G_BINDING_SYNC_CREATE |
                           G_BINDING_INVERT_BOOLEAN);
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (frame), vbox2);
   gtk_widget_show (vbox2);
 
diff --git a/app/tools/gimpcolorbalancetool.c b/app/tools/gimpcolorbalancetool.c
index 7e118f1..e508c8e 100644
--- a/app/tools/gimpcolorbalancetool.c
+++ b/app/tools/gimpcolorbalancetool.c
@@ -276,7 +276,7 @@ gimp_color_balance_tool_dialog (GimpImageMapTool *image_map_tool)
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -314,7 +314,7 @@ gimp_color_balance_tool_dialog (GimpImageMapTool *image_map_tool)
                     G_CALLBACK (color_balance_yb_changed),
                     cb_tool);
 
-  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/app/tools/gimpcolorizetool.c b/app/tools/gimpcolorizetool.c
index 708e225..41743b5 100644
--- a/app/tools/gimpcolorizetool.c
+++ b/app/tools/gimpcolorizetool.c
@@ -226,7 +226,7 @@ gimp_colorize_tool_dialog (GimpImageMapTool *image_map_tool)
   gtk_widget_show (frame);
 
   /*  The table containing sliders  */
-  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/app/tools/gimpcolorpickertool.c b/app/tools/gimpcolorpickertool.c
index ac99956..c36c4c9 100644
--- a/app/tools/gimpcolorpickertool.c
+++ b/app/tools/gimpcolorpickertool.c
@@ -319,7 +319,7 @@ gimp_color_picker_tool_info_create (GimpColorPickerTool *picker_tool)
 
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (picker_tool->dialog));
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 6);
   gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
diff --git a/app/tools/gimpcurvestool.c b/app/tools/gimpcurvestool.c
index 2fdb2f5..1bc74da 100644
--- a/app/tools/gimpcurvestool.c
+++ b/app/tools/gimpcurvestool.c
@@ -455,7 +455,7 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool)
   label_group = gimp_image_map_tool_dialog_get_label_group (image_map_tool);
 
   /*  The combo box for selecting channels  */
-  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);
 
@@ -507,7 +507,7 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool)
   gtk_box_pack_start (GTK_BOX (main_vbox), table, TRUE, TRUE, 0);
 
   /*  The left color bar  */
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_table_attach (GTK_TABLE (table), vbox, 0, 1, 0, 1,
                     GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
   gtk_widget_show (vbox);
@@ -549,7 +549,7 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool)
                                        GIMP_HISTOGRAM_VIEW (tool->graph));
 
   /*  The bottom color bar  */
-  hbox2 = gtk_hbox_new (FALSE, 0);
+  hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_table_attach (GTK_TABLE (table), hbox2, 1, 2, 1, 2,
                     GTK_EXPAND | GTK_FILL, GTK_FILL, 0, 0);
   gtk_widget_show (hbox2);
@@ -559,7 +559,8 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool)
   gtk_box_pack_start (GTK_BOX (hbox2), frame, TRUE, TRUE, RADIUS);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (TRUE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_box_set_homogeneous (GTK_BOX (vbox), TRUE);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -574,7 +575,7 @@ gimp_curves_tool_dialog (GimpImageMapTool *image_map_tool)
 
   gtk_widget_show (table);
 
-  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/app/tools/gimpflipoptions.c b/app/tools/gimpflipoptions.c
index 8e02916..5313008 100644
--- a/app/tools/gimpflipoptions.c
+++ b/app/tools/gimpflipoptions.c
@@ -123,7 +123,7 @@ gimp_flip_options_gui (GimpToolOptions *tool_options)
   GtkWidget *frame;
   gchar     *str;
 
-  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/app/tools/gimpforegroundselectoptions.c b/app/tools/gimpforegroundselectoptions.c
index 0396bf2..23f2947 100644
--- a/app/tools/gimpforegroundselectoptions.c
+++ b/app/tools/gimpforegroundselectoptions.c
@@ -292,12 +292,12 @@ gimp_foreground_select_options_gui (GimpToolOptions *tool_options)
   gtk_widget_show (frame);
 
   /*  stroke width  */
-  inner_frame = gtk_vbox_new (FALSE, 0);
+  inner_frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_box_pack_start (GTK_BOX (gtk_bin_get_child (GTK_BIN (frame))),
                       inner_frame, FALSE, FALSE, 2);
   gtk_widget_show (inner_frame);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (inner_frame), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/app/tools/gimpgegltool.c b/app/tools/gimpgegltool.c
index c9bf362..0e202e6 100644
--- a/app/tools/gimpgegltool.c
+++ b/app/tools/gimpgegltool.c
@@ -370,7 +370,7 @@ gimp_gegl_tool_dialog (GimpImageMapTool *image_map_tool)
   main_vbox = gimp_image_map_tool_dialog_get_vbox (image_map_tool);
 
   /*  The operation combo box  */
-  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/app/tools/gimphuesaturationtool.c b/app/tools/gimphuesaturationtool.c
index 7977827..972a505 100644
--- a/app/tools/gimphuesaturationtool.c
+++ b/app/tools/gimphuesaturationtool.c
@@ -259,7 +259,7 @@ gimp_hue_saturation_tool_dialog (GimpImageMapTool *image_map_tool)
   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);
 
@@ -366,7 +366,7 @@ gimp_hue_saturation_tool_dialog (GimpImageMapTool *image_map_tool)
   gtk_widget_show (frame);
 
   /*  The table containing sliders  */
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -424,7 +424,7 @@ gimp_hue_saturation_tool_dialog (GimpImageMapTool *image_map_tool)
                     G_CALLBACK (hue_saturation_saturation_changed),
                     hs_tool);
 
-  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/app/tools/gimpimagemaptool-settings.c b/app/tools/gimpimagemaptool-settings.c
index 8137186..9e175e9 100644
--- a/app/tools/gimpimagemaptool-settings.c
+++ b/app/tools/gimpimagemaptool-settings.c
@@ -73,7 +73,7 @@ gimp_image_map_tool_add_settings_gui (GimpImageMapTool *image_map_tool)
 
   tool_info = GIMP_TOOL (image_map_tool)->tool_info;
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (image_map_tool->main_vbox), hbox,
                       FALSE, FALSE, 0);
   gtk_widget_show (hbox);
diff --git a/app/tools/gimpimagemaptool.c b/app/tools/gimpimagemaptool.c
index 1c25092..89caff0 100644
--- a/app/tools/gimpimagemaptool.c
+++ b/app/tools/gimpimagemaptool.c
@@ -321,7 +321,7 @@ gimp_image_map_tool_initialize (GimpTool     *tool,
           gimp_overlay_box_set_child_angle (GIMP_OVERLAY_BOX (display_shell->canvas),
                                             dialog, 0.0);
 
-          image_map_tool->main_vbox = vbox = gtk_vbox_new (FALSE, 6);
+          image_map_tool->main_vbox = vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
           gtk_container_add (GTK_CONTAINER (dialog), vbox);
         }
       else
@@ -343,7 +343,7 @@ gimp_image_map_tool_initialize (GimpTool     *tool,
                                                    GTK_RESPONSE_CANCEL,
                                                    -1);
 
-          image_map_tool->main_vbox = vbox = gtk_vbox_new (FALSE, 6);
+          image_map_tool->main_vbox = vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
           gtk_container_set_border_width (GTK_CONTAINER (vbox), 6);
           gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                               vbox, TRUE, TRUE, 0);
diff --git a/app/tools/gimpinkoptions-gui.c b/app/tools/gimpinkoptions-gui.c
index dbcfc1f..a175f7b 100644
--- a/app/tools/gimpinkoptions-gui.c
+++ b/app/tools/gimpinkoptions-gui.c
@@ -55,7 +55,7 @@ gimp_ink_options_gui (GimpToolOptions *tool_options)
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
   gtk_widget_show (frame);
 
-  vbox2 = gtk_vbox_new (FALSE, 2);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add (GTK_CONTAINER (frame), vbox2);
   gtk_widget_show (vbox2);
 
@@ -78,7 +78,7 @@ gimp_ink_options_gui (GimpToolOptions *tool_options)
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
   gtk_widget_show (frame);
 
-  vbox2 = gtk_vbox_new (FALSE, 2);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add (GTK_CONTAINER (frame), vbox2);
   gtk_widget_show (vbox2);
 
@@ -108,7 +108,7 @@ gimp_ink_options_gui (GimpToolOptions *tool_options)
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (FALSE, 2);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
 
diff --git a/app/tools/gimplevelstool.c b/app/tools/gimplevelstool.c
index 2d8c3ed..e592d13 100644
--- a/app/tools/gimplevelstool.c
+++ b/app/tools/gimplevelstool.c
@@ -377,7 +377,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
   label_group = gimp_image_map_tool_dialog_get_label_group (image_map_tool);
 
   /*  The option menu for selecting channels  */
-  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);
 
@@ -424,7 +424,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
-  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);
 
@@ -433,7 +433,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
   gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (frame), vbox2);
   gtk_widget_show (vbox2);
 
@@ -446,7 +446,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
 
   g_object_get (tool->histogram_view, "border-width", &border, NULL);
 
-  vbox3 = gtk_vbox_new (FALSE, 0);
+  vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox3), border);
   gtk_box_pack_start (GTK_BOX (vbox2), vbox3, FALSE, FALSE, 0);
   gtk_widget_show (vbox3);
@@ -491,12 +491,12 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
                             tool->input_sliders);
 
   /*  Horizontal box for input levels spinbuttons  */
-  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);
 
   /*  low input spin  */
-  hbox2 = gtk_hbox_new (FALSE, 2);
+  hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_box_pack_start (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
   gtk_widget_show (hbox2);
 
@@ -542,7 +542,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
   g_object_unref (tool->gamma_linear);
 
   /*  high input spin  */
-  hbox2 = gtk_hbox_new (FALSE, 2);
+  hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_box_pack_end (GTK_BOX (hbox), hbox2, FALSE, FALSE, 0);
   gtk_widget_show (hbox2);
 
@@ -569,7 +569,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
   gtk_box_pack_start (GTK_BOX (main_vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -578,7 +578,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox2), border);
   gtk_container_add (GTK_CONTAINER (frame), vbox2);
   gtk_widget_show (vbox2);
@@ -606,7 +606,7 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
                             tool->output_sliders);
 
   /*  Horizontal box for levels spin widgets  */
-  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);
 
@@ -646,11 +646,11 @@ gimp_levels_tool_dialog (GimpImageMapTool *image_map_tool)
   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);
 
-  hbbox = gtk_hbox_new (FALSE, 6);
+  hbbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_end (GTK_BOX (hbox), hbbox, FALSE, FALSE, 0);
   gtk_widget_show (hbbox);
 
diff --git a/app/tools/gimpmoveoptions.c b/app/tools/gimpmoveoptions.c
index 50d70d1..06ed42e 100644
--- a/app/tools/gimpmoveoptions.c
+++ b/app/tools/gimpmoveoptions.c
@@ -171,7 +171,7 @@ gimp_move_options_gui (GimpToolOptions *tool_options)
   GtkWidget *frame;
   gchar     *title;
 
-  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/app/tools/gimppaintoptions-gui.c b/app/tools/gimppaintoptions-gui.c
index 92da182..888e064 100644
--- a/app/tools/gimppaintoptions-gui.c
+++ b/app/tools/gimppaintoptions-gui.c
@@ -126,7 +126,7 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
       gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
       gtk_widget_show (button);
 
-      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);
 
@@ -151,7 +151,7 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
       gimp_help_set_help_data (button,
                                _("Reset size to brush's native size"), 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);
 
@@ -175,7 +175,7 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
       gimp_help_set_help_data (button,
                                _("Reset aspect ratio to brush's native"), 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);
 
@@ -279,7 +279,7 @@ dynamics_options_gui (GimpPaintOptions *paint_options,
   frame = gimp_prop_expander_new (config, "dynamics-expanded",
                                   _("Dynamics Options"));
 
-  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);
 
@@ -287,12 +287,12 @@ dynamics_options_gui (GimpPaintOptions *paint_options,
   gtk_box_pack_start (GTK_BOX (vbox), inner_frame, FALSE, FALSE, 0);
   gtk_widget_show (inner_frame);
 
-  inner_vbox = gtk_vbox_new (FALSE, 2);
+  inner_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add (GTK_CONTAINER (inner_frame), inner_vbox);
   gtk_widget_show (inner_vbox);
 
   /*  the fade-out scale & unitmenu  */
-  hbox = gtk_hbox_new (FALSE, 2);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_box_pack_start (GTK_BOX (inner_vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -376,7 +376,7 @@ smoothing_options_gui (GimpPaintOptions *paint_options,
   GtkWidget *vbox;
   GtkWidget *scale;
 
-  vbox = gtk_vbox_new (FALSE, 2);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
 
   frame = gimp_prop_expanding_frame_new (config, "use-smoothing",
                                          _("Smooth stroke"),
diff --git a/app/tools/gimpperspectiveclonetool.c b/app/tools/gimpperspectiveclonetool.c
index d4eeef1..1645657 100644
--- a/app/tools/gimpperspectiveclonetool.c
+++ b/app/tools/gimpperspectiveclonetool.c
@@ -881,7 +881,7 @@ gimp_perspective_clone_options_gui (GimpToolOptions *tool_options)
   GtkWidget *table;
   GtkWidget *combo;
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   paint_options = gimp_paint_options_gui (tool_options);
 
   /* radio buttons to set if you are modifying perspe plane or painting */
diff --git a/app/tools/gimprectangleoptions.c b/app/tools/gimprectangleoptions.c
index 25ca9a6..1b6c8a1 100644
--- a/app/tools/gimprectangleoptions.c
+++ b/app/tools/gimprectangleoptions.c
@@ -782,7 +782,7 @@ gimp_rectangle_options_prop_dimension_frame_new (GObject      *config,
   frame = gimp_frame_new (NULL);
 
   /*  title  */
-  hbox = gtk_hbox_new (FALSE, 4);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_frame_set_label_widget (GTK_FRAME (frame), hbox);
   gtk_widget_show (hbox);
 
@@ -795,7 +795,7 @@ gimp_rectangle_options_prop_dimension_frame_new (GObject      *config,
   gtk_widget_show (menu);
 
   /*  content  */
-  hbox = gtk_hbox_new (FALSE, 4);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
 
@@ -854,7 +854,7 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
 
     /* Setup frame title widgets */
 
-    hbox = gtk_hbox_new (FALSE, 2);
+    hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
     gtk_frame_set_label_widget (GTK_FRAME (frame), hbox);
     gtk_widget_show (hbox);
 
@@ -877,14 +877,14 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
 
     /* Setup frame content */
 
-    vbox2 = gtk_vbox_new (FALSE, 0);
+    vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     gtk_container_add (GTK_CONTAINER (frame), vbox2);
     gtk_widget_show (vbox2);
 
     size_group = gtk_size_group_new (GTK_SIZE_GROUP_VERTICAL);
 
     /* Fixed aspect entry/buttons */
-    private->fixed_aspect_hbox = gtk_hbox_new (FALSE, 2);
+    private->fixed_aspect_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
     gtk_box_pack_start (GTK_BOX (vbox2), private->fixed_aspect_hbox,
                         FALSE, FALSE, 0);
     gtk_size_group_add_widget (size_group, private->fixed_aspect_hbox);
@@ -962,7 +962,7 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
                                (gpointer) &private->fixed_height_entry);
 
     /* Fixed size entry */
-    private->fixed_size_hbox = gtk_hbox_new (FALSE, 2);
+    private->fixed_size_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
     gtk_box_pack_start (GTK_BOX (vbox2), private->fixed_size_hbox,
                         FALSE, FALSE, 0);
     gtk_size_group_add_widget (size_group, private->fixed_size_hbox);
diff --git a/app/tools/gimpselectionoptions.c b/app/tools/gimpselectionoptions.c
index c62bbaa..78c79e1 100644
--- a/app/tools/gimpselectionoptions.c
+++ b/app/tools/gimpselectionoptions.c
@@ -205,7 +205,7 @@ gimp_selection_options_gui (GimpToolOptions *tool_options)
     GList     *list;
     gint       i;
 
-    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/app/tools/gimptextoptions.c b/app/tools/gimptextoptions.c
index 9aa6ccd..324fa13 100644
--- a/app/tools/gimptextoptions.c
+++ b/app/tools/gimptextoptions.c
@@ -527,7 +527,7 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
 
   options->size_entry = entry;
 
-  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);
 
@@ -598,11 +598,11 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
   {
     GtkWidget *label;
 
-    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);
 
-    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/app/tools/gimptexttool.c b/app/tools/gimptexttool.c
index 1b90757..4804648 100644
--- a/app/tools/gimptexttool.c
+++ b/app/tools/gimptexttool.c
@@ -1500,7 +1500,7 @@ gimp_text_tool_confirm_dialog (GimpTextTool *text_tool)
                     G_CALLBACK (gimp_text_tool_confirm_response),
                     text_tool);
 
-  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, FALSE, FALSE, 0);
diff --git a/app/tools/gimpthresholdtool.c b/app/tools/gimpthresholdtool.c
index dee70aa..69628c7 100644
--- a/app/tools/gimpthresholdtool.c
+++ b/app/tools/gimpthresholdtool.c
@@ -234,7 +234,7 @@ gimp_threshold_tool_dialog (GimpImageMapTool *image_map_tool)
 
   main_vbox = gimp_image_map_tool_dialog_get_vbox (image_map_tool);
 
-  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);
 
@@ -261,7 +261,7 @@ gimp_threshold_tool_dialog (GimpImageMapTool *image_map_tool)
   gimp_histogram_options_connect_view (GIMP_HISTOGRAM_OPTIONS (tool_options),
                                        t_tool->histogram_box->view);
 
-  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/app/tools/gimptooloptions-gui.c b/app/tools/gimptooloptions-gui.c
index d89290b..69c0f2c 100644
--- a/app/tools/gimptooloptions-gui.c
+++ b/app/tools/gimptooloptions-gui.c
@@ -19,6 +19,8 @@
 
 #include <gtk/gtk.h>
 
+#include "libgimpwidgets/gimpwidgets.h"
+
 #include "tools-types.h"
 
 #include "core/gimptooloptions.h"
@@ -35,7 +37,7 @@ gimp_tool_options_gui (GimpToolOptions *tool_options)
 
   g_return_val_if_fail (GIMP_IS_TOOL_OPTIONS (tool_options), NULL);
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
 
   return vbox;
 }
diff --git a/app/tools/gimptransformoptions.c b/app/tools/gimptransformoptions.c
index d4ac047..e26c8ad 100644
--- a/app/tools/gimptransformoptions.c
+++ b/app/tools/gimptransformoptions.c
@@ -269,7 +269,7 @@ gimp_transform_options_gui (GimpToolOptions *tool_options)
   GtkWidget   *grid_box;
   const gchar *constrain = 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);
 
@@ -318,7 +318,7 @@ gimp_transform_options_gui (GimpToolOptions *tool_options)
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  grid_box = gtk_vbox_new (FALSE, 2);
+  grid_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_container_add (GTK_CONTAINER (frame), grid_box);
   gtk_widget_show (grid_box);
 
diff --git a/app/widgets/gimpactioneditor.c b/app/widgets/gimpactioneditor.c
index 16ce666..7edad95 100644
--- a/app/widgets/gimpactioneditor.c
+++ b/app/widgets/gimpactioneditor.c
@@ -62,7 +62,7 @@ gimp_action_editor_init (GimpActionEditor *editor)
 
   gtk_box_set_spacing (GTK_BOX (editor), 12);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (editor), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/app/widgets/gimpbrusheditor.c b/app/widgets/gimpbrusheditor.c
index f0885ad..2d3f5c0 100644
--- a/app/widgets/gimpbrusheditor.c
+++ b/app/widgets/gimpbrusheditor.c
@@ -127,12 +127,12 @@ gimp_brush_editor_init (GimpBrushEditor *editor)
 
   editor->shape_group = NULL;
 
-  editor->options_box = gtk_vbox_new (FALSE, 2);
+  editor->options_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_box_pack_start (GTK_BOX (editor), editor->options_box, FALSE, FALSE, 0);
   gtk_widget_show (editor->options_box);
 
   /* Stock Box for the brush shape */
-  hbox = gtk_hbox_new (FALSE, 2);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_box_pack_start (GTK_BOX (editor->options_box), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/app/widgets/gimpbufferview.c b/app/widgets/gimpbufferview.c
index c37a1e6..63aa120 100644
--- a/app/widgets/gimpbufferview.c
+++ b/app/widgets/gimpbufferview.c
@@ -148,7 +148,7 @@ gimp_buffer_view_new (GimpViewType     view_type,
   gtk_box_reorder_child (GTK_BOX (editor), frame, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (FALSE, 2);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
diff --git a/app/widgets/gimpcolordisplayeditor.c b/app/widgets/gimpcolordisplayeditor.c
index 4cdad5e..f8acb9f 100644
--- a/app/widgets/gimpcolordisplayeditor.c
+++ b/app/widgets/gimpcolordisplayeditor.c
@@ -127,7 +127,7 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor)
   gtk_box_pack_start (GTK_BOX (editor), paned, TRUE, TRUE, 0);
   gtk_widget_show (paned);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_paned_pack1 (GTK_PANED (paned), hbox, FALSE, FALSE);
   gtk_widget_show (hbox);
 
@@ -175,7 +175,8 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor)
                     G_CALLBACK (gimp_color_display_editor_src_changed),
                     editor);
 
-  vbox = gtk_vbox_new (TRUE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
+  gtk_box_set_homogeneous (GTK_BOX (vbox), TRUE);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -293,11 +294,11 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor)
 
   /*  the config frame  */
 
-  vbox = gtk_vbox_new (FALSE, 6);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_paned_pack2 (GTK_PANED (paned), vbox, TRUE, FALSE);
   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);
 
@@ -305,11 +306,11 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor)
   gtk_box_pack_start (GTK_BOX (vbox), editor->config_frame, TRUE, TRUE, 0);
   gtk_widget_show (editor->config_frame);
 
-  editor->config_box = gtk_vbox_new (FALSE, 6);
+  editor->config_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (editor->config_frame), editor->config_box);
   gtk_widget_show (editor->config_box);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_end (GTK_BOX (editor->config_box), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/app/widgets/gimpcoloreditor.c b/app/widgets/gimpcoloreditor.c
index e3cc0d3..43a7f5e 100644
--- a/app/widgets/gimpcoloreditor.c
+++ b/app/widgets/gimpcoloreditor.c
@@ -165,7 +165,8 @@ gimp_color_editor_init (GimpColorEditor *editor)
                         "button-icon-size", &button_icon_size,
                         NULL);
 
-  editor->hbox = gtk_hbox_new (TRUE, button_spacing);
+  editor->hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, button_spacing);
+  gtk_box_set_homogeneous (GTK_BOX (editor->hbox), TRUE);
   gtk_box_pack_start (GTK_BOX (editor), editor->hbox, FALSE, FALSE, 0);
   gtk_widget_show (editor->hbox);
 
@@ -226,7 +227,8 @@ gimp_color_editor_init (GimpColorEditor *editor)
                         editor);
     }
 
-  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 (editor), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -239,7 +241,7 @@ gimp_color_editor_init (GimpColorEditor *editor)
                     G_CALLBACK (gimp_color_editor_fg_bg_notify),
                     editor);
 
-  vbox = gtk_vbox_new (FALSE, 3);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
diff --git a/app/widgets/gimpcolorframe.c b/app/widgets/gimpcolorframe.c
index 02977b3..2bb348f 100644
--- a/app/widgets/gimpcolorframe.c
+++ b/app/widgets/gimpcolorframe.c
@@ -129,7 +129,7 @@ gimp_color_frame_init (GimpColorFrame *frame)
                     G_CALLBACK (gimp_color_frame_menu_callback),
                     frame);
 
-  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);
 
@@ -143,7 +143,8 @@ gimp_color_frame_init (GimpColorFrame *frame)
                   NULL);
   gtk_box_pack_start (GTK_BOX (vbox), frame->color_area, FALSE, FALSE, 0);
 
-  vbox2 = gtk_vbox_new (TRUE, 2);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
+  gtk_box_set_homogeneous (GTK_BOX (vbox2), TRUE);
   gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0);
   gtk_widget_show (vbox2);
 
@@ -151,7 +152,7 @@ gimp_color_frame_init (GimpColorFrame *frame)
     {
       GtkWidget *hbox;
 
-      hbox = gtk_hbox_new (FALSE, 6);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
       gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE, 0);
       gtk_widget_show (hbox);
 
diff --git a/app/widgets/gimpcontrollereditor.c b/app/widgets/gimpcontrollereditor.c
index 04ac246..25e9ade 100644
--- a/app/widgets/gimpcontrollereditor.c
+++ b/app/widgets/gimpcontrollereditor.c
@@ -186,7 +186,7 @@ gimp_controller_editor_constructed (GObject *object)
   gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -208,7 +208,7 @@ gimp_controller_editor_constructed (GObject *object)
   gtk_box_pack_start (GTK_BOX (editor), frame, TRUE, TRUE, 0);
   gtk_widget_show (frame);
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_add (GTK_CONTAINER (frame), vbox);
   gtk_widget_show (vbox);
 
@@ -353,7 +353,7 @@ gimp_controller_editor_constructed (GObject *object)
                                        "text", COLUMN_ACTION,
                                        NULL);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/app/widgets/gimpcontrollerlist.c b/app/widgets/gimpcontrollerlist.c
index c09667d..5faeca9 100644
--- a/app/widgets/gimpcontrollerlist.c
+++ b/app/widgets/gimpcontrollerlist.c
@@ -156,7 +156,7 @@ gimp_controller_list_init (GimpControllerList *list)
 
   list->gimp = NULL;
 
-  list->hbox = hbox = gtk_hbox_new (FALSE, 6);
+  list->hbox = hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (list), hbox, TRUE, TRUE, 0);
   gtk_widget_show (hbox);
 
@@ -230,7 +230,8 @@ gimp_controller_list_init (GimpControllerList *list)
       g_type_class_unref (controller_class);
     }
 
-  vbox = gtk_vbox_new (TRUE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  gtk_box_set_homogeneous (GTK_BOX (vbox), TRUE);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
diff --git a/app/widgets/gimpdeviceeditor.c b/app/widgets/gimpdeviceeditor.c
index a640b3b..e74581e 100644
--- a/app/widgets/gimpdeviceeditor.c
+++ b/app/widgets/gimpdeviceeditor.c
@@ -170,7 +170,7 @@ gimp_device_editor_init (GimpDeviceEditor *editor)
 
   gtk_widget_set_sensitive (private->delete_button, FALSE);
 
-  vbox = gtk_vbox_new (FALSE, 12);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_paned_pack2 (GTK_PANED (editor), vbox, TRUE, TRUE);
   gtk_widget_show (vbox);
 
@@ -179,7 +179,7 @@ gimp_device_editor_init (GimpDeviceEditor *editor)
   gtk_box_pack_start (GTK_BOX (vbox), ebox, FALSE, FALSE, 0);
   gtk_widget_show (ebox);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
   gtk_container_add (GTK_CONTAINER (ebox), hbox);
   gtk_widget_show (hbox);
diff --git a/app/widgets/gimpdeviceinfoeditor.c b/app/widgets/gimpdeviceinfoeditor.c
index e64bc6a..15c8fec 100644
--- a/app/widgets/gimpdeviceinfoeditor.c
+++ b/app/widgets/gimpdeviceinfoeditor.c
@@ -184,7 +184,7 @@ gimp_device_info_editor_init (GimpDeviceInfoEditor *editor)
 
   gtk_box_set_spacing (GTK_BOX (editor), 12);
 
-  private->vbox = gtk_vbox_new (FALSE, 6);
+  private->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_box_pack_start (GTK_BOX (editor), private->vbox, TRUE, TRUE, 0);
   gtk_widget_show (private->vbox);
 
@@ -336,7 +336,7 @@ gimp_device_info_editor_constructed (GObject *object)
 
   /*  the mode menu  */
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (private->vbox), hbox, FALSE, FALSE, 0);
   gtk_box_reorder_child (GTK_BOX (private->vbox), hbox, 0);
   gtk_widget_show (hbox);
@@ -427,7 +427,7 @@ gimp_device_info_editor_constructed (GObject *object)
           GtkWidget *combo;
           GtkWidget *button;
 
-          vbox = gtk_vbox_new (FALSE, 0);
+          vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
           gtk_box_set_spacing (GTK_BOX (vbox), 6);
           gtk_container_add (GTK_CONTAINER (frame), vbox);
           gtk_widget_show (vbox);
@@ -450,7 +450,7 @@ gimp_device_info_editor_constructed (GObject *object)
 
           gimp_curve_view_set_curve (GIMP_CURVE_VIEW (view), curve, NULL);
 
-          hbox = gtk_hbox_new (FALSE, 0);
+          hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
           gtk_box_set_spacing (GTK_BOX (hbox), 6);
           gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE, 0);
           gtk_widget_show (hbox);
diff --git a/app/widgets/gimpdevicestatus.c b/app/widgets/gimpdevicestatus.c
index ed29f95..80be250 100644
--- a/app/widgets/gimpdevicestatus.c
+++ b/app/widgets/gimpdevicestatus.c
@@ -126,7 +126,7 @@ gimp_device_status_init (GimpDeviceStatus *status)
   status->gimp           = NULL;
   status->current_device = NULL;
 
-  status->vbox = gtk_vbox_new (FALSE, 0);
+  status->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_set_border_width (GTK_CONTAINER (status->vbox), 2);
   gtk_box_pack_start (GTK_BOX (status), status->vbox, TRUE, TRUE, 0);
   gtk_widget_show (status->vbox);
@@ -250,7 +250,7 @@ gimp_device_status_device_add (GimpContainer    *devices,
                       FALSE, FALSE, 0);
   gtk_widget_show (entry->ebox);
 
-  vbox = gtk_vbox_new (FALSE, 4);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_container_set_border_width (GTK_CONTAINER (vbox), 4);
   gtk_container_add (GTK_CONTAINER (entry->ebox), vbox);
   gtk_widget_show (vbox);
@@ -278,7 +278,7 @@ gimp_device_status_device_add (GimpContainer    *devices,
 
   /*  the row of properties  */
 
-  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);
 
diff --git a/app/widgets/gimpdnd.c b/app/widgets/gimpdnd.c
index f0454f5..3064ee8 100644
--- a/app/widgets/gimpdnd.c
+++ b/app/widgets/gimpdnd.c
@@ -1728,7 +1728,7 @@ gimp_dnd_get_viewable_icon (GtkWidget *widget,
       GtkWidget *hbox;
       GtkWidget *label;
 
-      hbox = gtk_hbox_new (FALSE, 3);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
       gtk_container_set_border_width (GTK_CONTAINER (hbox), 3);
       gtk_box_pack_start (GTK_BOX (hbox), view, FALSE, FALSE, 0);
       gtk_widget_show (view);
diff --git a/app/widgets/gimpdock.c b/app/widgets/gimpdock.c
index ccdeac1..062e268 100644
--- a/app/widgets/gimpdock.c
+++ b/app/widgets/gimpdock.c
@@ -178,11 +178,11 @@ gimp_dock_init (GimpDock *dock)
   gtk_widget_set_name (GTK_WIDGET (dock), name);
   g_free (name);
 
-  dock->p->temp_vbox = gtk_vbox_new (FALSE, 0);
+  dock->p->temp_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_box_pack_start (GTK_BOX (dock), dock->p->temp_vbox, FALSE, FALSE, 0);
   /* Never show it */
 
-  dock->p->main_vbox = gtk_vbox_new (FALSE, 0);
+  dock->p->main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_box_pack_start (GTK_BOX (dock), dock->p->main_vbox, TRUE, TRUE, 0);
   gtk_widget_show (dock->p->main_vbox);
 
diff --git a/app/widgets/gimpdockable.c b/app/widgets/gimpdockable.c
index 36a9e38..47afdb4 100644
--- a/app/widgets/gimpdockable.c
+++ b/app/widgets/gimpdockable.c
@@ -513,7 +513,7 @@ gimp_dockable_new_tab_widget_internal (GimpDockable *dockable,
     case GIMP_TAB_STYLE_ICON_BLURB:
     case GIMP_TAB_STYLE_PREVIEW_NAME:
     case GIMP_TAB_STYLE_PREVIEW_BLURB:
-      tab_widget = gtk_hbox_new (FALSE, dnd ? 6 : 2);
+      tab_widget = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, dnd ? 6 : 2);
 
       gtk_box_pack_start (GTK_BOX (tab_widget), icon, FALSE, FALSE, 0);
       gtk_widget_show (icon);
diff --git a/app/widgets/gimpdockwindow.c b/app/widgets/gimpdockwindow.c
index 6372cf7..abdfb29 100644
--- a/app/widgets/gimpdockwindow.c
+++ b/app/widgets/gimpdockwindow.c
@@ -354,7 +354,7 @@ gimp_dock_window_constructed (GObject *object)
     GtkWidget *vbox = NULL;
 
     /* Top-level GtkVBox */
-    vbox = gtk_vbox_new (FALSE, 0);
+    vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     gtk_container_add (GTK_CONTAINER (dock_window), vbox);
     gtk_widget_show (vbox);
 
@@ -363,7 +363,7 @@ gimp_dock_window_constructed (GObject *object)
       GtkWidget *hbox = NULL;
 
       /* GtkHBox */
-      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);
       if (dock_window->p->show_image_menu)
         gtk_widget_show (hbox);
diff --git a/app/widgets/gimpeditor.c b/app/widgets/gimpeditor.c
index 1126159..9d946d0 100644
--- a/app/widgets/gimpeditor.c
+++ b/app/widgets/gimpeditor.c
@@ -857,7 +857,9 @@ gimp_editor_ensure_button_box (GimpEditor     *editor,
 
   if (! editor->priv->button_box)
     {
-      editor->priv->button_box = gtk_hbox_new (TRUE, button_spacing);
+      editor->priv->button_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL,
+                                              button_spacing);
+      gtk_box_set_homogeneous (GTK_BOX (editor->priv->button_box), TRUE);
       gtk_box_pack_end (GTK_BOX (editor), editor->priv->button_box, FALSE, FALSE, 0);
       gtk_box_reorder_child (GTK_BOX (editor), editor->priv->button_box, 0);
 
diff --git a/app/widgets/gimperrordialog.c b/app/widgets/gimperrordialog.c
index c147f6b..eb6e3e8 100644
--- a/app/widgets/gimperrordialog.c
+++ b/app/widgets/gimperrordialog.c
@@ -70,7 +70,7 @@ gimp_error_dialog_init (GimpErrorDialog *dialog)
 
   gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 
-  dialog->vbox = gtk_vbox_new (FALSE, 0);
+  dialog->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
                       dialog->vbox, TRUE, TRUE, 0);
   gtk_widget_show (dialog->vbox);
diff --git a/app/widgets/gimpgradienteditor.c b/app/widgets/gimpgradienteditor.c
index c589a65..ea2cdc0 100644
--- a/app/widgets/gimpgradienteditor.c
+++ b/app/widgets/gimpgradienteditor.c
@@ -298,7 +298,7 @@ gimp_gradient_editor_init (GimpGradientEditor *editor)
   gtk_box_pack_start (GTK_BOX (editor), 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);
 
@@ -380,7 +380,7 @@ gimp_gradient_editor_init (GimpGradientEditor *editor)
   gtk_widget_show (editor->scrollbar);
 
   /* Box for current color and the hint labels */
-  hbox = gtk_hbox_new (FALSE, 2);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_box_pack_start (GTK_BOX (editor), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -400,7 +400,7 @@ gimp_gradient_editor_init (GimpGradientEditor *editor)
   gtk_widget_show (editor->current_color);
 
   /* Hint box */
-  hint_vbox = gtk_vbox_new (FALSE, 0);
+  hint_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_box_pack_start (GTK_BOX (hbox), hint_vbox, TRUE, TRUE, 0);
   gtk_widget_show (hint_vbox);
 
diff --git a/app/widgets/gimpgrideditor.c b/app/widgets/gimpgrideditor.c
index a8c291d..e61e7f8 100644
--- a/app/widgets/gimpgrideditor.c
+++ b/app/widgets/gimpgrideditor.c
@@ -175,7 +175,7 @@ gimp_grid_editor_constructed (GObject *object)
   gtk_box_pack_start (GTK_BOX (editor), 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);
 
   sizeentry = gimp_prop_coordinates_new (G_OBJECT (editor->grid),
@@ -207,7 +207,7 @@ gimp_grid_editor_constructed (GObject *object)
   gtk_box_pack_start (GTK_BOX (editor), 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);
 
   sizeentry = gimp_prop_coordinates_new (G_OBJECT (editor->grid),
diff --git a/app/widgets/gimphistogrambox.c b/app/widgets/gimphistogrambox.c
index ca6ace7..f6a7f11 100644
--- a/app/widgets/gimphistogrambox.c
+++ b/app/widgets/gimphistogrambox.c
@@ -90,7 +90,7 @@ gimp_histogram_box_init (GimpHistogramBox *box)
   gtk_box_pack_start (GTK_BOX (box), 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);
 
@@ -106,7 +106,7 @@ gimp_histogram_box_init (GimpHistogramBox *box)
   box->view = GIMP_HISTOGRAM_VIEW (view);
 
   /*  The gradient below the histogram */
-  vbox2 = gtk_vbox_new (FALSE, 0);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_set_border_width (GTK_CONTAINER (vbox2),
                                   GIMP_HISTOGRAM_VIEW (view)->border_width);
   gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE, 0);
@@ -144,7 +144,7 @@ gimp_histogram_box_init (GimpHistogramBox *box)
                             box->slider_bar);
 
   /*  The range selection */
-  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/app/widgets/gimphistogrameditor.c b/app/widgets/gimphistogrameditor.c
index da88373..4edd65b 100644
--- a/app/widgets/gimphistogrameditor.c
+++ b/app/widgets/gimphistogrameditor.c
@@ -115,7 +115,7 @@ gimp_histogram_editor_init (GimpHistogramEditor *editor)
 
   view = GIMP_HISTOGRAM_BOX (editor->box)->view;
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (editor), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/app/widgets/gimpimagecommenteditor.c b/app/widgets/gimpimagecommenteditor.c
index 5388bc0..7a453e0 100644
--- a/app/widgets/gimpimagecommenteditor.c
+++ b/app/widgets/gimpimagecommenteditor.c
@@ -76,7 +76,7 @@ gimp_image_comment_editor_init (GimpImageCommentEditor *editor)
   editor->recoursing = FALSE;
 
   /* Vbox */
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_box_pack_start (GTK_BOX (editor), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
diff --git a/app/widgets/gimpitemtreeview.c b/app/widgets/gimpitemtreeview.c
index 3b05ed2..d836a56 100644
--- a/app/widgets/gimpitemtreeview.c
+++ b/app/widgets/gimpitemtreeview.c
@@ -647,7 +647,7 @@ gimp_item_tree_view_add_options (GimpItemTreeView *view,
 
       item_view_class = GIMP_ITEM_TREE_VIEW_GET_CLASS (view);
 
-      view->priv->options_box = gtk_vbox_new (FALSE, content_spacing);
+      view->priv->options_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, content_spacing);
       gtk_box_pack_start (GTK_BOX (view), view->priv->options_box,
                           FALSE, FALSE, 0);
       gtk_box_reorder_child (GTK_BOX (view), view->priv->options_box, 0);
@@ -666,7 +666,7 @@ gimp_item_tree_view_add_options (GimpItemTreeView *view,
       GtkWidget *label_widget;
       gboolean   group_created = FALSE;
 
-      hbox = gtk_hbox_new (FALSE, button_spacing);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, button_spacing);
       gtk_box_pack_start (GTK_BOX (view->priv->options_box), hbox,
                           FALSE, FALSE, 0);
       gtk_widget_show (hbox);
@@ -710,7 +710,7 @@ gimp_item_tree_view_get_lock_box (GimpItemTreeView *view)
                             "button-spacing", &button_spacing,
                             NULL);
 
-      view->priv->lock_box = gtk_hbox_new (FALSE, button_spacing);
+      view->priv->lock_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, button_spacing);
 
       gimp_item_tree_view_add_options (view, _("Lock:"), view->priv->lock_box);
 
diff --git a/app/widgets/gimppaletteeditor.c b/app/widgets/gimppaletteeditor.c
index 8f90747..26db659 100644
--- a/app/widgets/gimppaletteeditor.c
+++ b/app/widgets/gimppaletteeditor.c
@@ -216,7 +216,7 @@ gimp_palette_editor_init (GimpPaletteEditor *editor)
                               palette_editor_drop_palette,
                               editor);
 
-  hbox = gtk_hbox_new (FALSE, 2);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_box_pack_start (GTK_BOX (editor), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/app/widgets/gimpsettingsbox.c b/app/widgets/gimpsettingsbox.c
index 08057c0..ad26477 100644
--- a/app/widgets/gimpsettingsbox.c
+++ b/app/widgets/gimpsettingsbox.c
@@ -273,7 +273,8 @@ gimp_settings_box_constructed (GObject *object)
                           G_CALLBACK (gimp_settings_box_setting_selected),
                           box);
 
-  hbox2 = gtk_hbox_new (TRUE, 0);
+  hbox2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  gtk_box_set_homogeneous (GTK_BOX (hbox2), TRUE);
   gtk_box_pack_start (GTK_BOX (box), hbox2, FALSE, FALSE, 0);
   gtk_widget_show (hbox2);
 
diff --git a/app/widgets/gimpsizebox.c b/app/widgets/gimpsizebox.c
index cb89954..12adcc4 100644
--- a/app/widgets/gimpsizebox.c
+++ b/app/widgets/gimpsizebox.c
@@ -182,7 +182,7 @@ gimp_size_box_constructed (GObject *object)
   if (G_OBJECT_CLASS (parent_class)->constructed)
     G_OBJECT_CLASS (parent_class)->constructed (object);
 
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -228,7 +228,7 @@ gimp_size_box_constructed (GObject *object)
       gtk_size_group_add_widget (box->size_group, list->data);
   g_list_free (children);
 
-  vbox = gtk_vbox_new (2, FALSE);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_table_attach_defaults (GTK_TABLE (entry), vbox, 1, 3, 2, 3);
   gtk_widget_show (vbox);
 
@@ -244,7 +244,7 @@ gimp_size_box_constructed (GObject *object)
 
   if (box->edit_resolution)
     {
-      hbox = gtk_hbox_new (FALSE, 0);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 0);
       gtk_widget_show (hbox);
 
diff --git a/app/widgets/gimpstrokeeditor.c b/app/widgets/gimpstrokeeditor.c
index 68ea7e4..af28b1e 100644
--- a/app/widgets/gimpstrokeeditor.c
+++ b/app/widgets/gimpstrokeeditor.c
@@ -122,7 +122,7 @@ gimp_stroke_editor_constructed (GObject *object)
 
   options = GIMP_STROKE_OPTIONS (fill_editor->options);
 
-  box = gtk_hbox_new (FALSE, 6);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_box_pack_start (GTK_BOX (editor), box, FALSE, FALSE, 0);
   gtk_widget_show (box);
 
@@ -178,7 +178,7 @@ gimp_stroke_editor_constructed (GObject *object)
                              _("Dash pattern:"), 0.0, 0.5,
                              frame, 2, FALSE);
 
-  box = gtk_hbox_new (FALSE, 0);
+  box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (frame), box);
   gtk_widget_show (box);
 
diff --git a/app/widgets/gimptemplateeditor.c b/app/widgets/gimptemplateeditor.c
index c4f7b56..70b4960 100644
--- a/app/widgets/gimptemplateeditor.c
+++ b/app/widgets/gimptemplateeditor.c
@@ -192,7 +192,7 @@ gimp_template_editor_constructed (GObject *object)
   gtk_widget_show (label);
 
   /*  create the sizeentry which keeps it all together  */
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 2, 0, 2);
   gtk_widget_show (hbox);
 
@@ -224,11 +224,11 @@ gimp_template_editor_constructed (GObject *object)
                                  gimp_template_get_resolution_x (template),
                                  gimp_template_get_resolution_y (template));
 
-  hbox = gtk_hbox_new (FALSE, 12);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 3, 2, 3);
   gtk_widget_show (hbox);
 
-  vbox = gtk_vbox_new (0, FALSE);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE, 0);
   gtk_widget_show (vbox);
 
@@ -242,7 +242,7 @@ gimp_template_editor_constructed (GObject *object)
   gtk_box_pack_start (GTK_BOX (vbox), aspect_box, FALSE, FALSE, 0);
   gtk_widget_show (aspect_box);
 
-  vbox = gtk_vbox_new (2, FALSE);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE, 0);
   gtk_widget_show (vbox);
 
@@ -321,7 +321,7 @@ gimp_template_editor_constructed (GObject *object)
   gtk_widget_show (label);
 
   /*  the resolution sizeentry  */
-  hbox = gtk_hbox_new (FALSE, 0);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_table_attach_defaults (GTK_TABLE (table), hbox, 1, 2, 0, 2);
   gtk_widget_show (hbox);
 
diff --git a/app/widgets/gimptextstyleeditor.c b/app/widgets/gimptextstyleeditor.c
index 2410724..16dc7b4 100644
--- a/app/widgets/gimptextstyleeditor.c
+++ b/app/widgets/gimptextstyleeditor.c
@@ -192,7 +192,7 @@ gimp_text_style_editor_init (GimpTextStyleEditor *editor)
 
   /*  upper row  */
 
-  editor->upper_hbox = gtk_hbox_new (FALSE, 2);
+  editor->upper_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_box_pack_start (GTK_BOX (editor), editor->upper_hbox, FALSE, FALSE, 0);
   gtk_widget_show (editor->upper_hbox);
 
@@ -222,7 +222,7 @@ gimp_text_style_editor_init (GimpTextStyleEditor *editor)
 
   /*  lower row  */
 
-  editor->lower_hbox = gtk_hbox_new (FALSE, 2);
+  editor->lower_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_box_pack_start (GTK_BOX (editor), editor->lower_hbox, FALSE, FALSE, 0);
   gtk_widget_show (editor->lower_hbox);
 
diff --git a/app/widgets/gimpthumbbox.c b/app/widgets/gimpthumbbox.c
index 80072a3..57d3a9d 100644
--- a/app/widgets/gimpthumbbox.c
+++ b/app/widgets/gimpthumbbox.c
@@ -337,7 +337,7 @@ gimp_thumb_box_new (GimpContext *context)
 
   g_free (str);
 
-  vbox = gtk_vbox_new (FALSE, 0);
+  vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (ebox), vbox);
   gtk_widget_show (vbox);
 
@@ -363,12 +363,13 @@ gimp_thumb_box_new (GimpContext *context)
                     G_CALLBACK (gtk_true),
                     NULL);
 
-  vbox2 = gtk_vbox_new (FALSE, 6);
+  vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_set_border_width (GTK_CONTAINER (vbox2), 2);
   gtk_box_pack_start (GTK_BOX (vbox), vbox2, TRUE, TRUE, 0);
   gtk_widget_show (vbox2);
 
-  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 (vbox2), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/app/widgets/gimptoolbox.c b/app/widgets/gimptoolbox.c
index 352d0c1..e4ad447 100644
--- a/app/widgets/gimptoolbox.c
+++ b/app/widgets/gimptoolbox.c
@@ -207,7 +207,7 @@ gimp_toolbox_constructed (GObject *object)
 
   main_vbox = gimp_dock_get_main_vbox (GIMP_DOCK (toolbox));
 
-  toolbox->p->vbox = gtk_vbox_new (FALSE, 2);
+  toolbox->p->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_box_pack_start (GTK_BOX (main_vbox), toolbox->p->vbox, FALSE, FALSE, 0);
   gtk_box_reorder_child (GTK_BOX (main_vbox), toolbox->p->vbox, 0);
   gtk_widget_show (toolbox->p->vbox);
diff --git a/app/widgets/gimptooloptionseditor.c b/app/widgets/gimptooloptionseditor.c
index 22048ae..6f459ab 100644
--- a/app/widgets/gimptooloptionseditor.c
+++ b/app/widgets/gimptooloptionseditor.c
@@ -183,7 +183,7 @@ gimp_tool_options_editor_init (GimpToolOptionsEditor *editor)
   gtk_widget_show (viewport);
 
   /*  The vbox containing the tool options  */
-  editor->p->options_vbox = gtk_vbox_new (FALSE, 0);
+  editor->p->options_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (viewport), editor->p->options_vbox);
   gtk_widget_show (editor->p->options_vbox);
 }
diff --git a/app/widgets/gimptoolpreseteditor.c b/app/widgets/gimptoolpreseteditor.c
index f5a74ee..3f802d1 100644
--- a/app/widgets/gimptoolpreseteditor.c
+++ b/app/widgets/gimptoolpreseteditor.c
@@ -102,7 +102,7 @@ gimp_tool_preset_editor_constructed (GObject *object)
                     G_CALLBACK (gimp_tool_preset_editor_notify_model),
                     editor);
 
-  hbox = gtk_hbox_new (FALSE, 2);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_box_pack_start (GTK_BOX (data_editor), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
@@ -119,7 +119,7 @@ gimp_tool_preset_editor_constructed (GObject *object)
                       FALSE, FALSE, 0);
   gtk_widget_show (editor->tool_label);
 
-  hbox = gtk_hbox_new (FALSE, 2);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_box_pack_start (GTK_BOX (data_editor), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
 
diff --git a/app/widgets/gimpviewablebox.c b/app/widgets/gimpviewablebox.c
index 13eadca..9c19ac9 100644
--- a/app/widgets/gimpviewablebox.c
+++ b/app/widgets/gimpviewablebox.c
@@ -297,7 +297,7 @@ gradient_box_new (GimpContainer *container,
       GtkWidget *image;
       gchar     *signal_name;
 
-      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);
 
@@ -528,7 +528,7 @@ gimp_viewable_box_new (GimpContainer *container,
   GtkWidget *l;
   GtkWidget *entry;
 
-  hbox = gtk_hbox_new (FALSE, spacing);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, spacing);
 
   button = gimp_viewable_button_new (container, context,
                                      view_type, button_view_size, view_size, 1,
@@ -542,7 +542,7 @@ gimp_viewable_box_new (GimpContainer *container,
   gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
-  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);
 
@@ -569,7 +569,7 @@ gimp_viewable_box_new (GimpContainer *container,
       GtkWidget *edit_button;
       GtkWidget *image;
 
-      edit_vbox = gtk_vbox_new (FALSE, 0);
+      edit_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_box_pack_end (GTK_BOX (hbox), edit_vbox, FALSE, FALSE, 0);
       gtk_widget_show (edit_vbox);
 
diff --git a/app/widgets/gimpviewabledialog.c b/app/widgets/gimpviewabledialog.c
index 4e5443b..77f4954 100644
--- a/app/widgets/gimpviewabledialog.c
+++ b/app/widgets/gimpviewabledialog.c
@@ -113,7 +113,7 @@ gimp_viewable_dialog_init (GimpViewableDialog *dialog)
   gtk_box_pack_start (GTK_BOX (content_area), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_set_border_width (GTK_CONTAINER (hbox), 2);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
   gtk_widget_show (hbox);
@@ -123,7 +123,7 @@ gimp_viewable_dialog_init (GimpViewableDialog *dialog)
   gtk_box_pack_start (GTK_BOX (hbox), dialog->icon, FALSE, FALSE, 0);
   gtk_widget_show (dialog->icon);
 
-  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/app/widgets/gimpwidgets-constructors.c b/app/widgets/gimpwidgets-constructors.c
index 3f073b6..f634fd9 100644
--- a/app/widgets/gimpwidgets-constructors.c
+++ b/app/widgets/gimpwidgets-constructors.c
@@ -193,7 +193,7 @@ gimp_stock_button_new (const gchar *stock_id,
       GtkWidget *hbox;
       GtkWidget *lab;
 
-      hbox = gtk_hbox_new (FALSE, 6);
+      hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
       gtk_container_add (GTK_CONTAINER (button), hbox);
       gtk_widget_show (hbox);
 
diff --git a/app/widgets/gimpwidgets-utils.c b/app/widgets/gimpwidgets-utils.c
index e1bcd2d..647ec5a 100644
--- a/app/widgets/gimpwidgets-utils.c
+++ b/app/widgets/gimpwidgets-utils.c
@@ -230,7 +230,7 @@ gimp_table_attach_stock (GtkTable    *table,
 
   if (left_align)
     {
-      GtkWidget *hbox = gtk_hbox_new (FALSE, 0);
+      GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
       gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE, 0);
       gtk_widget_show (widget);
@@ -269,7 +269,7 @@ gimp_enum_radio_box_add (GtkBox    *box,
           GtkWidget *radio = list->data;
           GtkWidget *hbox;
 
-          hbox = gtk_hbox_new (FALSE, 0);
+          hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
           gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 0);
           gtk_box_reorder_child (GTK_BOX (box), hbox, pos);
 
@@ -291,7 +291,7 @@ gimp_enum_radio_box_add (GtkBox    *box,
 
               border_width = gtk_container_get_border_width (GTK_CONTAINER (radio));
 
-              spacer = gtk_vbox_new (FALSE, 0);
+              spacer = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
               gtk_widget_set_size_request (spacer,
                                            indicator_size +
                                            3 * indicator_spacing +



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