--- rxvt-unicode/src/command.C	2007/12/11 21:10:46	1.375
+++ rxvt-unicode/src/command.C	2007/12/14 02:08:18	1.376
@@ -1050,7 +1050,7 @@
 
   display->flush ();
 
-  if (want_refresh && !ev_is_active (&flush_ev))
+  if (want_refresh && !flush_ev.is_active ())
     flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
 }
 
@@ -1581,7 +1581,7 @@
                         /* don't clobber the current delay if we are
                          * already in the middle of scrolling.
                          */
-                        if (!ev_is_active (&sel_scroll_ev))
+                        if (!sel_scroll_ev.is_active ())
                           sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
 
                         /* save the event params so we can highlight
@@ -1614,8 +1614,7 @@
                         /* we are within the text window, so we
                          * shouldn't be scrolling
                          */
-                        if (ev_is_active (&sel_scroll_ev))
-                          sel_scroll_ev.stop();
+                        sel_scroll_ev.stop();
                       }
 #endif
 #ifdef MOUSE_THRESHOLD
@@ -1977,10 +1976,12 @@
               else if (scrollbarrxvt_dnButton (ev.y))
                 upordown = 1;	/* down */
             }
+
           if (upordown)
             {
 #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
-              cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
+              if (!cont_scroll_ev.is_active ())
+                cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
 #endif
               if (scr_page (upordown < 0 ? UP : DN, 1))
                 {
@@ -2070,8 +2071,7 @@
     }
 
 #ifdef SELECTION_SCROLLING
-  if (ev_is_active (&sel_scroll_ev))
-    sel_scroll_ev.stop();
+  sel_scroll_ev.stop();
 #endif
 
   if (ev.window == vt)
@@ -2153,7 +2153,8 @@
                   if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
                   if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
 
-                  slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
+                  if (!slip_wheel_ev.is_active ())
+                    slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
                 }
               else
                 {