Mercurial > hg > xemacs-beta

comparison 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
comparison
equal deleted inserted replaced
2053:11e709117623 2054:91d4c8c65a0f
606 { 606 {
607 gcv.line_width = XINT (lwidth); 607 gcv.line_width = XINT (lwidth);
608 mask |= GDK_GC_LINE_WIDTH; 608 mask |= GDK_GC_LINE_WIDTH;
609 } 609 }
610 610
611 return gc_cache_lookup (DEVICE_GTK_GC_CACHE (d), &gcv, mask); 611 return gc_cache_lookup (DEVICE_GTK_GC_CACHE (d), &gcv, (GdkGCValuesMask) mask);
612 } 612 }
613 613
614 /***************************************************************************** 614 /*****************************************************************************
615 gtk_output_string 615 gtk_output_string
616 616
846 runs[i].len * runs[i].dimension); 846 runs[i].len * runs[i].dimension);
847 847
848 /* We draw underlines in the same color as the text. */ 848 /* We draw underlines in the same color as the text. */
849 if (cachel->underline) 849 if (cachel->underline)
850 { 850 {
851 unsigned long upos, uthick; 851 int upos, uthick;
852 852
853 /* Cannot get at font properties in Gtk, so we resort to 853 /* Cannot get at font properties in Gtk, so we resort to
854 guessing */ 854 guessing */
855 upos = dl->descent / 2; 855 upos = dl->descent / 2;
856 uthick = 1; 856 uthick = 1;
872 } 872 }
873 } 873 }
874 } 874 }
875 875
876 if (cachel->strikethru) { 876 if (cachel->strikethru) {
877 unsigned long ascent,descent,upos, uthick; 877 gint ascent,descent,upos, uthick;
878 GdkFont *gfont = FONT_INSTANCE_GTK_FONT (XFONT_INSTANCE (font)); 878 GdkFont *gfont = FONT_INSTANCE_GTK_FONT (XFONT_INSTANCE (font));
879 879
880 /* Cannot get at font properties in Gtk, so we resort to 880 /* Cannot get at font properties in Gtk, so we resort to
881 guessing */ 881 guessing */
882 882