From 5af5cc5a1a95d6e8d3dafab706dcef67337eb45e Mon Sep 17 00:00:00 2001 From: Federico Mena Quintero Date: Tue, 8 Jun 2004 02:31:04 +0000 Subject: [PATCH] Revert the patch from 2003/Sep/12. This kept DnD in tree views within 2004-06-07 Federico Mena Quintero * gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch from 2003/Sep/12. This kept DnD in tree views within modal dialogs from working, which is especially bad for the file chooser. Fixes #135168. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gtk/gtktreeview.c | 5 +---- 5 files changed, 29 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index fa35ebe0e4..2135adb8bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2004-06-07 Federico Mena Quintero + + * gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch + from 2003/Sep/12. This kept DnD in tree views within modal + dialogs from working, which is especially bad for the file + chooser. Fixes #135168. + Sun Jun 6 23:57:21 2004 Matthias Clasen Make the entry context menu work in editable text cells. The changes are diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index fa35ebe0e4..2135adb8bc 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2004-06-07 Federico Mena Quintero + + * gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch + from 2003/Sep/12. This kept DnD in tree views within modal + dialogs from working, which is especially bad for the file + chooser. Fixes #135168. + Sun Jun 6 23:57:21 2004 Matthias Clasen Make the entry context menu work in editable text cells. The changes are diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index fa35ebe0e4..2135adb8bc 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +2004-06-07 Federico Mena Quintero + + * gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch + from 2003/Sep/12. This kept DnD in tree views within modal + dialogs from working, which is especially bad for the file + chooser. Fixes #135168. + Sun Jun 6 23:57:21 2004 Matthias Clasen Make the entry context menu work in editable text cells. The changes are diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index fa35ebe0e4..2135adb8bc 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2004-06-07 Federico Mena Quintero + + * gtk/gtktreeview.c (gtk_tree_view_button_press): Revert the patch + from 2003/Sep/12. This kept DnD in tree views within modal + dialogs from working, which is especially bad for the file + chooser. Fixes #135168. + Sun Jun 6 23:57:21 2004 Matthias Clasen Make the entry context menu work in editable text cells. The changes are diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index f709820eb6..0c345981a3 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -2114,7 +2114,6 @@ 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 && @@ -2320,9 +2319,7 @@ gtk_tree_view_button_press (GtkWidget *widget, /* Save press to possibly begin a drag */ - grab_widget = gtk_grab_get_current (); - if ((grab_widget == NULL || grab_widget == widget) && - !column_handled_click && + if (!column_handled_click && tree_view->priv->pressed_button < 0) { tree_view->priv->pressed_button = event->button;