Malcolm Purvis writes:
APPROVE COMMIT 21.5
src/ChangeLog addition:
2005-11-22 Malcolm Purvis <malcolmp(a)xemacs.org>
* frame-gtk.c (gtk_internal_frame_property_p):
* glyphs-gtk.c (image_instance_convert_to_pointer):
* glyphs-gtk.c (gtk_xpm_instantiate):
* glyphs-gtk.h (IMAGE_INSTANCE_GTK_MASK):
* gtk-xemacs.c (gtk_xemacs_expose):
* redisplay-gtk.c (gtk_output_vertical_divider):
Fix compilation errors and warnings that have appeared over the
Hi Malcolm,
I tried updating from cvs and I see your changes you just committed,
but I still have to apply these changes to get a gtk xemacs to
compile. This is on Fedora Core 4 with gcc 4.0.1. GTK version
seems to be 1.2.10.
I get the following error using purely the cvs version.
gcc -c -Wall -Wno-switch -Wundef -Wsign-compare -Wno-char-subscripts -Wpacked
-Wunused-parameter -g -Demacs -I. -I/home/jmiller/cvs/xemacs/xemacs-21.5/src
-DHAVE_CONFIG_H -I/usr/include/gtk-1.2 -I/usr/include/glib-1.2 -I/usr/lib/glib/include
-I/usr/X11R6/include -Wno-shadow glyphs-gtk.c
glyphs-gtk.c:258:5: warning: "WORDS_BIGENDIAN" is not defined
glyphs-gtk.c:333:5: warning: "WORDS_BIGENDIAN" is not defined
glyphs-gtk.c: In function ?init_image_instance_from_gdk_image?:
glyphs-gtk.c:799: error: invalid lvalue in assignment
glyphs-gtk.c: In function ?gtk_colorize_image_instance?:
glyphs-gtk.c:2975: error: invalid lvalue in assignment
make: *** [glyphs-gtk.o] Error 1
--- glyphs-gtk.c.orig 2005-11-23 20:13:08.000000000 -0500
+++ glyphs-gtk.c 2005-11-23 21:12:59.000000000 -0500
@@ -255,7 +255,7 @@
gr = *ip++;
bl = *ip++;
conv.val = pixarray[QUANT_GET_COLOR(qtable,rd,gr,bl)];
-#if WORDS_BIGENDIAN
+#ifdef WORDS_BIGENDIAN
if (outimg->byte_order == GDK_MSB_FIRST)
for (q = 4-byte_cnt; q < 4; q++) *dp++ = conv.cp[q];
else
@@ -330,7 +330,7 @@
bl = *ip++ >> (8 - bbits);
conv.val = (rd << rshift) | (gr << gshift) | (bl <<
bshift);
-#if WORDS_BIGENDIAN
+#ifdef WORDS_BIGENDIAN
if (outimg->byte_order == GDK_MSB_FIRST)
for (q = 4-byte_cnt; q < 4; q++) *dp++ = conv.cp[q];
else
@@ -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:
--
Jeff Miller
jmiller(a)cablespeed.com