p
/
logdiag
1
1
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

Fix a depreciation warning 

With a ton of additional code.
This commit is contained in:
Přemysl Eric Janouch 2015-01-20 07:58:57 +01:00
parent e1225accf4
commit fb6f89fb5c
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
liblogdiag/ld-lua.c
View File

@ -827,7 +827,9 @@ LD_LUA_CAIRO_END (0)
LD_LUA_CAIRO_BEGIN (show_text) LD_LUA_CAIRO_BEGIN (show_text)
const char *text; const char *text;
GtkStyle *style; GtkStyleContext *style;
const PangoFontDescription *orig_font_desc;
PangoFontDescription *font_desc;
PangoLayout *layout; PangoLayout *layout;
int width, height; int width, height;
double x, y; double x, y;
@ -838,9 +840,13 @@ LD_LUA_CAIRO_BEGIN (show_text)
layout = pango_cairo_create_layout (data->cr); layout = pango_cairo_create_layout (data->cr);
pango_layout_set_text (layout, text, -1); pango_layout_set_text (layout, text, -1);
style = gtk_style_new (); style = gtk_style_context_new ();
pango_font_description_set_size (style->font_desc, 1 * PANGO_SCALE); gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL,
pango_layout_set_font_description (layout, style->font_desc); GTK_STYLE_PROPERTY_FONT, &orig_font_desc, NULL);
font_desc = pango_font_description_copy (orig_font_desc);
pango_font_description_set_size (font_desc, 1 * PANGO_SCALE);
pango_layout_set_font_description (layout, font_desc);
pango_font_description_free (font_desc);
g_object_unref (style); g_object_unref (style);
pango_layout_get_size (layout, &width, &height); pango_layout_get_size (layout, &width, &height);