[gimp] app: don't inherit from GtkHBox or GtkVBox

From: Michael Natterer <mitch src gnome org>
To: commits-list gnome org
Cc:
Subject: [gimp] app: don't inherit from GtkHBox or GtkVBox
Date: Sat, 30 Oct 2010 13:46:15 +0000 (UTC)
commit b9a7c121a4d8fa630ae386bfbedbfd6c0fed4522
Author: Michael Natterer <mitch gimp org>
Date:   Sat Oct 30 15:44:46 2010 +0200

    app: don't inherit from GtkHBox or GtkVBox
    
    Instead, inherit from GtkBox directly and set the orientation in
    init().  Replace more gtk_container_add() by gtk_box_pack_start() in
    the reparented classes.

 app/widgets/gimpactioneditor.c         |    5 ++++-
 app/widgets/gimpactioneditor.h         |    4 ++--
 app/widgets/gimpcolordisplayeditor.c   |    7 +++++--
 app/widgets/gimpcolordisplayeditor.h   |    4 ++--
 app/widgets/gimpcontainereditor.c      |   12 ++++++++----
 app/widgets/gimpcontainereditor.h      |    4 ++--
 app/widgets/gimpcontrollereditor.c     |   13 ++++++++-----
 app/widgets/gimpcontrollereditor.h     |    4 ++--
 app/widgets/gimpcontrollerlist.c       |    9 ++++++---
 app/widgets/gimpcontrollerlist.h       |    4 ++--
 app/widgets/gimpdeviceeditor.c         |    5 ++++-
 app/widgets/gimpdeviceeditor.h         |    4 ++--
 app/widgets/gimpdeviceinfoeditor.c     |    5 ++++-
 app/widgets/gimpdeviceinfoeditor.h     |    4 ++--
 app/widgets/gimpdock.c                 |   14 +++++++++-----
 app/widgets/gimpdock.h                 |    4 ++--
 app/widgets/gimpdockcolumns.c          |    8 ++++++--
 app/widgets/gimpdockcolumns.h          |    4 ++--
 app/widgets/gimpdynamicsoutputeditor.c |    7 +++----
 app/widgets/gimpdynamicsoutputeditor.h |    4 ++--
 app/widgets/gimpeditor.c               |    5 ++++-
 app/widgets/gimpeditor.h               |    4 ++--
 app/widgets/gimpfilleditor.c           |    5 ++++-
 app/widgets/gimpfilleditor.h           |    4 ++--
 app/widgets/gimpgrideditor.c           |    8 +++++---
 app/widgets/gimpgrideditor.h           |   12 ++++++------
 app/widgets/gimphistogrambox.c         |    5 ++++-
 app/widgets/gimphistogrambox.h         |    4 ++--
 app/widgets/gimpimageparasiteview.c    |    5 ++++-
 app/widgets/gimpimageparasiteview.h    |    4 ++--
 app/widgets/gimpmessagebox.c           |    5 ++++-
 app/widgets/gimpmessagebox.h           |   12 ++++++------
 app/widgets/gimpprogressbox.c          |    5 ++++-
 app/widgets/gimpprogressbox.h          |   14 +++++++-------
 app/widgets/gimpsettingsbox.c          |    7 +++++--
 app/widgets/gimpsettingsbox.h          |    4 ++--
 app/widgets/gimpsettingseditor.c       |    7 +++++--
 app/widgets/gimpsettingseditor.h       |    4 ++--
 app/widgets/gimpsizebox.c              |    5 ++++-
 app/widgets/gimpsizebox.h              |    4 ++--
 app/widgets/gimptemplateeditor.c       |    9 ++++++---
 app/widgets/gimptemplateeditor.h       |    4 ++--
 app/widgets/gimptextstyleeditor.c      |    5 ++++-
 app/widgets/gimptextstyleeditor.h      |    4 ++--
 44 files changed, 167 insertions(+), 103 deletions(-)
---
diff --git a/app/widgets/gimpactioneditor.c b/app/widgets/gimpactioneditor.c
index d0e94db..16ce666 100644
--- a/app/widgets/gimpactioneditor.c
+++ b/app/widgets/gimpactioneditor.c
@@ -40,7 +40,7 @@ static void   gimp_action_editor_filter_changed (GtkEntry         *entry,
                                                  GimpActionEditor *editor);
 
 
-G_DEFINE_TYPE (GimpActionEditor, gimp_action_editor, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GimpActionEditor, gimp_action_editor, GTK_TYPE_BOX)
 
 #define parent_class gimp_action_editor_parent_class
 
@@ -57,6 +57,9 @@ gimp_action_editor_init (GimpActionEditor *editor)
   GtkWidget *label;
   GtkWidget *entry;
 
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
   gtk_box_set_spacing (GTK_BOX (editor), 12);
 
   hbox = gtk_hbox_new (FALSE, 6);
diff --git a/app/widgets/gimpactioneditor.h b/app/widgets/gimpactioneditor.h
index 7a474a4..c78eda9 100644
--- a/app/widgets/gimpactioneditor.h
+++ b/app/widgets/gimpactioneditor.h
@@ -34,14 +34,14 @@ typedef struct _GimpActionEditorClass GimpActionEditorClass;
 
 struct _GimpActionEditor
 {
-  GtkVBox    parent_instance;
+  GtkBox     parent_instance;
 
   GtkWidget *view;
 };
 
 struct _GimpActionEditorClass
 {
-  GtkVBoxClass  parent_class;
+  GtkBoxClass  parent_class;
 };
 
 
diff --git a/app/widgets/gimpcolordisplayeditor.c b/app/widgets/gimpcolordisplayeditor.c
index 39cb922..4cdad5e 100644
--- a/app/widgets/gimpcolordisplayeditor.c
+++ b/app/widgets/gimpcolordisplayeditor.c
@@ -94,7 +94,7 @@ static void   gimp_color_display_editor_enable_toggled (GtkCellRendererToggle  *
 static void   gimp_color_display_editor_update_buttons (GimpColorDisplayEditor *editor);
 
 
-G_DEFINE_TYPE (GimpColorDisplayEditor, gimp_color_display_editor, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GimpColorDisplayEditor, gimp_color_display_editor, GTK_TYPE_BOX)
 
 #define parent_class gimp_color_display_editor_parent_class
 
@@ -120,6 +120,9 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor)
   GtkTreeViewColumn *column;
   GtkCellRenderer   *rend;
 
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
   paned = gtk_vpaned_new ();
   gtk_box_pack_start (GTK_BOX (editor), paned, TRUE, TRUE, 0);
   gtk_widget_show (paned);
@@ -233,7 +236,7 @@ gimp_color_display_editor_init (GimpColorDisplayEditor *editor)
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
                                   GTK_POLICY_AUTOMATIC,
                                   GTK_POLICY_AUTOMATIC);
-  gtk_container_add (GTK_CONTAINER (ed), scrolled_win);
+  gtk_box_pack_start (GTK_BOX (ed), scrolled_win, TRUE, TRUE, 0);
   gtk_widget_show (scrolled_win);
 
   editor->dest = gtk_list_store_new (N_DEST_COLUMNS,
diff --git a/app/widgets/gimpcolordisplayeditor.h b/app/widgets/gimpcolordisplayeditor.h
index f8f08bd..046b549 100644
--- a/app/widgets/gimpcolordisplayeditor.h
+++ b/app/widgets/gimpcolordisplayeditor.h
@@ -34,7 +34,7 @@ typedef struct _GimpColorDisplayEditorClass  GimpColorDisplayEditorClass;
 
 struct _GimpColorDisplayEditor
 {
-  GtkVBox                parent_instance;
+  GtkBox                 parent_instance;
 
   GimpColorDisplayStack *stack;
 
@@ -61,7 +61,7 @@ struct _GimpColorDisplayEditor
 
 struct _GimpColorDisplayEditorClass
 {
-  GtkVBoxClass parent_class;
+  GtkBoxClass parent_class;
 };
 
 
diff --git a/app/widgets/gimpcontainereditor.c b/app/widgets/gimpcontainereditor.c
index b6a6385..0be96a2 100644
--- a/app/widgets/gimpcontainereditor.c
+++ b/app/widgets/gimpcontainereditor.c
@@ -74,7 +74,7 @@ static gboolean  gimp_container_editor_get_show_button_bar (GimpDocked *docked);
 
 
 G_DEFINE_TYPE_WITH_CODE (GimpContainerEditor, gimp_container_editor,
-                         GTK_TYPE_VBOX,
+                         GTK_TYPE_BOX,
                          G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
                                                 gimp_container_editor_docked_iface_init))
 
@@ -101,9 +101,12 @@ gimp_container_editor_docked_iface_init (GimpDockedInterface *iface)
 }
 
 static void
-gimp_container_editor_init (GimpContainerEditor *view)
+gimp_container_editor_init (GimpContainerEditor *editor)
 {
-  view->view = NULL;
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  editor->view = NULL;
 }
 
 gboolean
@@ -168,7 +171,8 @@ gimp_container_editor_construct (GimpContainerEditor *editor,
                              menu_factory, menu_identifier, ui_identifier,
                              editor);
 
