diff options
| author | Vincent Sanders <vince@kyllikki.org> | 2015-04-09 14:10:14 +0100 |
|---|---|---|
| committer | Vincent Sanders <vince@kyllikki.org> | 2015-04-09 14:10:14 +0100 |
| commit | ab997398ad2d413fa272fe4614e5b946d0349786 (patch) | |
| tree | ffce90a99b98b72e07dd44c940829efc827b0fcc | |
| parent | b9b952cddf161535548644c3df31e2856859a895 (diff) | |
| download | netsurf-ab997398ad2d413fa272fe4614e5b946d0349786.tar.gz netsurf-ab997398ad2d413fa272fe4614e5b946d0349786.tar.bz2 | |
cope with deprication of gtk_style_context_get_font
| -rw-r--r-- | gtk/compat.c | 8 | ||||
| -rw-r--r-- | gtk/compat.h | 6 |
2 files changed, 13 insertions, 1 deletions
diff --git a/gtk/compat.c b/gtk/compat.c index c41a05e9c..fe57ba285 100644 --- a/gtk/compat.c +++ b/gtk/compat.c @@ -173,7 +173,7 @@ void nsgtk_entry_set_icon_from_stock(GtkWidget *entry, const gchar *id) { #if GTK_CHECK_VERSION(3,10,0) - gtk_entry_set_icon_from_icon_name(entry, icon_pos, id); + gtk_entry_set_icon_from_icon_name(GTK_ENTRY(entry), icon_pos, id); #else #if GTK_CHECK_VERSION(2,16,0) gtk_entry_set_icon_from_stock(GTK_ENTRY(entry), icon_pos, id); @@ -315,11 +315,17 @@ GtkStyleContext *nsgtk_widget_get_style_context(GtkWidget *widget) const PangoFontDescription* nsgtk_style_context_get_font(GtkStyleContext *style, GtkStateFlags state) { +#if GTK_CHECK_VERSION(3,8,0) + const PangoFontDescription* fontdesc; + gtk_style_context_get(style, state, GTK_STYLE_PROPERTY_FONT, &fontdesc, NULL); + return fontdesc; +#else #if GTK_CHECK_VERSION(3,0,0) return gtk_style_context_get_font(style, state); #else return style->font_desc; #endif +#endif } gulong nsgtk_connect_draw_event(GtkWidget *widget, diff --git a/gtk/compat.h b/gtk/compat.h index 0947b7970..4f83aac46 100644 --- a/gtk/compat.h +++ b/gtk/compat.h @@ -113,6 +113,12 @@ enum { GtkWidget *nsgtk_entry_new(void); void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry, GtkEntryIconPosition icon_pos, GdkPixbuf *pixbuf); + +/** + * Sets the icon shown in the entry at the specified position from a stock image. + * + * Compatability interface for interface deprecated in 3.10 + */ void nsgtk_entry_set_icon_from_stock(GtkWidget *entry, GtkEntryIconPosition icon_pos, const gchar *stock_id); /** |