projects
/
chise
/
xemacs-chise.git-
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Merge Big5 code points.
[chise/xemacs-chise.git-]
/
lwlib
/
xlwscrollbar.c
diff --git
a/lwlib/xlwscrollbar.c
b/lwlib/xlwscrollbar.c
index
e8ded5a
..
2c2d293
100644
(file)
--- a/
lwlib/xlwscrollbar.c
+++ b/
lwlib/xlwscrollbar.c
@@
-485,6
+485,10
@@
arrow_same_end (XlwScrollBarWidget w)
}
/*-------------------------- GC and Pixel allocation --------------------*/
}
/*-------------------------- GC and Pixel allocation --------------------*/
+#ifndef XmUNSPECIFIED_PIXMAP
+#define XmUNSPECIFIED_PIXMAP 2
+#endif
+
static GC
get_gc (XlwScrollBarWidget w, Pixel fg, Pixel bg, Pixmap pm)
{
static GC
get_gc (XlwScrollBarWidget w, Pixel fg, Pixel bg, Pixmap pm)
{
@@
-506,8
+510,15
@@
get_gc (XlwScrollBarWidget w, Pixel fg, Pixel bg, Pixmap pm)
values.background = bg;
values.fill_style = FillOpaqueStippled;
values.stipple = pm;
values.background = bg;
values.fill_style = FillOpaqueStippled;
values.stipple = pm;
+/* mask = GCForeground | GCBackground |
+ (pm == None ? 0 : GCStipple | GCFillStyle); gtb */
+ if (pm != None && pm != 0 && pm != XmUNSPECIFIED_PIXMAP)
+ values.stipple = pm;
+ else
+ values.stipple = None;
mask = GCForeground | GCBackground |
mask = GCForeground | GCBackground |
- (pm == None ? 0 : GCStipple | GCFillStyle);
+ (values.stipple == None ? 0 : GCStipple | GCFillStyle);
+
return XtGetGC((Widget) w, mask, &values);
}
return XtGetGC((Widget) w, mask, &values);
}
@@
-962,7
+973,7
@@
seg_pixel_sizes (XlwScrollBarWidget w, int *above_return,
if (ss < SS_MIN)
{
/* add a percent amount for integer rounding */
if (ss < SS_MIN)
{
/* add a percent amount for integer rounding */
- float tmp = ((((float) (SS_MIN - ss) * (float) value)) / total) + 0.5;
+ float tmp = (((float) (SS_MIN - ss) * (float) value) / total) + 0.5;
above -= (int) tmp;
ss = SS_MIN;
above -= (int) tmp;
ss = SS_MIN;