#include <X11/IntrinsicP.h>
#include <X11/Xatom.h>
#include <X11/StringDefs.h>
-#include ATHENA_INCLUDE(XawInit.h)
+#include ATHENA_XawInit_h_
#include "xlwgaugeP.h"
#include "../src/xmu.h"
#ifdef HAVE_XMU
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 ;
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) ;
}
}
}
*rval++ = XA_INTEGER ;
*rval++ = XA_STRING ;
*rval++ = XA_TEXT(XtDisplay(w)) ;
- bcopy((char *)stdTargets, (char *)rval, stdLength*sizeof(Atom)) ;
+ memcpy((char *)rval, (char *)stdTargets, stdLength*sizeof(Atom)) ;
XtFree((char*) stdTargets) ;
*format = 8*sizeof(Atom) ; /* TODO: needed? */
return True ;