Set drag_pos before grabbing the focus, since we may reenter into

Tue Jul 20 00:45:38 2004  Matthias Clasen  <maclas@gmx.de>

	* gtk/gtktreeview.c (gtk_tree_view_button_press): Set drag_pos
	before grabbing the focus, since we may reenter into
	gtk_tree_view_motion_resize_column() which requires drag_pos
	to be set.  (#147913, Guilherme Salgado, patch by John Finlay)
This commit is contained in:
Matthias Clasen 2004-07-20 04:48:15 +00:00 committed by Matthias Clasen
parent 838497e8ac
commit c506c1954a
5 changed files with 7 additions and 10 deletions

View File

@ -1,10 +1,9 @@
Mon Jul 19 23:51:50 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreeview.c (gtk_tree_view_enter_notify): Don't
use uninitialized node pointer. (#147911, Peter Zelezny)
* gtk/gtktreeview.c (gtk_tree_view_enter_notify):
Tue Jul 20 04:34:56 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* configure.in: Bump version number

View File

@ -1,10 +1,9 @@
Mon Jul 19 23:51:50 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreeview.c (gtk_tree_view_enter_notify): Don't
use uninitialized node pointer. (#147911, Peter Zelezny)
* gtk/gtktreeview.c (gtk_tree_view_enter_notify):
Tue Jul 20 04:34:56 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* configure.in: Bump version number

View File

@ -1,10 +1,9 @@
Mon Jul 19 23:51:50 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreeview.c (gtk_tree_view_enter_notify): Don't
use uninitialized node pointer. (#147911, Peter Zelezny)
* gtk/gtktreeview.c (gtk_tree_view_enter_notify):
Tue Jul 20 04:34:56 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* configure.in: Bump version number

View File

@ -1,10 +1,9 @@
Mon Jul 19 23:51:50 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtktreeview.c (gtk_tree_view_enter_notify): Don't
use uninitialized node pointer. (#147911, Peter Zelezny)
* gtk/gtktreeview.c (gtk_tree_view_enter_notify):
Tue Jul 20 04:34:56 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* configure.in: Bump version number

View File

@ -2445,11 +2445,12 @@ gtk_tree_view_button_press (GtkWidget *widget,
0, 0, NULL, NULL,
drag_data);
tree_view->priv->drag_pos = i;
tree_view->priv->x_drag = column->button->allocation.x + (rtl ? 0 : column->button->allocation.width);
if (!GTK_WIDGET_HAS_FOCUS (widget))
gtk_widget_grab_focus (widget);
tree_view->priv->drag_pos = i;
tree_view->priv->x_drag = column->button->allocation.x + (rtl ? 0 : column->button->allocation.width);
return TRUE;
}
}