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

[GtkStyle] Remove deprecated GdkFont usage

Browse Source
This commit is contained in:
Javier Jardón
2010-06-25 00:52:20 +02:00
parent c1affa4f3c
commit 34573b53f3
2 changed files with 0 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtkstyle.c
View File

@ -631,9 +631,6 @@ gtk_style_finalize (GObject *object)
g_slist_free (priv->color_hashes);
pango_font_description_free (style->font_desc);
if (style->private_font)
gdk_font_unref (style->private_font);
if (style->private_font_desc)
pango_font_description_free (style->private_font_desc);
@ -772,12 +769,6 @@ gtk_style_attach (GtkStyle *style,
if (!new_style)
{
new_style = gtk_style_duplicate (style);
if (gdk_colormap_get_screen (style->colormap) != gdk_colormap_get_screen (colormap) &&
new_style->private_font)
{
gdk_font_unref (new_style->private_font);
new_style->private_font = NULL;
}
gtk_style_realize (new_style, colormap);
}
@ -821,12 +812,6 @@ gtk_style_detach (GtkStyle *style)
if (style->private_font_desc)
{
if (style->private_font)
{
gdk_font_unref (style->private_font);
style->private_font = NULL;
}
pango_font_description_free (style->private_font_desc);
style->private_font_desc = NULL;
}
@ -975,12 +960,6 @@ gtk_style_real_copy (GtkStyle *style,
g_object_ref (style->bg_pixmap[i]);
}
if (style->private_font)
gdk_font_unref (style->private_font);
style->private_font = src->private_font;
if (style->private_font)
gdk_font_ref (style->private_font);
if (style->font_desc)
pango_font_description_free (style->font_desc);
if (src->font_desc)

1
gtk/gtkstyle.h
View File

@ -117,7 +117,6 @@ struct _GtkStyle
gint depth;
GdkColormap *colormap;
GdkFont *private_font;
PangoFontDescription *private_font_desc; /* Font description for style->private_font or %NULL */
/* the RcStyle from which this style was created */