Mercurial > hg > xemacs-beta
diff lwlib/xlwmenu.c @ 3374:174eb4da74fb
[xemacs-hg @ 2006-05-02 15:30:31 by james]
Quiet some warnings when building lwlib. See xemacs-patches message with
ID <m3d5f6yibr.fsf@jerrypc.cs.usu.edu>.
| author | james |
|---|---|
| date | Tue, 02 May 2006 15:30:32 +0000 |
| parents | 44a63e4a23cd |
| children | 6aa26bef0527 |
line wrap: on
line diff
--- a/lwlib/xlwmenu.c Mon May 01 21:50:54 2006 +0000 +++ b/lwlib/xlwmenu.c Tue May 02 15:30:32 2006 +0000 @@ -333,8 +333,8 @@ # else #ifdef USE_XFT_MENUBARS XGlyphInfo glyphinfo; - XftTextExtents8 (XtDisplay (mw), mw->menu.renderFont, s, strlen (s), - &glyphinfo); + XftTextExtents8 (XtDisplay (mw), mw->menu.renderFont, (FcChar8 *) s, + strlen (s), &glyphinfo); return glyphinfo.xOff; #else XCharStruct xcs; @@ -424,8 +424,8 @@ return rl.width; # else /* ! USE_XFONTSET */ #ifdef USE_XFT_MENUBARS - XftTextExtents8 (XtDisplay (mw), mw->menu.renderFont, newchars, j, - &glyphinfo); + XftTextExtents8 (XtDisplay (mw), mw->menu.renderFont, (FcChar8 *) newchars, + j, &glyphinfo); return glyphinfo.xOff; #else XTextExtents (mw->menu.font, newchars, j, &drop, &drop, &drop, &xcs); @@ -756,7 +756,7 @@ XftTextExtents8 (dpy, xft_font, - run, len, &glyphinfo); + (FcChar8 *) run, len, &glyphinfo); return glyphinfo.xOff; } #endif @@ -801,8 +801,8 @@ x_xft_text_width (display, renderFont, string, strlen (string)), renderFont->ascent + renderFont->descent); /* XXX */ /* draw text */ - XftDrawString8 (xftDraw, color, renderFont, - x, y + mw->menu.font_ascent, string, strlen (string)); + XftDrawString8 (xftDraw, color, renderFont, x, y + mw->menu.font_ascent, + (FcChar8 *) string, strlen (string)); XftDrawDestroy (xftDraw); # else # ifdef USE_XFONTSET @@ -890,10 +890,10 @@ /* draw text */ XftDrawString8 (xftDraw, color, renderFont, x, y + mw->menu.font_ascent, - &string[start], end - start); + (FcChar8 *) &string[start], end - start); - XftTextExtents8 (display, renderFont, &string[start], end - start, - &glyphinfo); + XftTextExtents8 (display, renderFont, (FcChar8 *) &string[start], + end - start, &glyphinfo); /* #### should use parent frame's .xftDraw */ XftDrawDestroy (xftDraw);