only save the pressed button (used to determine if we want to initiate a

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

	* 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).
This commit is contained in:
Jonathan Blandford
2003-09-12 14:43:36 +00:00
committed by Kristian Rietveld
parent 915a79dc9c
commit 133c2bb168
6 changed files with 39 additions and 1 deletions

View File

@@ -1,3 +1,10 @@
Fri Sep 12 16:32:53 2003 Jonathan Blandford <jrb@redhat.com>
* 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-05 Tor Lillqvist <tml@iki.fi>
* configure.in: Remove spurious 'a' at start of comment line.

View File

@@ -1,3 +1,10 @@
Fri Sep 12 16:32:53 2003 Jonathan Blandford <jrb@redhat.com>
* 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-05 Tor Lillqvist <tml@iki.fi>
* configure.in: Remove spurious 'a' at start of comment line.

View File

@@ -1,3 +1,10 @@
Fri Sep 12 16:32:53 2003 Jonathan Blandford <jrb@redhat.com>
* 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-05 Tor Lillqvist <tml@iki.fi>
* configure.in: Remove spurious 'a' at start of comment line.

View File

@@ -1,3 +1,10 @@
Fri Sep 12 16:32:53 2003 Jonathan Blandford <jrb@redhat.com>
* 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-05 Tor Lillqvist <tml@iki.fi>
* configure.in: Remove spurious 'a' at start of comment line.

View File

@@ -1,3 +1,10 @@
Fri Sep 12 16:32:53 2003 Jonathan Blandford <jrb@redhat.com>
* 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-05 Tor Lillqvist <tml@iki.fi>
* configure.in: Remove spurious 'a' at start of comment line.

View File

@@ -1907,6 +1907,7 @@ gtk_tree_view_button_press (GtkWidget *widget,
GtkCellRenderer *focus_cell = NULL;
gint column_handled_click = FALSE;
gboolean row_double_click = FALSE;
GtkWidget *grab_widget;
/* are we in an arrow? */
if (tree_view->priv->prelight_node &&
@@ -2100,7 +2101,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;