a177d0bca2
Wed Nov 26 2003 Than Ngo <than@redhat.com> 1.5-20 - added missing Buildprereq: XFree86-devel (bug #110601, #109692, #110735) - fixed arguments in scrollbar (bug #110766)
71 lines
2.0 KiB
Diff
71 lines
2.0 KiB
Diff
--- Xaw3d-1.5/xc/lib/Xaw3d6/Scrollbar.c.orig 2003-11-26 19:38:34.000000000 +0100
|
|
+++ Xaw3d-1.5/xc/lib/Xaw3d6/Scrollbar.c 2003-11-26 19:41:55.000000000 +0100
|
|
@@ -300,9 +300,8 @@
|
|
|
|
/* ARGSUSED */
|
|
static void
|
|
-_ShadowSurroundedBox (gw, event, region, xtl, ytl, xbr, ybr, out)
|
|
+_ShadowSurroundedBox (gw, region, xtl, ytl, xbr, ybr, out)
|
|
Widget gw;
|
|
- XEvent *event;
|
|
Region region;
|
|
Dimension xtl, ytl, xbr, ybr; /* INNER corners */
|
|
Boolean out;
|
|
@@ -384,9 +383,7 @@
|
|
sbw->shown. The old area is erased. The painting and
|
|
erasing is done cleverly so that no flickering will occur. */
|
|
|
|
-static void PaintThumb (sbw, event)
|
|
- ScrollbarWidget sbw;
|
|
- XEvent *event;
|
|
+static void PaintThumb (ScrollbarWidget sbw)
|
|
{
|
|
Dimension s = sbw->threeD.shadow_width;
|
|
Position oldtop = sbw->scrollbar.topLoc;
|
|
@@ -423,7 +420,7 @@
|
|
if (sbw->scrollbar.orientation == XtorientHorizontal)
|
|
{
|
|
_ShadowSurroundedBox(
|
|
- sbw, event,
|
|
+ sbw,
|
|
(Region)NULL,
|
|
newtop + s, 2 * s,
|
|
newbot - s, sbw->core.height - 2 * s, TRUE);
|
|
@@ -431,7 +428,7 @@
|
|
else
|
|
{
|
|
_ShadowSurroundedBox(
|
|
- sbw, event,
|
|
+ sbw,
|
|
(Region)NULL,
|
|
2 * s, newtop + s,
|
|
sbw->core.width - 2 * s, newbot - s,
|
|
@@ -454,8 +451,7 @@
|
|
}
|
|
|
|
#ifdef ARROW_SCROLLBAR
|
|
-static void PaintArrows (sbw)
|
|
- ScrollbarWidget sbw;
|
|
+static void PaintArrows (ScrollbarWidget sbw)
|
|
{
|
|
XPoint pt[20];
|
|
Dimension s = sbw->threeD.shadow_width;
|
|
@@ -761,7 +757,7 @@
|
|
XRectInRegion (region, x, y, width, height) != RectangleOut) {
|
|
/* Forces entire thumb to be painted. */
|
|
sbw->scrollbar.topLoc = -(sbw->scrollbar.length + 1);
|
|
- PaintThumb (sbw, event);
|
|
+ PaintThumb (sbw);
|
|
}
|
|
#ifdef ARROW_SCROLLBAR
|
|
/* we'd like to be region aware here!!!! */
|
|
@@ -1165,7 +1161,7 @@
|
|
#ifdef ARROW_SCROLLBAR
|
|
sbw->scrollbar.scroll_mode = 2; /* indicate continuous scroll */
|
|
#endif
|
|
- PaintThumb (sbw, event);
|
|
+ PaintThumb (sbw);
|
|
XFlush (XtDisplay (w)); /* re-draw it before Notifying */
|
|
}
|
|
|