From c506c1954ade62fcf8fdcf6f8699ff171ffb9dfb Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 20 Jul 2004 04:48:15 +0000 Subject: [PATCH] Set drag_pos before grabbing the focus, since we may reenter into Tue Jul 20 00:45:38 2004 Matthias Clasen * 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) --- ChangeLog | 3 +-- ChangeLog.pre-2-10 | 3 +-- ChangeLog.pre-2-6 | 3 +-- ChangeLog.pre-2-8 | 3 +-- gtk/gtktreeview.c | 5 +++-- 5 files changed, 7 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 802507df5e..314980d735 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,9 @@ + Mon Jul 19 23:51:50 2004 Matthias Clasen * 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 * configure.in: Bump version number diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 802507df5e..314980d735 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,10 +1,9 @@ + Mon Jul 19 23:51:50 2004 Matthias Clasen * 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 * configure.in: Bump version number diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 802507df5e..314980d735 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,10 +1,9 @@ + Mon Jul 19 23:51:50 2004 Matthias Clasen * 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 * configure.in: Bump version number diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 802507df5e..314980d735 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,10 +1,9 @@ + Mon Jul 19 23:51:50 2004 Matthias Clasen * 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 * configure.in: Bump version number diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 0c3c9edd87..c7a3bc78e1 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -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; } }