Mercurial > hg > xemacs-beta

changeset 3374:174eb4da74fb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[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 f18cee92b433
children 6a208360b91b
files lwlib/ChangeLog lwlib/lwlib-Xaw.c lwlib/xlwgauge.c lwlib/xlwmenu.c lwlib/xlwtabs.c
diffstat 5 files changed, 28 insertions(+), 17 deletions(-) [+]
line wrap: on
line diff
--- a/lwlib/ChangeLog	Mon May 01 21:50:54 2006 +0000
+++ b/lwlib/ChangeLog	Tue May 02 15:30:32 2006 +0000
@@ -1,3 +1,13 @@
+2006-04-24  Jerry James  <james@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@xemacs.org>
 
 	* lwlib-fonts.c: Change #include to "font-mgr.h".  Make
--- a/lwlib/lwlib-Xaw.c	Mon May 01 21:50:54 2006 +0000
+++ b/lwlib/lwlib-Xaw.c	Tue May 02 15:30:32 2006 +0000
@@ -847,8 +847,8 @@
 	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;
--- a/lwlib/xlwgauge.c	Mon May 01 21:50:54 2006 +0000
+++ b/lwlib/xlwgauge.c	Tue May 02 15:30:32 2006 +0000
@@ -838,7 +838,7 @@
 	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 ;
 	}
 
--- 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);
--- a/lwlib/xlwtabs.c	Mon May 01 21:50:54 2006 +0000
+++ b/lwlib/xlwtabs.c	Tue May 02 15:30:32 2006 +0000
@@ -1708,8 +1708,8 @@
 	      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 @@
 		}
 	      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 @@
 	{
 #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? */