Mercurial > hg > xemacs-beta

diff lwlib/xlwscrollbar.c @ 371:cc15677e0335 r21-2b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2b1
author cvs
date Mon, 13 Aug 2007 11:03:08 +0200
parents 7347b34c275b
children 6240c7796c7a
line wrap: on
line diff
--- a/lwlib/xlwscrollbar.c	Mon Aug 13 11:01:58 2007 +0200
+++ b/lwlib/xlwscrollbar.c	Mon Aug 13 11:03:08 2007 +0200
@@ -485,10 +485,6 @@
 }
 
 /*-------------------------- GC and Pixel allocation --------------------*/
-#ifndef XmUNSPECIFIED_PIXMAP
-#define XmUNSPECIFIED_PIXMAP 2
-#endif
-
 static GC
 get_gc (XlwScrollBarWidget w, Pixel fg, Pixel bg, Pixmap pm)
 {
@@ -510,15 +506,8 @@
   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 |
-   (values.stipple == None ? 0 : GCStipple | GCFillStyle);
-
+    (pm == None ? 0 : GCStipple | GCFillStyle);
   return XtGetGC((Widget) w, mask, &values);
 }