4:30 p.m.
User: james
Date: 06/05/02 17:30:35
Modified: xemacs/lwlib ChangeLog lwlib-Xaw.c xlwgauge.c xlwmenu.c
xlwtabs.c
Log:
Quiet some warnings when building lwlib. See xemacs-patches message with
ID <m3d5f6yibr.fsf(a)jerrypc.cs.usu.edu>.
Revision Changes Path
1.86 +10 -0 XEmacs/xemacs/lwlib/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/ChangeLog,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86
--- ChangeLog 2006/04/25 14:02:04 1.85
+++ ChangeLog 2006/05/02 15:30:31 1.86
＠＠ -1,3 +1,13 ＠＠
+2006-04-24 Jerry James <james(a)xemacs.org>
+
+ * lwlib-Xaw.c (lw_debug_print_class_resources): Casting from a
+ pointer to an int throws away half of the bits on an x86_64
+ platform. Print as a pointer instead.
+ * xlwgauge.c (XawGaugeSetValue): Use NULL instead of 0 as the
+ sentinel to quiet gcc warnings.
+ * xlwmenu.c: Cast to FcChar8 * as necessary to quiet warnings.
+ * xlwtabs.c: Ditto.
+
2006-04-16 Stephen J. Turnbull <stephen(a)xemacs.org>
* lwlib-fonts.c: Change #include to "font-mgr.h". Make
1.13 +2 -2 XEmacs/xemacs/lwlib/lwlib-Xaw.c
Index: lwlib-Xaw.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/lwlib-Xaw.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- lwlib-Xaw.c 2005/11/26 11:45:59 1.12
+++ lwlib-Xaw.c 2006/05/02 15:30:32 1.13
＠＠ -847,8 +847,8 ＠＠ lw_debug_print_class_resources (WidgetCl
if (!strcmp (rl[i].resource_class, "International"))
{
fprintf (stderr, " Class has an International resource.\n");
- fprintf (stderr, " International resource is %d.\n",
- (int) rl[i].default_addr);
+ fprintf (stderr, " International resource is %p.\n",
+ rl[i].default_addr);
}
}
class_ = class_->core_class.superclass;
1.7 +1 -1 XEmacs/xemacs/lwlib/xlwgauge.c
Index: xlwgauge.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwgauge.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xlwgauge.c 2005/11/10 15:47:33 1.6
+++ xlwgauge.c 2006/05/02 15:30:32 1.7
＠＠ -838,7 +838,7 ＠＠ XawGaugeSetValue (Widget w,
if(( gw->gauge.autoScaleUp && (int) value > gw->gauge.v1) ||
(gw->gauge.autoScaleDown && (int) value < gw->gauge.v1/3 ))
{
- XtVaSetValues(w, XtNvalue, value, 0) ;
+ XtVaSetValues(w, XtNvalue, value, NULL) ;
return ;
}
1.40 +10 -10 XEmacs/xemacs/lwlib/xlwmenu.c
Index: xlwmenu.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwmenu.c,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -p -r1.39 -r1.40
--- xlwmenu.c 2005/12/22 13:58:16 1.39
+++ xlwmenu.c 2006/05/02 15:30:32 1.40
＠＠ -333,8 +333,8 ＠＠ string_width (XlwMenuWidget mw,
# 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 ＠＠ string_width_u (XlwMenuWidget mw,
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 ＠＠ x_xft_text_width (Display *dpy, XftFont
XftTextExtents8 (dpy,
xft_font,
- run, len, &glyphinfo);
+ (FcChar8 *) run, len, &glyphinfo);
return glyphinfo.xOff;
}
#endif
＠＠ -801,8 +801,8 ＠＠ string_draw (XlwMenuWidget mw,
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 ＠＠ string_draw_range (
/* 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);
1.7 +5 -4 XEmacs/xemacs/lwlib/xlwtabs.c
Index: xlwtabs.c
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lwlib/xlwtabs.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- xlwtabs.c 2005/11/26 11:46:00 1.6
+++ xlwtabs.c 2006/05/02 15:30:32 1.7
＠＠ -1708,8 +1708,8 ＠＠ DrawTab(TabsWidget tw, Widget child, Boo
XGlyphInfo glyphinfo;
XftColor colorDBG;
XftColorAllocName (dpy, visual, cmap, "wheat", &colorDBG);
- XftTextExtents8 (dpy, renderFont, lbl, (int) strlen (lbl),
- &glyphinfo);
+ XftTextExtents8 (dpy, renderFont, (FcChar8 *) lbl,
+ (int) strlen (lbl), &glyphinfo);
/* #### unnecessary? for the moment, give visual extent */
/* draw background rect */
#if 1
＠＠ -1754,7 +1754,7 ＠＠ DrawTab(TabsWidget tw, Widget child, Boo
}
XftDrawString8 (xftDraw, &color, renderFont,
x+tab->tabs.l_x, y+tab->tabs.l_y,
- lbl, (int) strlen (lbl));
+ (FcChar8 *) lbl, (int) strlen (lbl));
XftDrawDestroy (xftDraw);
#else
XDrawString(dpy,win,gc,
＠＠ -1988,7 +1988,8 ＠＠ TabWidth(Widget w)
{
#ifdef USE_XFT_TABS
tab->tabs.width += x_xft_text_width (XtDisplay(tw), font,
- lbl, (int)strlen(lbl)) + iw;
+ (FcChar8 *) lbl,
+ (int)strlen(lbl)) + iw;
tab->tabs.l_y = (tw->tabs.tab_height
+ tw->tabs.renderFont->ascent
/* #### how can this subtraction be correct? */