Mercurial > hg > xemacs-beta

diff lwlib/xlwgauge.c @ 400:a86b2b5e0111 r21-2-30

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-30
author cvs
date Mon, 13 Aug 2007 11:14:34 +0200
parents 74fd4e045ea6
children de805c49cfc1
line wrap: on
line diff
--- a/lwlib/xlwgauge.c	Mon Aug 13 11:13:33 2007 +0200
+++ b/lwlib/xlwgauge.c	Mon Aug 13 11:14:34 2007 +0200
@@ -466,7 +466,7 @@
 	if( gw->gauge.nlabels > 1 )
 	{
 	  char	label[20], *s = label ;
-	  int	len, w,h =0 ;
+	  int	xlen, wd,h =0 ;
 
 	  if( gw->gauge.orientation == XtorientHorizontal )
 	    y = gw->gauge.lmargin + gw->label.font->max_bounds.ascent - 1 ;
@@ -483,13 +483,13 @@
 	      s = gw->gauge.labels[i] ;
 	    if( s != NULL ) {
 	      x = e0 + i*(e1-e0-1)/(gw->gauge.nlabels-1) ;
-	      len = strlen(s) ;
+	      xlen = strlen(s) ;
 	      if( gw->gauge.orientation == XtorientHorizontal ) {
-		w = XTextWidth(gw->label.font, s, len) ;
-		XDrawString(dpy,win,gc, x-w/2,y, s,len) ;
+		wd = XTextWidth(gw->label.font, s, xlen) ;
+		XDrawString(dpy,win,gc, x-wd/2,y, s,xlen) ;
 	      }
 	      else {
-		XDrawString(dpy,win,gc, y,x+h, s,len) ;
+		XDrawString(dpy,win,gc, y,x+h, s,xlen) ;
 	      }
 	    }
 	  }