Merge from stable.

Fri Sep 12 16:32:53 2003  Jonathan Blandford  <jrb@redhat.com>

	Merge from stable.

	* gtk/gtktreeview.c (gtk_tree_view_button_press): only save the
	pressed button (used to determine if we want to initiate a drag later
	on) if the current grab widget is either NULL or tree_view (Reported
	by Jeroen Zwartepoorte).

diff --git a/ChangeLog b/ChangeLog
index e1ffa8e20492d29e44ec46acd0f936ab667de68a..1530bdcb2b590b5bf68cdef9d23815e4c2618359 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Fri Sep 12 16:32:53 2003  Jonathan Blandford  <jrb@redhat.com>
+
+       Merge from stable.
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): only save the
+       pressed button (used to determine if we want to initiate a drag later
+       on) if the current grab widget is either NULL or tree_view (Reported
+       by Jeroen Zwartepoorte).
+
 2003-09-12  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text) 

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index e1ffa8e20492d29e44ec46acd0f936ab667de68a..1530bdcb2b590b5bf68cdef9d23815e4c2618359 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+Fri Sep 12 16:32:53 2003  Jonathan Blandford  <jrb@redhat.com>
+
+       Merge from stable.
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): only save the
+       pressed button (used to determine if we want to initiate a drag later
+       on) if the current grab widget is either NULL or tree_view (Reported
+       by Jeroen Zwartepoorte).
+
 2003-09-12  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text) 

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index e1ffa8e20492d29e44ec46acd0f936ab667de68a..1530bdcb2b590b5bf68cdef9d23815e4c2618359 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,12 @@
+Fri Sep 12 16:32:53 2003  Jonathan Blandford  <jrb@redhat.com>
+
+       Merge from stable.
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): only save the
+       pressed button (used to determine if we want to initiate a drag later
+       on) if the current grab widget is either NULL or tree_view (Reported
+       by Jeroen Zwartepoorte).
+
 2003-09-12  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text) 

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index e1ffa8e20492d29e44ec46acd0f936ab667de68a..1530bdcb2b590b5bf68cdef9d23815e4c2618359 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,12 @@
+Fri Sep 12 16:32:53 2003  Jonathan Blandford  <jrb@redhat.com>
+
+       Merge from stable.
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): only save the
+       pressed button (used to determine if we want to initiate a drag later
+       on) if the current grab widget is either NULL or tree_view (Reported
+       by Jeroen Zwartepoorte).
+
 2003-09-12  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text) 

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index e1ffa8e20492d29e44ec46acd0f936ab667de68a..1530bdcb2b590b5bf68cdef9d23815e4c2618359 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+Fri Sep 12 16:32:53 2003  Jonathan Blandford  <jrb@redhat.com>
+
+       Merge from stable.
+
+       * gtk/gtktreeview.c (gtk_tree_view_button_press): only save the
+       pressed button (used to determine if we want to initiate a drag later
+       on) if the current grab widget is either NULL or tree_view (Reported
+       by Jeroen Zwartepoorte).
+
 2003-09-12  Matthias Clasen  <maclas@gmx.de>
 
        * gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text) 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index fd30de72f864397571dac503d44072f971aed9c4..81ddb0afc6d7ac71f3f0be275324b86b7f5ca52d 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1991,6 +1991,7 @@ gtk_tree_view_button_press (GtkWidget      *widget,
       gint column_handled_click = FALSE;
       gboolean row_double_click = FALSE;
       gboolean rtl;
+      GtkWidget *grab_widget;
 
       /* are we in an arrow? */
       if (tree_view->priv->prelight_node &&
@@ -2186,7 +2187,9 @@ gtk_tree_view_button_press (GtkWidget      *widget,
 
       /* Save press to possibly begin a drag
        */
-      if (!column_handled_click &&
+      grab_widget = gtk_grab_get_current ();
+      if ((grab_widget == NULL || grab_widget == tree_view) &&
+          !column_handled_click &&
          tree_view->priv->pressed_button < 0)
         {
           tree_view->priv->pressed_button = event->button;