Mercurial > hg > xemacs-beta

diff src/redisplay-gtk.c @ 2054:91d4c8c65a0f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2004-05-02 04:06:51 by malcolmp] Fix warnings and errors when building GTK using C++ and --use-union-type.
author malcolmp
date Sun, 02 May 2004 04:07:01 +0000
parents b531bf8658e9
children 04bc9d2f42c7
line wrap: on
line diff
--- a/src/redisplay-gtk.c	Sat May 01 21:50:40 2004 +0000
+++ b/src/redisplay-gtk.c	Sun May 02 04:07:01 2004 +0000
@@ -608,7 +608,7 @@
       mask |= GDK_GC_LINE_WIDTH;
     }
 
-  return gc_cache_lookup (DEVICE_GTK_GC_CACHE (d), &gcv, mask);
+  return gc_cache_lookup (DEVICE_GTK_GC_CACHE (d), &gcv, (GdkGCValuesMask) mask);
 }
 
 /*****************************************************************************
@@ -848,7 +848,7 @@
       /* We draw underlines in the same color as the text. */
       if (cachel->underline)
 	{
-	  unsigned long upos, uthick;
+	  int upos, uthick;
 
 	  /* Cannot get at font properties in Gtk, so we resort to
              guessing */
@@ -874,7 +874,7 @@
 	}
 
       if (cachel->strikethru) {
-	unsigned long ascent,descent,upos, uthick;
+	gint ascent,descent,upos, uthick;
 	GdkFont *gfont = FONT_INSTANCE_GTK_FONT (XFONT_INSTANCE (font));
 
 	/* Cannot get at font properties in Gtk, so we resort to