GtkFileChooserWidget: derive from GtkBox, not GtkVBox

diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 7969bff200923234d12e77efb216cc6f5a90c6d3..7295e7bac639895e27303f4952d8791be84d36fe 100644 (file)
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -26,6 +26,7 @@
 #include "gtkfilechooserutils.h"
 #include "gtktypebuiltins.h"
 #include "gtkfilechooserembed.h"
+#include "gtkorientable.h"
 #include "gtkintl.h"
 
 
@@ -63,7 +64,7 @@ static void     gtk_file_chooser_widget_get_property (GObject               *obj
                                                      GValue                *value,
                                                      GParamSpec            *pspec);
 
-G_DEFINE_TYPE_WITH_CODE (GtkFileChooserWidget, gtk_file_chooser_widget, GTK_TYPE_VBOX,
+G_DEFINE_TYPE_WITH_CODE (GtkFileChooserWidget, gtk_file_chooser_widget, GTK_TYPE_BOX,
                         G_IMPLEMENT_INTERFACE (GTK_TYPE_FILE_CHOOSER,
                                                _gtk_file_chooser_delegate_iface_init)
                         G_IMPLEMENT_INTERFACE (GTK_TYPE_FILE_CHOOSER_EMBED,
@@ -91,6 +92,8 @@ gtk_file_chooser_widget_init (GtkFileChooserWidget *chooser_widget)
                                                                   GTK_TYPE_FILE_CHOOSER_WIDGET,
                                                                   GtkFileChooserWidgetPrivate);
   chooser_widget->priv = priv;
+  gtk_orientable_set_orientation (GTK_ORIENTABLE (chooser_widget),
+                                  GTK_ORIENTATION_VERTICAL);
 }
 
 static void

diff --git a/gtk/gtkfilechooserwidget.h b/gtk/gtkfilechooserwidget.h
index c7cea5f115433ffed5a5d94aea3598139a70dc5e..2aaa19990b1d53f4c4f732f5b8981e19edbc01f2 100644 (file)
--- a/gtk/gtkfilechooserwidget.h
+++ b/gtk/gtkfilechooserwidget.h
@@ -26,7 +26,7 @@
 #define __GTK_FILE_CHOOSER_WIDGET_H__
 
 #include <gtk/gtkfilechooser.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtkbox.h>
 
 G_BEGIN_DECLS
 
@@ -43,14 +43,14 @@ typedef struct _GtkFileChooserWidgetClass   GtkFileChooserWidgetClass;
 
 struct _GtkFileChooserWidget
 {
-  GtkVBox parent_instance;
+  GtkBox parent_instance;
 
   GtkFileChooserWidgetPrivate *priv;
 };
 
 struct _GtkFileChooserWidgetClass
 {
-  GtkVBoxClass parent_class;
+  GtkBoxClass parent_class;
 
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);