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

GtkFontChooser: Use GtkBox instead of GtkVBox as base class.

Browse Source
This commit is contained in:
Alberto Ruiz
2011-07-10 20:30:00 +01:00
committed by Matthias Clasen
parent b37863a5ba
commit d9187472f5
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkfontchooser.c
View File

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

6
gtk/gtkfontchooser.h
View File

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