summaryrefslogtreecommitdiff
path: root/gtk/gtkimage.c
diff options
context:
space:
mode:
authorMatthias Clasen <matthiasc@src.gnome.org>2005-05-02 14:05:41 +0000
committerMatthias Clasen <matthiasc@src.gnome.org>2005-05-02 14:05:41 +0000
commit99a9d670fca9fb97a207791ca77f4bbc737e1d7e (patch)
tree3a82abdef18fafbc42cd0b2d1aa466000bd92d81 /gtk/gtkimage.c
parent22344179a4d13fcf310d3c1a5b59d419d2f5091c (diff)
downloadgtk+-99a9d670fca9fb97a207791ca77f4bbc737e1d7e.tar.gz
Forgotten file
Diffstat (limited to 'gtk/gtkimage.c')
-rw-r--r--gtk/gtkimage.c15
1 files changed, 3 insertions, 12 deletions
diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
index e982cd08bd..c88ebbfcc1 100644
--- a/gtk/gtkimage.c
+++ b/gtk/gtkimage.c
@@ -607,7 +607,7 @@ gtk_image_new_from_pixbuf (GdkPixbuf *pixbuf)
* Creates a #GtkImage displaying a stock icon. Sample stock icon
* names are #GTK_STOCK_OPEN, #GTK_STOCK_EXIT. Sample stock sizes
* are #GTK_ICON_SIZE_MENU, #GTK_ICON_SIZE_SMALL_TOOLBAR. If the stock
- * icon name isn't known, a "broken image" icon will be displayed instead.
+ * icon name isn't known, the image will be empty.
* You can register your own stock icon names, see
* gtk_icon_factory_add_default() and gtk_icon_factory_add().
*
@@ -1656,12 +1656,8 @@ gtk_image_expose (GtkWidget *widget,
break;
case GTK_IMAGE_STOCK:
- if (gtk_style_lookup_icon_set (widget->style, image->data.stock.stock_id))
- stock_id = image->data.stock.stock_id;
- else
- stock_id = GTK_STOCK_MISSING_IMAGE;
pixbuf = gtk_widget_render_icon (widget,
- stock_id,
+ image->data.stock.stock_id,
image->icon_size,
NULL);
if (pixbuf)
@@ -1956,7 +1952,6 @@ gtk_image_calc_size (GtkImage *image)
{
GtkWidget *widget = GTK_WIDGET (image);
GdkPixbuf *pixbuf = NULL;
- gchar *stock_id;
/* We update stock/icon set on every size request, because
* the theme could have affected the size; for other kinds of
@@ -1966,12 +1961,8 @@ gtk_image_calc_size (GtkImage *image)
switch (image->storage_type)
{
case GTK_IMAGE_STOCK:
- if (gtk_style_lookup_icon_set (widget->style, image->data.stock.stock_id))
- stock_id = image->data.stock.stock_id;
- else
- stock_id = GTK_STOCK_MISSING_IMAGE;
pixbuf = gtk_widget_render_icon (widget,
- stock_id,
+ image->data.stock.stock_id,
image->icon_size,
NULL);
break;