Mercurial > emacs
comparison src/xterm.c @ 42376:0f408d016a15
(x_setup_relief_colors): Don't compute an image's
background color if it doesn't have a Pixmap.
author | Gerd Moellmann <gerd@gnu.org> |
---|---|
date | Fri, 28 Dec 2001 14:47:19 +0000 |
parents | 0f5f05b4b9c0 |
children | 640c0fcaebf1 |
comparison
equal
deleted
inserted
replaced
42375:56cc690f3c8d | 42376:0f408d016a15 |
---|---|
3835 unsigned long color; | 3835 unsigned long color; |
3836 | 3836 |
3837 if (s->face->use_box_color_for_shadows_p) | 3837 if (s->face->use_box_color_for_shadows_p) |
3838 color = s->face->box_color; | 3838 color = s->face->box_color; |
3839 else if (s->first_glyph->type == IMAGE_GLYPH | 3839 else if (s->first_glyph->type == IMAGE_GLYPH |
3840 && s->img->pixmap | |
3840 && !IMAGE_BACKGROUND_TRANSPARENT (s->img, s->f, 0)) | 3841 && !IMAGE_BACKGROUND_TRANSPARENT (s->img, s->f, 0)) |
3841 color = IMAGE_BACKGROUND (s->img, s->f, 0); | 3842 color = IMAGE_BACKGROUND (s->img, s->f, 0); |
3842 else | 3843 else |
3843 { | 3844 { |
3844 XGCValues xgcv; | 3845 XGCValues xgcv; |