projects
/
chise
/
xemacs-chise.git.1
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial revision
[chise/xemacs-chise.git.1]
/
lwlib
/
xlwgauge.c
diff --git
a/lwlib/xlwgauge.c
b/lwlib/xlwgauge.c
index
3d81e8f
..
a6c223b
100644
(file)
--- a/
lwlib/xlwgauge.c
+++ b/
lwlib/xlwgauge.c
@@
-52,7
+52,7
@@
Boston, MA 02111-1307, USA. */
#include <X11/IntrinsicP.h>
#include <X11/Xatom.h>
#include <X11/StringDefs.h>
#include <X11/IntrinsicP.h>
#include <X11/Xatom.h>
#include <X11/StringDefs.h>
-#include ATHENA_INCLUDE(XawInit.h)
+#include <X11/Xaw/XawInit.h>
#include "xlwgaugeP.h"
#include "../src/xmu.h"
#ifdef HAVE_XMU
#include "xlwgaugeP.h"
#include "../src/xmu.h"
#ifdef HAVE_XMU
@@
-466,7
+466,7
@@
register Window win = XtWindow(w) ;
if( gw->gauge.nlabels > 1 )
{
char label[20], *s = label ;
if( gw->gauge.nlabels > 1 )
{
char label[20], *s = label ;
- int xlen, wd,h =0 ;
+ int len, w,h =0 ;
if( gw->gauge.orientation == XtorientHorizontal )
y = gw->gauge.lmargin + gw->label.font->max_bounds.ascent - 1 ;
if( gw->gauge.orientation == XtorientHorizontal )
y = gw->gauge.lmargin + gw->label.font->max_bounds.ascent - 1 ;
@@
-483,13
+483,13
@@
register Window win = XtWindow(w) ;
s = gw->gauge.labels[i] ;
if( s != NULL ) {
x = e0 + i*(e1-e0-1)/(gw->gauge.nlabels-1) ;
s = gw->gauge.labels[i] ;
if( s != NULL ) {
x = e0 + i*(e1-e0-1)/(gw->gauge.nlabels-1) ;
- xlen = strlen(s) ;
+ len = strlen(s) ;
if( gw->gauge.orientation == XtorientHorizontal ) {
if( gw->gauge.orientation == XtorientHorizontal ) {
- wd = XTextWidth(gw->label.font, s, xlen) ;
- XDrawString(dpy,win,gc, x-wd/2,y, s,xlen) ;
+ w = XTextWidth(gw->label.font, s, len) ;
+ XDrawString(dpy,win,gc, x-w/2,y, s,len) ;
}
else {
}
else {
- XDrawString(dpy,win,gc, y,x+h, s,xlen) ;
+ XDrawString(dpy,win,gc, y,x+h, s,len) ;
}
}
}
}
}
}
@@
-668,7
+668,7
@@
GaugeConvert (Widget w,
*rval++ = XA_INTEGER ;
*rval++ = XA_STRING ;
*rval++ = XA_TEXT(XtDisplay(w)) ;
*rval++ = XA_INTEGER ;
*rval++ = XA_STRING ;
*rval++ = XA_TEXT(XtDisplay(w)) ;
- memcpy((char *)rval, (char *)stdTargets, stdLength*sizeof(Atom)) ;
+ bcopy((char *)stdTargets, (char *)rval, stdLength*sizeof(Atom)) ;
XtFree((char*) stdTargets) ;
*format = 8*sizeof(Atom) ; /* TODO: needed? */
return True ;
XtFree((char*) stdTargets) ;
*format = 8*sizeof(Atom) ; /* TODO: needed? */
return True ;