No need to work around GtkIconEntry issue afterall

This commit is contained in:
Enrico Tröger 2009-04-27 21:30:27 +02:00 committed by Christian Dywan
parent 0191fdaf8b
commit c711a75379
2 changed files with 2 additions and 16 deletions

View file

@ -33,17 +33,6 @@ gtk_icon_entry_set_icon_from_pixbuf (GtkEntry* entry,
gtk_widget_show (GTK_WIDGET (entry)); gtk_widget_show (GTK_WIDGET (entry));
} }
void
gtk_icon_entry_set_icon_from_stock (GtkEntry* entry,
GtkEntryIconPosition position,
const gchar* stock_id)
{
if (stock_id)
gtk_entry_set_icon_from_stock(entry, position, stock_id);
else
gtk_icon_entry_set_icon_from_pixbuf(entry, position, NULL);
}
#else #else
#include <string.h> #include <string.h>

View file

@ -38,15 +38,12 @@ G_BEGIN_DECLS
#define GTK_ICON_ENTRY GTK_ENTRY #define GTK_ICON_ENTRY GTK_ENTRY
#define GTK_TYPE_ICON_ENTRY GTK_TYPE_ENTRY #define GTK_TYPE_ICON_ENTRY GTK_TYPE_ENTRY
#define gtk_icon_entry_new gtk_entry_new #define gtk_icon_entry_new gtk_entry_new
#define gtk_icon_entry_set_icon_from_stock gtk_entry_set_icon_from_stock
void void
gtk_icon_entry_set_icon_from_pixbuf (GtkEntry* entry, gtk_icon_entry_set_icon_from_pixbuf (GtkEntry* entry,
GtkEntryIconPosition position, GtkEntryIconPosition position,
GdkPixbuf* pixbuf); GdkPixbuf* pixbuf);
void
gtk_icon_entry_set_icon_from_stock (GtkEntry* entry,
GtkEntryIconPosition position,
const gchar* stock_id);
#define gtk_icon_entry_set_icon_highlight gtk_entry_set_icon_activatable #define gtk_icon_entry_set_icon_highlight gtk_entry_set_icon_activatable
#else #else