[gtk+] GtkFontChooser: Use GtkBox instead of GtkVBox as base class.

[Matthias Clasen <matthiasc src gnome org>]

commit d9187472f56d9d0bad45ae76f807e175befad4cc
Author: Alberto Ruiz <aruiz gnome org>
Date:   Sun Jul 10 20:30:00 2011 +0100

    GtkFontChooser: Use GtkBox instead of GtkVBox as base class.

 gtk/gtkfontchooser.c |    6 +++---
 gtk/gtkfontchooser.h |    6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
---
diff --git a/gtk/gtkfontchooser.c b/gtk/gtkfontchooser.c
index a69e68c..8195db7 100644
--- a/gtk/gtkfontchooser.c
+++ b/gtk/gtkfontchooser.c
@@ -43,7 +43,7 @@
 #include "gtkstock.h"
 #include "gtktreeselection.h"
 #include "gtktreeview.h"
-#include "gtkvbox.h"
+#include "gtkbox.h"
 #include "gtkscrolledwindow.h"
 #include "gtkintl.h"
 #include "gtkaccessible.h"
@@ -162,7 +162,7 @@ static void  gtk_font_chooser_ref_face           (GtkFontChooser *fontchooser,
 
 static void gtk_font_chooser_bootstrap_fontlist (GtkFontChooser *fontchooser);
 
-G_DEFINE_TYPE (GtkFontChooser, gtk_font_chooser, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GtkFontChooser, gtk_font_chooser, GTK_TYPE_BOX)
 
 static void
 gtk_font_chooser_class_init (GtkFontChooserClass *klass)
@@ -1138,7 +1138,7 @@ gtk_font_chooser_set_font_name (GtkFontChooser *fontchooser,
  *
  * Since: 3.2
  */
-G_CONST_RETURN gchar*
+const gchar*
 gtk_font_chooser_get_preview_text (GtkFontChooser *fontchooser)
 {
   g_return_val_if_fail (GTK_IS_FONT_CHOOSER (fontchooser), NULL);
diff --git a/gtk/gtkfontchooser.h b/gtk/gtkfontchooser.h
index 5634afc..ec480f7 100644
--- a/gtk/gtkfontchooser.h
+++ b/gtk/gtkfontchooser.h
@@ -29,7 +29,7 @@
 #ifndef __GTK_FONT_CHOOSER_H__
 #define __GTK_FONT_CHOOSER_H__
 
-#include <gtk/gtkvbox.h>
+#include <gtk/gtkbox.h>
 
 G_BEGIN_DECLS
 
@@ -46,7 +46,7 @@ typedef struct _GtkFontChooserClass         GtkFontChooserClass;
 
 struct _GtkFontChooser
 {
-  GtkVBox parent_instance;
+  GtkBox parent_instance;
 
   /*< private >*/
   GtkFontChooserPrivate *priv;
@@ -54,7 +54,7 @@ struct _GtkFontChooser
 
 struct _GtkFontChooserClass
 {
-  GtkVBoxClass parent_class;
+  GtkBoxClass parent_class;
 
   /* Padding for future expansion */
   void (*_gtk_reserved1) (void);