X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lwlib%2Fxlwscrollbar.c;h=81f8cdb4f8bf1d5f44c2055160580032e6165812;hb=69560585d631f17bc636c6cf13fb7cf7d759dbd4;hp=e8ded5a5fa34bedadb819913ee4dcb88c413a75f;hpb=6883ee56ec887c2c48abe5b06b5e66aa74031910;p=chise%2Fxemacs-chise.git.1 diff --git a/lwlib/xlwscrollbar.c b/lwlib/xlwscrollbar.c index e8ded5a..81f8cdb 100644 --- a/lwlib/xlwscrollbar.c +++ b/lwlib/xlwscrollbar.c @@ -485,6 +485,12 @@ arrow_same_end (XlwScrollBarWidget w) } /*-------------------------- GC and Pixel allocation --------------------*/ +#ifdef NEED_MOTIF +#ifndef XmUNSPECIFIED_PIXMAP +#define XmUNSPECIFIED_PIXMAP 2 +#endif +#endif /* NEED_MOTIF */ + static GC get_gc (XlwScrollBarWidget w, Pixel fg, Pixel bg, Pixmap pm) { @@ -506,8 +512,19 @@ get_gc (XlwScrollBarWidget w, Pixel fg, Pixel bg, Pixmap pm) values.background = bg; values.fill_style = FillOpaqueStippled; values.stipple = pm; +/* mask = GCForeground | GCBackground | + (pm == None ? 0 : GCStipple | GCFillStyle); gtb */ +#ifdef NEED_MOTIF + if (pm != None && pm != 0 && pm != XmUNSPECIFIED_PIXMAP) + values.stipple = pm; + else + values.stipple = None; +#else + values.stipple = pm; +#endif /* NEED_MOTIF */ mask = GCForeground | GCBackground | - (pm == None ? 0 : GCStipple | GCFillStyle); + (values.stipple == None ? 0 : GCStipple | GCFillStyle); + return XtGetGC((Widget) w, mask, &values); }