AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Use gtk_style_context_get_font() in GtkSpinButton

Browse Source
This commit is contained in:
Carlos Garnacho 2010-12-24 20:16:22 +01:00
parent 92102c3bf4
commit 0f0512aee3
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gtk/gtkspinbutton.c
View File

@ -693,7 +693,7 @@ gtk_spin_button_get_preferred_width (GtkWidget *widget,
if (gtk_entry_get_width_chars (entry) < 0) if (gtk_entry_get_width_chars (entry) < 0)
{ {
PangoContext *context; PangoContext *context;
PangoFontDescription *font_desc; const PangoFontDescription *font_desc;
PangoFontMetrics *metrics; PangoFontMetrics *metrics;
gint width; gint width;
gint w; gint w;
@ -710,10 +710,7 @@ gtk_spin_button_get_preferred_width (GtkWidget *widget,
"focus-line-width", &focus_width, "focus-line-width", &focus_width,
NULL); NULL);
/* FIXME: update to get_font_desc */ font_desc = gtk_style_context_get_font (style_context, 0);
gtk_style_context_get (style_context, 0,
"font", &font_desc,
NULL);
context = gtk_widget_get_pango_context (widget); context = gtk_widget_get_pango_context (widget);
metrics = pango_context_get_metrics (context, font_desc, metrics = pango_context_get_metrics (context, font_desc,
@ -2301,16 +2298,14 @@ gtk_spin_button_get_wrap (GtkSpinButton *spin_button)
static gint static gint
spin_button_get_arrow_size (GtkSpinButton *spin_button) spin_button_get_arrow_size (GtkSpinButton *spin_button)
{ {
PangoFontDescription *font_desc; const PangoFontDescription *font_desc;
GtkStyleContext *context; GtkStyleContext *context;
gint size; gint size;
gint arrow_size; gint arrow_size;
/* FIXME: use getter */ /* FIXME: use getter */
context = gtk_widget_get_style_context (GTK_WIDGET (spin_button)); context = gtk_widget_get_style_context (GTK_WIDGET (spin_button));
gtk_style_context_get (context, 0, font_desc = gtk_style_context_get_font (context, 0);
"font", &font_desc,
NULL);
size = pango_font_description_get_size (font_desc); size = pango_font_description_get_size (font_desc);
arrow_size = MAX (PANGO_PIXELS (size), MIN_ARROW_WIDTH); arrow_size = MAX (PANGO_PIXELS (size), MIN_ARROW_WIDTH);