summaryrefslogtreecommitdiff
path: root/frontends/gtk/compat.c
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2019-09-15 22:20:49 +0100
committerDaniel Silverstone <dsilvers@digital-scurf.org>2019-09-21 10:53:41 +0100
commit11aa682154af6e0d4c7920bb2983df5a6ded126f (patch)
tree9a689239267870e8eec7205c8f5820dc927dbbb8 /frontends/gtk/compat.c
parent9cd9a403e6ee69c78a575872bd399c633862d5aa (diff)
downloadnetsurf-11aa682154af6e0d4c7920bb2983df5a6ded126f.tar.gz
netsurf-11aa682154af6e0d4c7920bb2983df5a6ded126f.tar.bz2
construct all toolbar items from data table
This changes toolbar item constuction to use toolbar_items.h instead of explicit macros. Additionally all remenants of old stock item themeing are done away with and GTK icon names are used instead.
Diffstat (limited to 'frontends/gtk/compat.c')
-rw-r--r--frontends/gtk/compat.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/frontends/gtk/compat.c b/frontends/gtk/compat.c
index a75fdafdc..a8321d6d4 100644
--- a/frontends/gtk/compat.c
+++ b/frontends/gtk/compat.c
@@ -170,18 +170,18 @@ void nsgtk_entry_set_icon_from_pixbuf(GtkWidget *entry,
/* exported interface documented in gtk/compat.h */
-void nsgtk_entry_set_icon_from_stock(GtkWidget *entry,
- GtkEntryIconPosition icon_pos,
- const gchar *id)
+void nsgtk_entry_set_icon_from_icon_name(GtkWidget *entry,
+ GtkEntryIconPosition icon_pos,
+ const gchar *id)
{
#ifdef NSGTK_USE_ICON_NAME
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);
+ gtk_entry_set_icon_from_icon_name(GTK_ENTRY(entry), icon_pos, id);
#else
- GtkImage *image = GTK_IMAGE(gtk_image_new_from_stock(id,
- GTK_ICON_SIZE_LARGE_TOOLBAR));
+ GtkImage *image;
+ image = GTK_IMAGE(gtk_image_new_from_stock(id, GTK_ICON_SIZE_LARGE_TOOLBAR));
if (image != NULL) {
sexy_icon_entry_set_icon(SEXY_ICON_ENTRY(entry),