XEmacs 21.2.32 "Kastor & Polydeukes".

[chise/xemacs-chise.git.1] / lwlib / xlwscrollbar.c

diff --git a/lwlib/xlwscrollbar.c b/lwlib/xlwscrollbar.c
index 81f8cdb..2c2d293 100644 (file)
--- a/lwlib/xlwscrollbar.c
+++ b/lwlib/xlwscrollbar.c
@@ -485,11 +485,9 @@ 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)
@@ -514,14 +512,10 @@ get_gc (XlwScrollBarWidget w, Pixel fg, Pixel bg, Pixmap pm)
   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 |
    (values.stipple == None ? 0 : GCStipple | GCFillStyle);
 
@@ -979,7 +973,7 @@ seg_pixel_sizes (XlwScrollBarWidget w, int *above_return,
   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;