]>
Commit | Line | Data |
---|---|---|
990fd5d1 | 1 | --- Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c.orig Fri Apr 18 09:42:17 2003 |
2 | +++ Xaw3d-1.5E/xc/lib/Xaw3d/Scrollbar.c Fri Apr 18 09:44:12 2003 | |
3 | @@ -1087,7 +1087,11 @@ | |
94879352 | 4 | Cardinal *num_params; /* unused */ |
5 | { | |
6 | register ScrollbarWidget sbw = (ScrollbarWidget) w; | |
7 | - float top = sbw->scrollbar.top; | |
8 | + union { | |
990fd5d1 | 9 | + XtPointer pt; |
10 | + float top; | |
94879352 | 11 | + } foo; |
12 | + foo.top = sbw->scrollbar.top; | |
13 | ||
990fd5d1 | 14 | #ifndef XAW_ARROW_SCROLLBARS |
94879352 | 15 | if (sbw->scrollbar.direction == 0) return; /* if no StartScroll */ |
990fd5d1 | 16 | @@ -1116,10 +1120,10 @@ |
17 | /* Removed the dependancy on scrollbar arrows. Xterm as distributed in | |
18 | X11R6.6 by The XFree86 Project wants this correction, with or without | |
19 | the arrows. */ | |
94879352 | 20 | - top += 0.0001; |
21 | + foo.top += 0.0001; | |
990fd5d1 | 22 | /* #endif */ |
94879352 | 23 | - XtCallCallbacks (w, XtNthumbProc, *(XtPointer*)&top); |
24 | - XtCallCallbacks (w, XtNjumpProc, (XtPointer)&top); | |
25 | + XtCallCallbacks (w, XtNthumbProc, foo.pt); | |
26 | + XtCallCallbacks (w, XtNjumpProc, (XtPointer)&sbw->scrollbar.top); | |
27 | } | |
28 | ||
990fd5d1 | 29 |