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

@@ -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);

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;
 };
 
 

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,

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;
 };
 
 

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",

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);

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",

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;
 };
 
 

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",

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;
 };
 
 

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)),

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;
 };
 
 

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);

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;
 };
 
 

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);
 }
 
 /**

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,

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);
 }
 

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);

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);
 }

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;
 };
 
 

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;

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;
 };
 
 

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);
 }
 

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;
 };
 
 

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);

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;
 };
 
 

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);

app/widgets/gimphistogrambox.h

@@ -31,7 +31,7 @@ typedef struct _GimpHistogramBoxClass GimpHistogramBoxClass;