X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lwlib%2Fxlwscrollbar.c;h=9fe3de939d274b192cccdb9dd85a923ea9776669;hb=8f12b17f2628bf05fb2cc11edd389d3ed24c4abe;hp=81f8cdb4f8bf1d5f44c2055160580032e6165812;hpb=72a705551741d6f85a40eea486c222bac482d8dc;p=chise%2Fxemacs-chise.git.1

diff --git a/lwlib/xlwscrollbar.c b/lwlib/xlwscrollbar.c
index 81f8cdb..9fe3de9 100644
--- a/lwlib/xlwscrollbar.c
+++ b/lwlib/xlwscrollbar.c
@@ -30,7 +30,8 @@ Boston, MA 02111-1307, USA.  */
  *
  * Emacs*XlwScrollBar.translations: #override \n\
  *   <Btn1Down>:     PageDownOrRight()	  \n\
- *   <Btn3Down>:     PageUpOrLeft()
+ *   <Btn3Down>:     PageUpOrLeft()	\n\
+ *   <Btn3Up>:	Release()
  *
  */
 
@@ -485,11 +486,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 +513,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 +974,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;