Mercurial > hg > xemacs-beta

diff src/glyphs-gtk.c @ 4552:9c1cfceab252

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 Thu, 13 Mar 2008 10:24:34 +0100
parents 1bf48c59700e
children a1dd514df5c6
line wrap: on
line diff
--- a/src/glyphs-gtk.c	Thu Mar 13 10:21:01 2008 +0100
+++ b/src/glyphs-gtk.c	Thu Mar 13 10:24:34 2008 +0100
@@ -796,7 +796,7 @@
     find_keyword_in_vector (instantiator, Q_file);
 
   IMAGE_INSTANCE_GTK_PIXMAP (ii) = pixmap;
-  IMAGE_INSTANCE_GTK_MASK (ii) = 0;
+  IMAGE_INSTANCE_PIXMAP_MASK (ii) = 0;
   IMAGE_INSTANCE_PIXMAP_WIDTH (ii) = gdk_image->width;
   IMAGE_INSTANCE_PIXMAP_HEIGHT (ii) = gdk_image->height;
   IMAGE_INSTANCE_PIXMAP_DEPTH (ii) = gdk_image->depth;
@@ -2972,7 +2972,7 @@
       IMAGE_INSTANCE_TYPE (p) = IMAGE_COLOR_PIXMAP;
       /* Make sure there aren't two pointers to the same mask, causing
 	 it to get freed twice. */
-      IMAGE_INSTANCE_GTK_MASK (p) = 0;
+      IMAGE_INSTANCE_PIXMAP_MASK (p) = 0;
       break;
 
     default: