callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GtkFontSelection: derive from GtkBox, not GtkVBox

Browse Source
This commit is contained in:
Matthias Clasen
2011-06-07 18:34:57 -04:00
parent 5df02faa5f
commit 896540f56b
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
gtk/gtkfontsel.c
View File

@ -51,11 +51,11 @@
#include "gtktable.h" #include "gtktable.h"
#include "gtktreeselection.h" #include "gtktreeselection.h"
#include "gtktreeview.h" #include "gtktreeview.h"
#include "gtkvbox.h"
#include "gtkscrolledwindow.h" #include "gtkscrolledwindow.h"
#include "gtkintl.h" #include "gtkintl.h"
#include "gtkaccessible.h" #include "gtkaccessible.h"
#include "gtkbuildable.h" #include "gtkbuildable.h"
#include "gtkorientable.h"
#include "gtkprivate.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, static void gtk_font_selection_ref_face (GtkFontSelection *fontsel,
PangoFontFace *face); PangoFontFace *face);
G_DEFINE_TYPE (GtkFontSelection, gtk_font_selection, GTK_TYPE_VBOX) G_DEFINE_TYPE (GtkFontSelection, gtk_font_selection, GTK_TYPE_BOX)
static void static void
gtk_font_selection_class_init (GtkFontSelectionClass *klass) gtk_font_selection_class_init (GtkFontSelectionClass *klass)
@ -345,6 +345,9 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
GtkFontSelectionPrivate); GtkFontSelectionPrivate);
priv = fontsel->priv; priv = fontsel->priv;
gtk_orientable_set_orientation (GTK_ORIENTABLE (fontsel),
GTK_ORIENTATION_VERTICAL);
gtk_widget_push_composite_child (); gtk_widget_push_composite_child ();
gtk_box_set_spacing (GTK_BOX (fontsel), 12); gtk_box_set_spacing (GTK_BOX (fontsel), 12);

6
gtk/gtkfontsel.h
View File

@ -37,7 +37,7 @@
#include <gtk/gtkdialog.h> #include <gtk/gtkdialog.h>
#include <gtk/gtkvbox.h> #include <gtk/gtkbox.h>
G_BEGIN_DECLS G_BEGIN_DECLS
@ -68,7 +68,7 @@ typedef struct _GtkFontSelectionDialogClass GtkFontSelectionDialogClass;
struct _GtkFontSelection struct _GtkFontSelection
{ {
GtkVBox parent_instance; GtkBox parent_instance;
/*< private >*/ /*< private >*/
GtkFontSelectionPrivate *priv; GtkFontSelectionPrivate *priv;
@ -76,7 +76,7 @@ struct _GtkFontSelection
struct _GtkFontSelectionClass struct _GtkFontSelectionClass
{ {
GtkVBoxClass parent_class; GtkBoxClass parent_class;
/* Padding for future expansion */ /* Padding for future expansion */
void (*_gtk_reserved1) (void); void (*_gtk_reserved1) (void);