mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2024-12-17 09:42:38 +03:00
Code Issues Packages Projects Releases Wiki Activity

cope with deprication of gtk_style_context_get_font

Browse Source
This commit is contained in:
Vincent Sanders 2015-04-09 14:10:14 +01:00
parent b9b952cddf
commit ab997398ad
2 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk/compat.c
View File

@ -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,

6
gtk/compat.h
View File

@ -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);
/**