[Emacs-diffs] /srv/bzr/emacs/trunk r99949: gtkutils.c (xg_event_is_for_scrollbar): Check if grabbed widget is a scrollbar.

[Jan D.]

------------------------------------------------------------
revno: 99949
committer: Jan D. <address@hidden>
branch nick: trunk
timestamp: Tue 2010-04-20 13:38:30 +0200
message:
  gtkutils.c (xg_event_is_for_scrollbar): Check if grabbed widget is a 
scrollbar.
modified:
  src/ChangeLog
  src/gtkutil.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-04-20 07:26:02 +0000
+++ b/src/ChangeLog     2010-04-20 11:38:30 +0000
@@ -1,3 +1,8 @@
+2010-04-20  Jan Djärv  <address@hidden>
+
+       * gtkutil.c (xg_event_is_for_scrollbar): Check if grabbed
+       widget is a scrollbar.
+
 2010-04-20  Kenichi Handa  <address@hidden>
 
        * charset.c (char_charset): Consider Vcharset_non_preferred_head

=== modified file 'src/gtkutil.c'
--- a/src/gtkutil.c     2010-04-18 11:24:59 +0000
+++ b/src/gtkutil.c     2010-04-20 11:38:30 +0000
@@ -3371,8 +3371,8 @@
                || event->type == MotionNotify))
     {
       /* If we are releasing or moving the scroll bar, it has the grab.  */
-      retval = gtk_grab_get_current () != 0
-        && gtk_grab_get_current () != f->output_data.x->edit_widget;
+      GtkWidget *w = gtk_grab_get_current ();
+      retval = w != 0 && GTK_IS_SCROLLBAR (w);
     }
   
   return retval;