*** paint_core.c.orig	Tue Jun  4 20:27:52 2002
--- paint_core.c	Tue Jun  4 20:28:06 2002
***************
*** 296,301 ****
--- 296,302 ----
    /*  pause the current selection and grab the pointer  */
    gdisplays_selection_visibility (gdisp->gimage, SelectionPause);
  
+ #ifdef DO_POINTERGRAB
    /* add motion memory if perfectmouse is set */
    if (perfectmouse != 0)
      gdk_pointer_grab (gdisp->canvas->window, FALSE,
***************
*** 309,314 ****
--- 310,316 ----
  		      GDK_BUTTON_RELEASE_MASK,
  		      NULL, NULL, bevent->time);
  
+ #endif /* DO_POINTERGRAB */
    /*  Let the specific painting function initialize itself  */
    (* paint_core->paint_func) (paint_core, drawable, INIT_PAINT);
  
***************
*** 390,396 ****
--- 392,401 ----
    /*  resume the current selection and ungrab the pointer  */
    gdisplays_selection_visibility (gdisp->gimage, SelectionResume);
  
+ #ifdef DO_POINTERGRAB
    gdk_pointer_ungrab (bevent->time);
+ #endif
+ 
    gdk_flush ();
  
    /*  Let the specific painting function finish up  */
*** ink.c.orig	Wed Jun  5 22:21:51 2002
--- ink.c	Wed Jun  5 22:22:38 2002
***************
*** 816,821 ****
--- 816,822 ----
    /*  pause the current selection and grab the pointer  */
    gdisplays_selection_visibility (gdisp->gimage, SelectionPause);
  
+ #ifdef DO_POINTERGRAB
    /* add motion memory if you press mod1 first ^ perfectmouse */
    if (((bevent->state & GDK_MOD1_MASK) != 0) != (perfectmouse != 0))
      gdk_pointer_grab (gdisp->canvas->window, FALSE,
***************
*** 826,831 ****
--- 827,833 ----
  		      GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON1_MOTION_MASK |
  		      GDK_BUTTON_RELEASE_MASK,
  		      NULL, NULL, bevent->time);
+ #endif /*DO_POINTERGRAB*/
    
    tool->gdisp_ptr = gdisp_ptr;
    tool->state = ACTIVE;
***************
*** 862,868 ****
--- 864,872 ----
    /*  resume the current selection and ungrab the pointer  */
    gdisplays_selection_visibility (gdisp->gimage, SelectionResume);
  
+ #ifdef DO_POINTERGRAB
    gdk_pointer_ungrab (bevent->time);
+ #endif /*DO_POINTERGRAB*/
    gdk_flush ();
  
    /*  Set tool state to inactive -- no longer painting */