Mercurial > hg > xemacs-beta

diff lwlib/xlwscrollbar.c @ 373:6240c7796c7a r21-2b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2b2
author cvs
date Mon, 13 Aug 2007 11:04:06 +0200
parents cc15677e0335
children 74fd4e045ea6
line wrap: on
line diff
--- a/lwlib/xlwscrollbar.c	Mon Aug 13 11:03:09 2007 +0200
+++ b/lwlib/xlwscrollbar.c	Mon Aug 13 11:04:06 2007 +0200
@@ -485,6 +485,12 @@
 }
 
 /*-------------------------- 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 @@
   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);
 }