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

GtkFontChooser: Update fontlist on style change

Browse Source
This commit is contained in:
Alberto Ruiz
2011-05-04 23:07:16 +01:00
committed by Matthias Clasen
parent 6dec212d1d
commit 1b00a3eb76
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
gtk/gtkfontchooser.c
View File

@ -185,16 +185,14 @@ static void gtk_font_selection_get_property (GObject *object,
GParamSpec *pspec); GParamSpec *pspec);
static void gtk_font_selection_finalize (GObject *object); static void gtk_font_selection_finalize (GObject *object);
#if 0
static void gtk_font_selection_screen_changed (GtkWidget *widget, static void gtk_font_selection_screen_changed (GtkWidget *widget,
GdkScreen *previous_screen); GdkScreen *previous_screen);
static void gtk_font_selection_style_updated (GtkWidget *widget); static void gtk_font_selection_style_updated (GtkWidget *widget);
#endif
static void gtk_font_selection_ref_family (GtkFontSelection *fontsel, static void gtk_font_selection_ref_family (GtkFontSelection *fontsel,
PangoFontFamily *family); PangoFontFamily *family);
static void gtk_font_selection_ref_face (GtkFontSelection *fontsel, static void gtk_font_selection_ref_face (GtkFontSelection *fontsel,
PangoFontFace *face); PangoFontFace *face);
static void gtk_font_selection_bootstrap_fontlist (GtkFontSelection *fontsel); static void gtk_font_selection_bootstrap_fontlist (GtkFontSelection *fontsel);
@ -211,12 +209,10 @@ static void
gtk_font_selection_class_init (GtkFontSelectionClass *klass) gtk_font_selection_class_init (GtkFontSelectionClass *klass)
{ {
GObjectClass *gobject_class = G_OBJECT_CLASS (klass); GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
#if 0
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
widget_class->screen_changed = gtk_font_selection_screen_changed; widget_class->screen_changed = gtk_font_selection_screen_changed;
widget_class->style_updated = gtk_font_selection_style_updated; widget_class->style_updated = gtk_font_selection_style_updated;
#endif
gobject_class->finalize = gtk_font_selection_finalize; gobject_class->finalize = gtk_font_selection_finalize;
gobject_class->set_property = gtk_font_selection_set_property; gobject_class->set_property = gtk_font_selection_set_property;
@ -977,21 +973,31 @@ gtk_font_selection_finalize (GObject *object)
G_OBJECT_CLASS (gtk_font_selection_parent_class)->finalize (object); G_OBJECT_CLASS (gtk_font_selection_parent_class)->finalize (object);
} }
#if 0
static void static void
gtk_font_selection_screen_changed (GtkWidget *widget, gtk_font_selection_screen_changed (GtkWidget *widget,
GdkScreen *previous_screen) GdkScreen *previous_screen)
{ {
GtkFontSelection *fontsel = GTK_FONT_SELECTION (widget);
populate_list (fontsel,
GTK_TREE_VIEW (fontsel->priv->family_face_list),
fontsel->priv->model);
return; return;
} }
static void static void
gtk_font_selection_style_updated (GtkWidget *widget) gtk_font_selection_style_updated (GtkWidget *widget)
{ {
/*GTK_WIDGET_CLASS (gtk_font_selection_parent_class)->style_updated (widget);*/ GtkFontSelection *fontsel = GTK_FONT_SELECTION (widget);
GTK_WIDGET_CLASS (gtk_font_selection_parent_class)->style_updated (widget);
populate_list (fontsel,
GTK_TREE_VIEW (fontsel->priv->family_face_list),
fontsel->priv->model);
return; return;
} }
#endif
static void static void
gtk_font_selection_ref_family (GtkFontSelection *fontsel, gtk_font_selection_ref_family (GtkFontSelection *fontsel,