commit: Fix old use of rvalue on lhs to placate gcc >4.0.
changeset: 4433:1bf48c59700efe2451da808710e77fc39efd6532
tag: tip
user: Stephen J. Turnbull <stephen(a)xemacs.org>
date: Wed Mar 05 01:12:53 2008 -0800
files: src/ChangeLog src/glyphs-gtk.c
description:
Fix old use of rvalue on lhs to placate gcc >4.0.
<d9ae65bd0803040244s13437988ka08bae763d28801f(a)mail.gmail.com>
diff -r 87ef74baf946e3698d06f58fe66d67cb1083a6b0 -r
1bf48c59700efe2451da808710e77fc39efd6532 src/ChangeLog
--- a/src/ChangeLog Wed Mar 05 01:11:21 2008 -0800
+++ b/src/ChangeLog Wed Mar 05 01:12:53 2008 -0800
＠＠ -1,3 +1,10 ＠＠ 2008-03-05 Dominique Quatravaux <domq＠
+2008-03-05 Dominique Quatravaux <domq(a)cpan.org>
+
+ * glyphs-gtk.c (init_image_instance_from_gdk_image):
+ (gtk_colorize_image_instance):
+ Use IMAGE_INSTANCE_PIXMAP_MASK (an lvalue), not
+ IMAGE_INSTANCE_GTK_MASK (an rvalue).
+
2008-03-05 Dominique Quatravaux <domq(a)cpan.org>
* console-gtk.c (gtk_perhaps_init_unseen_key_defaults): Fix typo.
diff -r 87ef74baf946e3698d06f58fe66d67cb1083a6b0 -r
1bf48c59700efe2451da808710e77fc39efd6532 src/glyphs-gtk.c
--- a/src/glyphs-gtk.c Wed Mar 05 01:11:21 2008 -0800
+++ b/src/glyphs-gtk.c Wed Mar 05 01:12:53 2008 -0800
＠＠ -796,7 +796,7 ＠＠ init_image_instance_from_gdk_image (stru
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 ＠＠ gtk_colorize_image_instance (Lisp_Object
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:
_______________________________________________
XEmacs-Patches mailing list
XEmacs-Patches(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-patches