-  gtk_container_add (GTK_CONTAINER (editor), GTK_WIDGET (editor->view));
+  gtk_box_pack_start (GTK_BOX (editor), GTK_WIDGET (editor->view),
+                      TRUE, TRUE, 0);
   gtk_widget_show (GTK_WIDGET (editor->view));
 
   g_signal_connect_object (editor->view, "select-item",
diff --git a/app/widgets/gimpcontainereditor.h b/app/widgets/gimpcontainereditor.h
index 510dd65..0cecbba 100644
--- a/app/widgets/gimpcontainereditor.h
+++ b/app/widgets/gimpcontainereditor.h
@@ -34,14 +34,14 @@ typedef struct _GimpContainerEditorClass  GimpContainerEditorClass;
 
 struct _GimpContainerEditor
 {
-  GtkVBox            parent_instance;
+  GtkBox             parent_instance;
 
   GimpContainerView *view;
 };
 
 struct _GimpContainerEditorClass
 {
-  GtkVBoxClass  parent_class;
+  GtkBoxClass  parent_class;
 
   void (* select_item)   (GimpContainerEditor *editor,
                           GimpViewable        *object);
diff --git a/app/widgets/gimpcontrollereditor.c b/app/widgets/gimpcontrollereditor.c
index c9d6ca7..bb1f1b4 100644
--- a/app/widgets/gimpcontrollereditor.c
+++ b/app/widgets/gimpcontrollereditor.c
@@ -107,7 +107,7 @@ static GtkWidget *  gimp_controller_int_view_new    (GimpController *controller,
                                                      GParamSpec     *pspec);
 
 
-G_DEFINE_TYPE (GimpControllerEditor, gimp_controller_editor, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GimpControllerEditor, gimp_controller_editor, GTK_TYPE_BOX)
 
 #define parent_class gimp_controller_editor_parent_class
 
@@ -142,9 +142,12 @@ gimp_controller_editor_class_init (GimpControllerEditorClass *klass)
 static void
 gimp_controller_editor_init (GimpControllerEditor *editor)
 {
-  editor->info = NULL;
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
 
   gtk_box_set_spacing (GTK_BOX (editor), 12);
+
+  editor->info = NULL;
 }
 
 static GObject *
@@ -285,7 +288,7 @@ gimp_controller_editor_constructor (GType                  type,
   gtk_container_add (GTK_CONTAINER (sw), tv);
   gtk_widget_show (tv);
 
-  gtk_container_add (GTK_CONTAINER (vbox), sw);
+  gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE, 0);
   gtk_widget_show (sw);
 
   g_signal_connect (tv, "row-activated",
@@ -692,8 +695,8 @@ gimp_controller_editor_edit_clicked (GtkWidget            *button,
       view = gimp_action_editor_new (gimp_ui_managers_from_name ("<Image>")->data,
                                      action_name, FALSE);
       gtk_container_set_border_width (GTK_CONTAINER (view), 12);
-      gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (editor->edit_dialog))),
-                         view);
+      gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (editor->edit_dialog))),
+                          view, TRUE, TRUE, 0);
       gtk_widget_show (view);
 
       g_signal_connect (GIMP_ACTION_EDITOR (view)->view, "row-activated",
diff --git a/app/widgets/gimpcontrollereditor.h b/app/widgets/gimpcontrollereditor.h
index beaa505..8b64744 100644
--- a/app/widgets/gimpcontrollereditor.h
+++ b/app/widgets/gimpcontrollereditor.h
@@ -34,7 +34,7 @@ typedef struct _GimpControllerEditorClass GimpControllerEditorClass;
 
 struct _GimpControllerEditor
 {
-  GtkVBox             parent_instance;
+  GtkBox              parent_instance;
 
   GimpControllerInfo *info;
   GimpContext        *context;
@@ -51,7 +51,7 @@ struct _GimpControllerEditor
 
 struct _GimpControllerEditorClass
 {
-  GtkVBoxClass   parent_class;
+  GtkBoxClass   parent_class;
 };
 
 
diff --git a/app/widgets/gimpcontrollerlist.c b/app/widgets/gimpcontrollerlist.c
index bc40a10..7e878c1 100644
--- a/app/widgets/gimpcontrollerlist.c
+++ b/app/widgets/gimpcontrollerlist.c
@@ -113,7 +113,7 @@ static void gimp_controller_list_down_clicked    (GtkWidget          *button,
                                                   GimpControllerList *list);
 
 
-G_DEFINE_TYPE (GimpControllerList, gimp_controller_list, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GimpControllerList, gimp_controller_list, GTK_TYPE_BOX)
 
 #define parent_class gimp_controller_list_parent_class
 
@@ -153,6 +153,9 @@ gimp_controller_list_init (GimpControllerList *list)
   guint              n_controller_types;
   gint               i;
 
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (list),
+                                  GTK_ORIENTATION_VERTICAL);
+
   list->gimp = NULL;
 
   list->hbox = hbox = gtk_hbox_new (FALSE, 6);
@@ -645,8 +648,8 @@ gimp_controller_list_edit_clicked (GtkWidget          *button,
   editor = gimp_controller_editor_new (list->dest_info,
                                        gimp_get_user_context (list->gimp));
   gtk_container_set_border_width (GTK_CONTAINER (editor), 12);
-  gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
-                     editor);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
+                      editor, TRUE, TRUE, 0);
   gtk_widget_show (editor);
 
   g_object_set_data (G_OBJECT (list->dest_info), "gimp-controller-editor-dialog",
diff --git a/app/widgets/gimpcontrollerlist.h b/app/widgets/gimpcontrollerlist.h
index cb263da..7b42164 100644
--- a/app/widgets/gimpcontrollerlist.h
+++ b/app/widgets/gimpcontrollerlist.h
@@ -34,7 +34,7 @@ typedef struct _GimpControllerListClass GimpControllerListClass;
 
 struct _GimpControllerList
 {
-  GtkVBox             parent_instance;
+  GtkBox              parent_instance;
 
   Gimp               *gimp;
 
@@ -56,7 +56,7 @@ struct _GimpControllerList
 
 struct _GimpControllerListClass
 {
-  GtkVBoxClass   parent_class;
+  GtkBoxClass   parent_class;
 };
 
 
diff --git a/app/widgets/gimpdeviceeditor.c b/app/widgets/gimpdeviceeditor.c
index ad47544..32520ce 100644
--- a/app/widgets/gimpdeviceeditor.c
+++ b/app/widgets/gimpdeviceeditor.c
@@ -105,7 +105,7 @@ static void      gimp_device_editor_delete_clicked (GtkWidget             *butto
                                                     GimpDeviceEditor      *editor);
 
 
-G_DEFINE_TYPE (GimpDeviceEditor, gimp_device_editor, GTK_TYPE_HBOX)
+G_DEFINE_TYPE (GimpDeviceEditor, gimp_device_editor, GTK_TYPE_BOX)
 
 #define parent_class gimp_device_editor_parent_class
 
@@ -140,6 +140,9 @@ gimp_device_editor_init (GimpDeviceEditor *editor)
   gint                     icon_width;
   gint                     icon_height;
 
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_HORIZONTAL);
+
   gtk_box_set_spacing (GTK_BOX (editor), 12);
 
   gtk_icon_size_lookup_for_settings (gtk_widget_get_settings (GTK_WIDGET (editor)),
diff --git a/app/widgets/gimpdeviceeditor.h b/app/widgets/gimpdeviceeditor.h
index 9eca82e..893416d 100644
--- a/app/widgets/gimpdeviceeditor.h
+++ b/app/widgets/gimpdeviceeditor.h
@@ -34,12 +34,12 @@ typedef struct _GimpDeviceEditorClass GimpDeviceEditorClass;
 
 struct _GimpDeviceEditor
 {
-  GtkHBox  parent_instance;
+  GtkBox  parent_instance;
 };
 
 struct _GimpDeviceEditorClass
 {
-  GtkHBoxClass  parent_class;
+  GtkBoxClass  parent_class;
 };
 
 
diff --git a/app/widgets/gimpdeviceinfoeditor.c b/app/widgets/gimpdeviceinfoeditor.c
index e2a8238..4915ea5 100644
--- a/app/widgets/gimpdeviceinfoeditor.c
+++ b/app/widgets/gimpdeviceinfoeditor.c
@@ -130,7 +130,7 @@ static void     gimp_device_info_editor_curve_reset   (GtkWidget             *bu
                                                        GimpCurve             *curve);
 
 
-G_DEFINE_TYPE (GimpDeviceInfoEditor, gimp_device_info_editor, GTK_TYPE_HBOX)
+G_DEFINE_TYPE (GimpDeviceInfoEditor, gimp_device_info_editor, GTK_TYPE_BOX)
 
 #define parent_class gimp_device_info_editor_parent_class
 
@@ -181,6 +181,9 @@ gimp_device_info_editor_init (GimpDeviceInfoEditor *editor)
 
   private = GIMP_DEVICE_INFO_EDITOR_GET_PRIVATE (editor);
 
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_HORIZONTAL);
+
   gtk_box_set_spacing (GTK_BOX (editor), 12);
 
   private->vbox = gtk_vbox_new (FALSE, 6);
diff --git a/app/widgets/gimpdeviceinfoeditor.h b/app/widgets/gimpdeviceinfoeditor.h
index 39cc756..7aac64c 100644
--- a/app/widgets/gimpdeviceinfoeditor.h
+++ b/app/widgets/gimpdeviceinfoeditor.h
@@ -34,12 +34,12 @@ typedef struct _GimpDeviceInfoEditorClass GimpDeviceInfoEditorClass;
 
 struct _GimpDeviceInfoEditor
 {
-  GtkHBox  parent_instance;
+  GtkBox  parent_instance;
 };
 
 struct _GimpDeviceInfoEditorClass
 {
-  GtkHBoxClass  parent_class;
+  GtkBoxClass  parent_class;
 };
 
 
diff --git a/app/widgets/gimpdock.c b/app/widgets/gimpdock.c
index c317420..8ae9909 100644
--- a/app/widgets/gimpdock.c
+++ b/app/widgets/gimpdock.c
@@ -87,7 +87,7 @@ static gboolean          gimp_dock_dropped_cb             (GtkWidget    *source,
 static GimpDockColumns * gimp_dock_get_dock_columns       (GimpDock     *dock);
 
 
-G_DEFINE_TYPE (GimpDock, gimp_dock, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GimpDock, gimp_dock, GTK_TYPE_BOX)
 
 #define parent_class gimp_dock_parent_class
 
@@ -166,6 +166,9 @@ gimp_dock_init (GimpDock *dock)
   static gint  dock_ID = 1;
   gchar       *name    = NULL;
 
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (dock),
+                                  GTK_ORIENTATION_VERTICAL);
+
   dock->p = G_TYPE_INSTANCE_GET_PRIVATE (dock,
                                          GIMP_TYPE_DOCK,
                                          GimpDockPrivate);
@@ -176,18 +179,19 @@ gimp_dock_init (GimpDock *dock)
   g_free (name);
 
   dock->p->temp_vbox = gtk_vbox_new (FALSE, 0);
-  gtk_container_add (GTK_CONTAINER (dock), dock->p->temp_vbox);
+  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);
-  gtk_container_add (GTK_CONTAINER (dock), dock->p->main_vbox);
+  gtk_box_pack_start (GTK_BOX (dock), dock->p->main_vbox, TRUE, TRUE, 0);
   gtk_widget_show (dock->p->main_vbox);
 
   dock->p->paned_vbox = gimp_paned_box_new (FALSE, 0, GTK_ORIENTATION_VERTICAL);
   gimp_paned_box_set_dropped_cb (GIMP_PANED_BOX (dock->p->paned_vbox),
                                  gimp_dock_dropped_cb,
                                  dock);
-  gtk_container_add (GTK_CONTAINER (dock->p->main_vbox), dock->p->paned_vbox);
+  gtk_box_pack_start (GTK_BOX (dock->p->main_vbox), dock->p->paned_vbox,
+                      TRUE, TRUE, 0);
   gtk_widget_show (dock->p->paned_vbox);
 }
 
@@ -723,7 +727,7 @@ gimp_dock_temp_add (GimpDock  *dock,
   g_return_if_fail (GIMP_IS_DOCK (dock));
   g_return_if_fail (GTK_IS_WIDGET (child));
 
-  gtk_container_add (GTK_CONTAINER (dock->p->temp_vbox), child);
+  gtk_box_pack_start (GTK_BOX (dock->p->temp_vbox), child, FALSE, FALSE, 0);
 }
 
 /**
diff --git a/app/widgets/gimpdock.h b/app/widgets/gimpdock.h
index 315e2e8..e6309df 100644
--- a/app/widgets/gimpdock.h
+++ b/app/widgets/gimpdock.h
@@ -54,14 +54,14 @@ typedef struct _GimpDockPrivate  GimpDockPrivate;
  */
 struct _GimpDock
 {
-  GtkVBox  parent_instance;
+  GtkBox           parent_instance;
 
   GimpDockPrivate *p;
 };
 
 struct _GimpDockClass
 {
-  GtkVBoxClass  parent_class;
+  GtkBoxClass  parent_class;
 
   /*  virtual functions  */
   gchar * (* get_description)         (GimpDock       *dock,
diff --git a/app/widgets/gimpdockcolumns.c b/app/widgets/gimpdockcolumns.c
index 7115a4e..00755aa 100644
--- a/app/widgets/gimpdockcolumns.c
+++ b/app/widgets/gimpdockcolumns.c
@@ -92,7 +92,7 @@ static void      gimp_dock_columns_dock_book_removed (GimpDockColumns *dock_colu
                                                       GimpDock        *dock);
 
 
-G_DEFINE_TYPE (GimpDockColumns, gimp_dock_columns, GTK_TYPE_HBOX)
+G_DEFINE_TYPE (GimpDockColumns, gimp_dock_columns, GTK_TYPE_BOX)
 
 #define parent_class gimp_dock_columns_parent_class
 
@@ -156,6 +156,9 @@ gimp_dock_columns_class_init (GimpDockColumnsClass *klass)
 static void
 gimp_dock_columns_init (GimpDockColumns *dock_columns)
 {
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (dock_columns),
+                                  GTK_ORIENTATION_HORIZONTAL);
+
   dock_columns->p = G_TYPE_INSTANCE_GET_PRIVATE (dock_columns,
                                                  GIMP_TYPE_DOCK_COLUMNS,
                                                  GimpDockColumnsPrivate);
@@ -165,7 +168,8 @@ gimp_dock_columns_init (GimpDockColumns *dock_columns)
   gimp_paned_box_set_dropped_cb (GIMP_PANED_BOX (dock_columns->p->paned_hbox),
                                  gimp_dock_columns_dropped_cb,
                                  dock_columns);
-  gtk_container_add (GTK_CONTAINER (dock_columns), dock_columns->p->paned_hbox);
+  gtk_box_pack_start (GTK_BOX (dock_columns), dock_columns->p->paned_hbox,
+                      TRUE, TRUE, 0);
   gtk_widget_show (dock_columns->p->paned_hbox);
 }
 
diff --git a/app/widgets/gimpdockcolumns.h b/app/widgets/gimpdockcolumns.h
index 3555a64..5ecb5ed 100644
--- a/app/widgets/gimpdockcolumns.h
+++ b/app/widgets/gimpdockcolumns.h
@@ -41,14 +41,14 @@ typedef struct _GimpDockColumnsPrivate  GimpDockColumnsPrivate;
  */
 struct _GimpDockColumns
 {
-  GtkHBox parent_instance;
+  GtkBox parent_instance;
 
   GimpDockColumnsPrivate *p;
 };
 
 struct _GimpDockColumnsClass
 {
-  GtkHBoxClass parent_class;
+  GtkBoxClass parent_class;
 
   void (* dock_added)   (GimpDockColumns *dock_columns,
                          GimpDock        *dock);
diff --git a/app/widgets/gimpdynamicsoutputeditor.c b/app/widgets/gimpdynamicsoutputeditor.c
index ce8fd5a..42ae642 100644
--- a/app/widgets/gimpdynamicsoutputeditor.c
+++ b/app/widgets/gimpdynamicsoutputeditor.c
@@ -126,7 +126,7 @@ static void     gimp_dynamics_output_editor_notify_output (GimpDynamicsOutput
                                                            GimpDynamicsOutputEditor *editor);
 
 G_DEFINE_TYPE (GimpDynamicsOutputEditor, gimp_dynamics_output_editor,
-               GTK_TYPE_VBOX)
+               GTK_TYPE_BOX)
 
 #define parent_class gimp_dynamics_output_editor_parent_class
 
@@ -153,9 +153,8 @@ gimp_dynamics_output_editor_class_init (GimpDynamicsOutputEditorClass *klass)
 static void
 gimp_dynamics_output_editor_init (GimpDynamicsOutputEditor *editor)
 {
-  GimpDynamicsOutputEditorPrivate *private;
-
-  private = GIMP_DYNAMICS_OUTPUT_EDITOR_GET_PRIVATE (editor);
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
 
   gtk_box_set_spacing (GTK_BOX (editor), 6);
 }
diff --git a/app/widgets/gimpdynamicsoutputeditor.h b/app/widgets/gimpdynamicsoutputeditor.h
index 1e8dd39..569e1f8 100644
--- a/app/widgets/gimpdynamicsoutputeditor.h
+++ b/app/widgets/gimpdynamicsoutputeditor.h
@@ -34,12 +34,12 @@ typedef struct _GimpDynamicsOutputEditorClass GimpDynamicsOutputEditorClass;
 
 struct _GimpDynamicsOutputEditor
 {
-  GtkVBox  parent_instance;
+  GtkBox  parent_instance;
 };
 
 struct _GimpDynamicsOutputEditorClass
 {
-  GtkVBoxClass  parent_class;
+  GtkBoxClass  parent_class;
 };
 
 
diff --git a/app/widgets/gimpeditor.c b/app/widgets/gimpeditor.c
index 3f20ef3..3a6fa63 100644
--- a/app/widgets/gimpeditor.c
+++ b/app/widgets/gimpeditor.c
@@ -84,7 +84,7 @@ static GtkIconSize gimp_editor_ensure_button_box   (GimpEditor      *editor,
                                                     GtkReliefStyle  *button_relief);
 
 
-G_DEFINE_TYPE_WITH_CODE (GimpEditor, gimp_editor, GTK_TYPE_VBOX,
+G_DEFINE_TYPE_WITH_CODE (GimpEditor, gimp_editor, GTK_TYPE_BOX,
                          G_IMPLEMENT_INTERFACE (GIMP_TYPE_DOCKED,
                                                 gimp_editor_docked_iface_init))
 
@@ -178,6 +178,9 @@ gimp_editor_class_init (GimpEditorClass *klass)
 static void
 gimp_editor_init (GimpEditor *editor)
 {
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
   editor->menu_factory    = NULL;
   editor->menu_identifier = NULL;
   editor->ui_manager      = NULL;
diff --git a/app/widgets/gimpeditor.h b/app/widgets/gimpeditor.h
index 7a69fbd..7d28e75 100644
--- a/app/widgets/gimpeditor.h
+++ b/app/widgets/gimpeditor.h
@@ -34,7 +34,7 @@ typedef struct _GimpEditorClass  GimpEditorClass;
 
 struct _GimpEditor
 {
-  GtkVBox          parent_instance;
+  GtkBox           parent_instance;
 
   GimpMenuFactory *menu_factory;
   gchar           *menu_identifier;
@@ -49,7 +49,7 @@ struct _GimpEditor
 
 struct _GimpEditorClass
 {
-  GtkVBoxClass  parent_class;
+  GtkBoxClass  parent_class;
 };
 
 
diff --git a/app/widgets/gimpfilleditor.c b/app/widgets/gimpfilleditor.c
index b6937f2..70d7c2d 100644
--- a/app/widgets/gimpfilleditor.c
+++ b/app/widgets/gimpfilleditor.c
@@ -60,7 +60,7 @@ static void      gimp_fill_editor_get_property (GObject           *object,
                                                 GParamSpec        *pspec);
 
 
-G_DEFINE_TYPE (GimpFillEditor, gimp_fill_editor, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GimpFillEditor, gimp_fill_editor, GTK_TYPE_BOX)
 
 #define parent_class gimp_fill_editor_parent_class
 
@@ -93,6 +93,9 @@ gimp_fill_editor_class_init (GimpFillEditorClass *klass)
 static void
 gimp_fill_editor_init (GimpFillEditor *editor)
 {
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
   gtk_box_set_spacing (GTK_BOX (editor), 6);
 }
 
diff --git a/app/widgets/gimpfilleditor.h b/app/widgets/gimpfilleditor.h
index 25245a1..ab719ec 100644
--- a/app/widgets/gimpfilleditor.h
+++ b/app/widgets/gimpfilleditor.h
@@ -34,7 +34,7 @@ typedef struct _GimpFillEditorClass GimpFillEditorClass;
 
 struct _GimpFillEditor
 {
-  GtkVBox          parent_instance;
+  GtkBox           parent_instance;
 
   GimpFillOptions *options;
   gboolean         edit_context;
@@ -42,7 +42,7 @@ struct _GimpFillEditor
 
 struct _GimpFillEditorClass
 {
-  GtkVBoxClass     parent_class;
+  GtkBoxClass      parent_class;
 };
 
 
diff --git a/app/widgets/gimpgrideditor.c b/app/widgets/gimpgrideditor.c
index c395138..2475f9c 100644
--- a/app/widgets/gimpgrideditor.c
+++ b/app/widgets/gimpgrideditor.c
@@ -68,7 +68,7 @@ static void      gimp_grid_editor_get_property (GObject               *object,
 static void      gimp_grid_editor_finalize     (GObject               *object);
 
 
-G_DEFINE_TYPE (GimpGridEditor, gimp_grid_editor, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GimpGridEditor, gimp_grid_editor, GTK_TYPE_BOX)
 
 #define parent_class gimp_grid_editor_parent_class
 
@@ -112,6 +112,10 @@ gimp_grid_editor_class_init (GimpGridEditorClass *klass)
 static void
 gimp_grid_editor_init (GimpGridEditor *editor)
 {
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  gtk_box_set_spacing (GTK_BOX (editor), 12);
 }
 
 static void
@@ -198,8 +202,6 @@ gimp_grid_editor_constructor (GType                  type,
 
   g_assert (editor->grid != NULL);
 
-  gtk_box_set_spacing (GTK_BOX (editor), 12);
-
   frame = gimp_frame_new (_("Appearance"));
   gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
diff --git a/app/widgets/gimpgrideditor.h b/app/widgets/gimpgrideditor.h
index c8b65a2..ba44f1b 100644
--- a/app/widgets/gimpgrideditor.h
+++ b/app/widgets/gimpgrideditor.h
@@ -34,17 +34,17 @@ typedef struct _GimpGridEditorClass GimpGridEditorClass;
 
 struct _GimpGridEditor
 {
-  GtkVBox       parent_instance;
+  GtkBox       parent_instance;
 
-  GimpGrid     *grid;
-  GimpContext  *context;
-  gdouble       xresolution;
-  gdouble       yresolution;
+  GimpGrid    *grid;
+  GimpContext *context;
+  gdouble      xresolution;
+  gdouble      yresolution;
 };
 
 struct _GimpGridEditorClass
 {
-  GtkVBoxClass  parent_class;
+  GtkBoxClass  parent_class;
 };
 
 
diff --git a/app/widgets/gimphistogrambox.c b/app/widgets/gimphistogrambox.c
index 12befb2..ca6ace7 100644
--- a/app/widgets/gimphistogrambox.c
+++ b/app/widgets/gimphistogrambox.c
@@ -60,7 +60,7 @@ static void   gimp_histogram_box_border_notify   (GimpHistogramView *view,
                                                   GimpHistogramBox  *box);
 
 
-G_DEFINE_TYPE (GimpHistogramBox, gimp_histogram_box, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GimpHistogramBox, gimp_histogram_box, GTK_TYPE_BOX)
 
 
 static void
@@ -80,6 +80,9 @@ gimp_histogram_box_init (GimpHistogramBox *box)
   GtkWidget *view;
   GtkWidget *bar;
 
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
+                                  GTK_ORIENTATION_VERTICAL);
+
   gtk_box_set_spacing (GTK_BOX (box), 2);
 
   frame = gtk_frame_new (NULL);
diff --git a/app/widgets/gimphistogrambox.h b/app/widgets/gimphistogrambox.h
index aaf14d8..f84383e 100644
--- a/app/widgets/gimphistogrambox.h
+++ b/app/widgets/gimphistogrambox.h
@@ -31,7 +31,7 @@ typedef struct _GimpHistogramBoxClass GimpHistogramBoxClass;
 
 struct _GimpHistogramBox
 {
-  GtkVBox            parent_instance;
+  GtkBox             parent_instance;
 
   GimpHistogramView *view;
   GtkWidget         *color_bar;
@@ -43,7 +43,7 @@ struct _GimpHistogramBox
 
 struct _GimpHistogramBoxClass
 {
-  GtkVBoxClass  parent_class;
+  GtkBoxClass  parent_class;
 };
 
 
diff --git a/app/widgets/gimpimageparasiteview.c b/app/widgets/gimpimageparasiteview.c
index 8ffb870..ff2d84f 100644
--- a/app/widgets/gimpimageparasiteview.c
+++ b/app/widgets/gimpimageparasiteview.c
@@ -69,7 +69,7 @@ static void      gimp_image_parasite_view_parasite_changed (GimpImageParasiteVie
 static void      gimp_image_parasite_view_update           (GimpImageParasiteView *view);
 
 
-G_DEFINE_TYPE (GimpImageParasiteView, gimp_image_parasite_view, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GimpImageParasiteView, gimp_image_parasite_view, GTK_TYPE_BOX)
 
 #define parent_class gimp_image_parasite_view_parent_class
 
@@ -112,6 +112,9 @@ gimp_image_parasite_view_class_init (GimpImageParasiteViewClass *klass)
 static void
 gimp_image_parasite_view_init (GimpImageParasiteView *view)
 {
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (view),
+                                  GTK_ORIENTATION_VERTICAL);
+
   view->parasite = NULL;
 }
 
diff --git a/app/widgets/gimpimageparasiteview.h b/app/widgets/gimpimageparasiteview.h
index d0c9eff..7c4ee58 100644
--- a/app/widgets/gimpimageparasiteview.h
+++ b/app/widgets/gimpimageparasiteview.h
@@ -34,7 +34,7 @@ typedef struct _GimpImageParasiteViewClass GimpImageParasiteViewClass;
 
 struct _GimpImageParasiteView
 {
-  GtkVBox    parent_instance;
+  GtkBox     parent_instance;
 
   GimpImage *image;
   gchar     *parasite;
@@ -42,7 +42,7 @@ struct _GimpImageParasiteView
 
 struct _GimpImageParasiteViewClass
 {
-  GtkVBoxClass  parent_class;
+  GtkBoxClass  parent_class;
 
   /*  signals  */
   void (* update) (GimpImageParasiteView *view);
diff --git a/app/widgets/gimpmessagebox.c b/app/widgets/gimpmessagebox.c
index 79412c0..927e31b 100644
--- a/app/widgets/gimpmessagebox.c
+++ b/app/widgets/gimpmessagebox.c
@@ -66,7 +66,7 @@ static void      gimp_message_box_size_allocate (GtkWidget      *widget,
                                                  GtkAllocation  *allocation);
 
 
-G_DEFINE_TYPE (GimpMessageBox, gimp_message_box, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GimpMessageBox, gimp_message_box, GTK_TYPE_BOX)
 
 #define parent_class gimp_message_box_parent_class
 
@@ -102,6 +102,9 @@ gimp_message_box_init (GimpMessageBox *box)
 {
   gint i;
 
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
+                                  GTK_ORIENTATION_VERTICAL);
+
   gtk_box_set_spacing (GTK_BOX (box), 12);
   gtk_container_set_border_width (GTK_CONTAINER (box), 12);
 
diff --git a/app/widgets/gimpmessagebox.h b/app/widgets/gimpmessagebox.h
index a6aa7dd..52d67c0 100644
--- a/app/widgets/gimpmessagebox.h
+++ b/app/widgets/gimpmessagebox.h
@@ -36,17 +36,17 @@ typedef struct _GimpMessageBoxClass  GimpMessageBoxClass;
 
 struct _GimpMessageBox
 {
-  GtkVBox       parent_instance;
+  GtkBox     parent_instance;
 
-  gchar        *stock_id;
-  gint          repeat;
-  GtkWidget    *label[3];
-  GtkWidget    *image;
+  gchar     *stock_id;
+  gint       repeat;
+  GtkWidget *label[3];
+  GtkWidget *image;
 };
 
 struct _GimpMessageBoxClass
 {
-  GtkVBoxClass  parent_class;
+  GtkBoxClass  parent_class;
 };
 
 
diff --git a/app/widgets/gimpprogressbox.c b/app/widgets/gimpprogressbox.c
index 085ac20..154b453 100644
--- a/app/widgets/gimpprogressbox.c
+++ b/app/widgets/gimpprogressbox.c
@@ -52,7 +52,7 @@ static gdouble  gimp_progress_box_progress_get_value (GimpProgress *progress);
 static void     gimp_progress_box_progress_pulse     (GimpProgress *progress);
 
 
-G_DEFINE_TYPE_WITH_CODE (GimpProgressBox, gimp_progress_box, GTK_TYPE_VBOX,
+G_DEFINE_TYPE_WITH_CODE (GimpProgressBox, gimp_progress_box, GTK_TYPE_BOX,
                          G_IMPLEMENT_INTERFACE (GIMP_TYPE_PROGRESS,
                                                 gimp_progress_box_progress_iface_init))
 
@@ -70,6 +70,9 @@ gimp_progress_box_class_init (GimpProgressBoxClass *klass)
 static void
 gimp_progress_box_init (GimpProgressBox *box)
 {
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
+                                  GTK_ORIENTATION_VERTICAL);
+
   gtk_box_set_spacing (GTK_BOX (box), 6);
 
   box->progress = gtk_progress_bar_new ();
diff --git a/app/widgets/gimpprogressbox.h b/app/widgets/gimpprogressbox.h
index 9442a7e..3f3bed9 100644
--- a/app/widgets/gimpprogressbox.h
+++ b/app/widgets/gimpprogressbox.h
@@ -36,19 +36,19 @@ typedef struct _GimpProgressBoxClass  GimpProgressBoxClass;
 
 struct _GimpProgressBox
 {
-  GtkVBox     parent_instance;
+  GtkBox     parent_instance;
 
-  gboolean    active;
-  gboolean    cancelable;
-  gdouble     value;
+  gboolean   active;
+  gboolean   cancelable;
+  gdouble    value;
 
-  GtkWidget  *label;
-  GtkWidget  *progress;
+  GtkWidget *label;
+  GtkWidget *progress;
 };
 
 struct _GimpProgressBoxClass
 {
-  GtkVBoxClass  parent_class;
+  GtkBoxClass  parent_class;
 };
 
 
diff --git a/app/widgets/gimpsettingsbox.c b/app/widgets/gimpsettingsbox.c
index c7f3953..859c943 100644
--- a/app/widgets/gimpsettingsbox.c
+++ b/app/widgets/gimpsettingsbox.c
@@ -118,7 +118,7 @@ static void  gimp_settings_box_truncate_list     (GimpSettingsBox   *box,
                                                   gint               max_recent);
 
 
-G_DEFINE_TYPE (GimpSettingsBox, gimp_settings_box, GTK_TYPE_HBOX)
+G_DEFINE_TYPE (GimpSettingsBox, gimp_settings_box, GTK_TYPE_BOX)
 
 #define parent_class gimp_settings_box_parent_class
 
@@ -202,6 +202,9 @@ gimp_settings_box_class_init (GimpSettingsBoxClass *klass)
 static void
 gimp_settings_box_init (GimpSettingsBox *box)
 {
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
+                                  GTK_ORIENTATION_HORIZONTAL);
+
   gtk_box_set_spacing (GTK_BOX (box), 6);
 }
 
@@ -651,7 +654,7 @@ gimp_settings_box_manage_activate (GtkWidget       *widget,
   gtk_container_set_border_width (GTK_CONTAINER (editor), 12);
 
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (box->editor_dialog));
-  gtk_container_add (GTK_CONTAINER (content_area), editor);
+  gtk_box_pack_start (GTK_BOX (content_area), editor, TRUE, TRUE, 0);
   gtk_widget_show (editor);
 
   gtk_widget_show (box->editor_dialog);
diff --git a/app/widgets/gimpsettingsbox.h b/app/widgets/gimpsettingsbox.h
index 25d6e8c..5dff64f 100644
--- a/app/widgets/gimpsettingsbox.h
+++ b/app/widgets/gimpsettingsbox.h
@@ -34,7 +34,7 @@ typedef struct _GimpSettingsBoxClass GimpSettingsBoxClass;
 
 struct _GimpSettingsBox
 {
-  GtkHBox        parent_instance;
+  GtkBox         parent_instance;
 
   GtkWidget     *combo;
   GtkWidget     *menu;
@@ -57,7 +57,7 @@ struct _GimpSettingsBox
 
 struct _GimpSettingsBoxClass
 {
-  GtkHBoxClass  parent_class;
+  GtkBoxClass  parent_class;
 
   void (* file_dialog_setup) (GimpSettingsBox      *box,
                               GtkFileChooserDialog *dialog,
diff --git a/app/widgets/gimpsettingseditor.c b/app/widgets/gimpsettingseditor.c
index bcd7e5f..b772387 100644
--- a/app/widgets/gimpsettingseditor.c
+++ b/app/widgets/gimpsettingseditor.c
@@ -87,7 +87,7 @@ static void gimp_settings_editor_name_edited        (GtkCellRendererText *cell,
                                                      GimpSettingsEditor  *editor);
 
 
-G_DEFINE_TYPE (GimpSettingsEditor, gimp_settings_editor, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GimpSettingsEditor, gimp_settings_editor, GTK_TYPE_BOX)
 
 #define parent_class gimp_settings_editor_parent_class
 
@@ -127,6 +127,9 @@ gimp_settings_editor_class_init (GimpSettingsEditorClass *klass)
 static void
 gimp_settings_editor_init (GimpSettingsEditor *editor)
 {
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
   gtk_box_set_spacing (GTK_BOX (editor), 6);
 }
 
@@ -151,7 +154,7 @@ gimp_settings_editor_constructor (GType                  type,
                                                gimp_get_user_context (editor->gimp),
                                                16, 0);
   gtk_widget_set_size_request (editor->view, 200, 200);
-  gtk_container_add (GTK_CONTAINER (editor), editor->view);
+  gtk_box_pack_start (GTK_BOX (editor), editor->view, TRUE, TRUE, 0);
   gtk_widget_show (editor->view);
 
   tree_view = GIMP_CONTAINER_TREE_VIEW (editor->view);
diff --git a/app/widgets/gimpsettingseditor.h b/app/widgets/gimpsettingseditor.h
index 91ca8e8..12a9589 100644
--- a/app/widgets/gimpsettingseditor.h
+++ b/app/widgets/gimpsettingseditor.h
@@ -34,7 +34,7 @@ typedef struct _GimpSettingsEditorClass GimpSettingsEditorClass;
 
 struct _GimpSettingsEditor
 {
-  GtkVBox        parent_instance;
+  GtkBox         parent_instance;
 
   Gimp          *gimp;
   GObject       *config;
@@ -49,7 +49,7 @@ struct _GimpSettingsEditor
 
 struct _GimpSettingsEditorClass
 {
-  GtkVBoxClass  parent_class;
+  GtkBoxClass  parent_class;
 };
 
 
diff --git a/app/widgets/gimpsizebox.c b/app/widgets/gimpsizebox.c
index f2623b9..e17e51b 100644
--- a/app/widgets/gimpsizebox.c
+++ b/app/widgets/gimpsizebox.c
@@ -86,7 +86,7 @@ static void      gimp_size_box_chain_toggled     (GimpChainButton *button,
                                                   GimpSizeBox     *box);
 
 
-G_DEFINE_TYPE (GimpSizeBox, gimp_size_box, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GimpSizeBox, gimp_size_box, GTK_TYPE_BOX)
 
 #define parent_class gimp_size_box_parent_class
 
@@ -162,6 +162,9 @@ gimp_size_box_class_init (GimpSizeBoxClass *klass)
 static void
 gimp_size_box_init (GimpSizeBox *box)
 {
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (box),
+                                  GTK_ORIENTATION_VERTICAL);
+
   gtk_box_set_spacing (GTK_BOX (box), 6);
 
   box->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
diff --git a/app/widgets/gimpsizebox.h b/app/widgets/gimpsizebox.h
index 54fa72a..b3de8e1 100644
--- a/app/widgets/gimpsizebox.h
+++ b/app/widgets/gimpsizebox.h
@@ -36,7 +36,7 @@ typedef struct _GimpSizeBoxClass  GimpSizeBoxClass;
 
 struct _GimpSizeBox
 {
-  GtkVBox       parent_instance;
+  GtkBox        parent_instance;
 
   GtkSizeGroup *size_group;
 
@@ -52,7 +52,7 @@ struct _GimpSizeBox
 
 struct _GimpSizeBoxClass
 {
-  GtkVBoxClass  parent_class;
+  GtkBoxClass  parent_class;
 };
 
 
diff --git a/app/widgets/gimptemplateeditor.c b/app/widgets/gimptemplateeditor.c
index 7f2cca8..2d0bcbc 100644
--- a/app/widgets/gimptemplateeditor.c
+++ b/app/widgets/gimptemplateeditor.c
@@ -72,7 +72,7 @@ static void gimp_template_editor_icon_changed    (GimpContext        *context,
                                                   GimpTemplateEditor *editor);
 
 
-G_DEFINE_TYPE (GimpTemplateEditor, gimp_template_editor, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GimpTemplateEditor, gimp_template_editor, GTK_TYPE_BOX)
 
 #define parent_class gimp_template_editor_parent_class
 
@@ -97,6 +97,11 @@ gimp_template_editor_class_init (GimpTemplateEditorClass *klass)
 static void
 gimp_template_editor_init (GimpTemplateEditor *editor)
 {
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
+  gtk_box_set_spacing (GTK_BOX (editor), 12);
+
   editor->template = NULL;
 }
 
@@ -132,8 +137,6 @@ gimp_template_editor_constructor (GType                  type,
 
   g_assert (editor->template != NULL);
 
-  gtk_box_set_spacing (GTK_BOX (editor), 12);
-
   /*  Image size frame  */
   frame = gimp_frame_new (_("Image Size"));
   gtk_box_pack_start (GTK_BOX (editor), frame, FALSE, FALSE, 0);
diff --git a/app/widgets/gimptemplateeditor.h b/app/widgets/gimptemplateeditor.h
index ae82b84..b5e9b27 100644
--- a/app/widgets/gimptemplateeditor.h
+++ b/app/widgets/gimptemplateeditor.h
@@ -34,7 +34,7 @@ typedef struct _GimpTemplateEditorClass GimpTemplateEditorClass;
 
 struct _GimpTemplateEditor
 {
-  GtkVBox        parent_instance;
+  GtkBox         parent_instance;
 
   GimpTemplate  *template;
 
@@ -54,7 +54,7 @@ struct _GimpTemplateEditor
 
 struct _GimpTemplateEditorClass
 {
-  GtkVBoxClass   parent_class;
+  GtkBoxClass   parent_class;
 };
 
 
diff --git a/app/widgets/gimptextstyleeditor.c b/app/widgets/gimptextstyleeditor.c
index 0b74d8f..2246243 100644
--- a/app/widgets/gimptextstyleeditor.c
+++ b/app/widgets/gimptextstyleeditor.c
@@ -113,7 +113,7 @@ static gboolean  gimp_text_style_editor_update_idle      (GimpTextStyleEditor *e
 
 
 G_DEFINE_TYPE (GimpTextStyleEditor, gimp_text_style_editor,
-               GTK_TYPE_VBOX)
+               GTK_TYPE_BOX)
 
 #define parent_class gimp_text_style_editor_parent_class
 
@@ -175,6 +175,9 @@ gimp_text_style_editor_init (GimpTextStyleEditor *editor)
   GtkWidget *image;
   GimpRGB    color;
 
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (editor),
+                                  GTK_ORIENTATION_VERTICAL);
+
   /*  upper row  */
 
   editor->upper_hbox = gtk_hbox_new (FALSE, 0);
diff --git a/app/widgets/gimptextstyleeditor.h b/app/widgets/gimptextstyleeditor.h
index 46227b6..02ad7de 100644
--- a/app/widgets/gimptextstyleeditor.h
+++ b/app/widgets/gimptextstyleeditor.h
@@ -34,7 +34,7 @@ typedef struct _GimpTextStyleEditorClass GimpTextStyleEditorClass;
 
 struct _GimpTextStyleEditor
 {
-  GtkVBox         parent_instance;
+  GtkBox          parent_instance;
 
   Gimp           *gimp;
   GimpContext    *context;
@@ -70,7 +70,7 @@ struct _GimpTextStyleEditor
 
 struct _GimpTextStyleEditorClass
 {
-  GtkVBoxClass  parent_class;
+  GtkBoxClass  parent_class;
 };
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]