Mercurial > hg > xemacs-beta

comparison src/glyphs-gtk.c @ 4450:ac6231e0c1df

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Automated merge with file:/Sources/xemacs-21.5-checked-out
author Aidan Kehoe <kehoea@parhasard.net>
date Wed, 07 May 2008 21:21:08 +0200
parents 1bf48c59700e
children a1dd514df5c6
comparison
equal deleted inserted replaced
4449:13ce402e1736 4450:ac6231e0c1df
794 794
795 IMAGE_INSTANCE_PIXMAP_FILENAME (ii) = 795 IMAGE_INSTANCE_PIXMAP_FILENAME (ii) =
796 find_keyword_in_vector (instantiator, Q_file); 796 find_keyword_in_vector (instantiator, Q_file);
797 797
798 IMAGE_INSTANCE_GTK_PIXMAP (ii) = pixmap; 798 IMAGE_INSTANCE_GTK_PIXMAP (ii) = pixmap;
799 IMAGE_INSTANCE_GTK_MASK (ii) = 0; 799 IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0;
800 IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = gdk_image->width; 800 IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = gdk_image->width;
801 IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = gdk_image->height; 801 IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = gdk_image->height;
802 IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = gdk_image->depth; 802 IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = gdk_image->depth;
803 IMAGE_INSTANCE_GTK_COLORMAP (ii) = cmap; 803 IMAGE_INSTANCE_GTK_COLORMAP (ii) = cmap;
804 IMAGE_INSTANCE_GTK_PIXELS (ii) = pixels; 804 IMAGE_INSTANCE_GTK_PIXELS (ii) = pixels;
2970 { 2970 {
2971 case IMAGE_MONO_PIXMAP: 2971 case IMAGE_MONO_PIXMAP:
2972 IMAGE_INSTANCE_TYPE (p) = IMAGE_COLOR_PIXMAP; 2972 IMAGE_INSTANCE_TYPE (p) = IMAGE_COLOR_PIXMAP;
2973 /* Make sure there aren't two pointers to the same mask, causing 2973 /* Make sure there aren't two pointers to the same mask, causing
2974 it to get freed twice. */ 2974 it to get freed twice. */
2975 IMAGE_INSTANCE_GTK_MASK (p) = 0; 2975 IMAGE_INSTANCE_PIXMAP_MASK (p) = 0;
2976 break; 2976 break;
2977 2977
2978 default: 2978 default:
2979 return 0; 2979 return 0;
2980 } 2980 }