[gtk+] GtkFontSelection: derive from GtkBox, not GtkVBox
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] GtkFontSelection: derive from GtkBox, not GtkVBox
- Date: Tue, 7 Jun 2011 22:39:52 +0000 (UTC)
commit 896540f56b30aab6bf63a1f0dad7cb746ae85788
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Jun 7 18:34:57 2011 -0400
GtkFontSelection: derive from GtkBox, not GtkVBox
gtk/gtkfontsel.c | 7 +++++--
gtk/gtkfontsel.h | 6 +++---
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkfontsel.c b/gtk/gtkfontsel.c
index a022ed3..1f3c6e2 100644
--- a/gtk/gtkfontsel.c
+++ b/gtk/gtkfontsel.c
@@ -51,11 +51,11 @@
#include "gtktable.h"
#include "gtktreeselection.h"
#include "gtktreeview.h"
-#include "gtkvbox.h"
#include "gtkscrolledwindow.h"
#include "gtkintl.h"
#include "gtkaccessible.h"
#include "gtkbuildable.h"
+#include "gtkorientable.h"
#include "gtkprivate.h"
@@ -220,7 +220,7 @@ static void gtk_font_selection_ref_family (GtkFontSelection *font
static void gtk_font_selection_ref_face (GtkFontSelection *fontsel,
PangoFontFace *face);
-G_DEFINE_TYPE (GtkFontSelection, gtk_font_selection, GTK_TYPE_VBOX)
+G_DEFINE_TYPE (GtkFontSelection, gtk_font_selection, GTK_TYPE_BOX)
static void
gtk_font_selection_class_init (GtkFontSelectionClass *klass)
@@ -345,6 +345,9 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
GtkFontSelectionPrivate);
priv = fontsel->priv;
+ gtk_orientable_set_orientation (GTK_ORIENTABLE (fontsel),
+ GTK_ORIENTATION_VERTICAL);
+
gtk_widget_push_composite_child ();
gtk_box_set_spacing (GTK_BOX (fontsel), 12);
diff --git a/gtk/gtkfontsel.h b/gtk/gtkfontsel.h
index e481b6f..1bf2907 100644
--- a/gtk/gtkfontsel.h
+++ b/gtk/gtkfontsel.h
@@ -37,7 +37,7 @@
#include <gtk/gtkdialog.h>
-#include <gtk/gtkvbox.h>
+#include <gtk/gtkbox.h>
G_BEGIN_DECLS
@@ -68,7 +68,7 @@ typedef struct _GtkFontSelectionDialogClass GtkFontSelectionDialogClass;
struct _GtkFontSelection
{
- GtkVBox parent_instance;
+ GtkBox parent_instance;
/*< private >*/
GtkFontSelectionPrivate *priv;
@@ -76,7 +76,7 @@ struct _GtkFontSelection
struct _GtkFontSelectionClass
{
- GtkVBoxClass parent_class;
+ GtkBoxClass parent_class;
/* Padding for future expansion */
void (*_gtk_reserved1) (void);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]