Revert the patch from 2003/Sep/12. This kept DnD in tree views within

2004-06-07  Federico Mena Quintero  <federico@ximian.com>

	* 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.
This commit is contained in:
Federico Mena Quintero 2004-06-08 02:31:04 +00:00 committed by Federico Mena Quintero
parent 4432ce213e
commit 5af5cc5a1a
5 changed files with 29 additions and 4 deletions

View File

@ -1,3 +1,10 @@
2004-06-07 Federico Mena Quintero <federico@ximian.com>
* 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 <maclas@gmx.de> Sun Jun 6 23:57:21 2004 Matthias Clasen <maclas@gmx.de>
Make the entry context menu work in editable text cells. The changes are Make the entry context menu work in editable text cells. The changes are

View File

@ -1,3 +1,10 @@
2004-06-07 Federico Mena Quintero <federico@ximian.com>
* 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 <maclas@gmx.de> Sun Jun 6 23:57:21 2004 Matthias Clasen <maclas@gmx.de>
Make the entry context menu work in editable text cells. The changes are Make the entry context menu work in editable text cells. The changes are

View File

@ -1,3 +1,10 @@
2004-06-07 Federico Mena Quintero <federico@ximian.com>
* 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 <maclas@gmx.de> Sun Jun 6 23:57:21 2004 Matthias Clasen <maclas@gmx.de>
Make the entry context menu work in editable text cells. The changes are Make the entry context menu work in editable text cells. The changes are

View File

@ -1,3 +1,10 @@
2004-06-07 Federico Mena Quintero <federico@ximian.com>
* 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 <maclas@gmx.de> Sun Jun 6 23:57:21 2004 Matthias Clasen <maclas@gmx.de>
Make the entry context menu work in editable text cells. The changes are Make the entry context menu work in editable text cells. The changes are

View File

@ -2114,7 +2114,6 @@ gtk_tree_view_button_press (GtkWidget *widget,
gint column_handled_click = FALSE; gint column_handled_click = FALSE;
gboolean row_double_click = FALSE; gboolean row_double_click = FALSE;
gboolean rtl; gboolean rtl;
GtkWidget *grab_widget;
/* are we in an arrow? */ /* are we in an arrow? */
if (tree_view->priv->prelight_node && if (tree_view->priv->prelight_node &&
@ -2320,9 +2319,7 @@ gtk_tree_view_button_press (GtkWidget *widget,
/* Save press to possibly begin a drag /* Save press to possibly begin a drag
*/ */
grab_widget = gtk_grab_get_current (); if (!column_handled_click &&
if ((grab_widget == NULL || grab_widget == widget) &&
!column_handled_click &&
tree_view->priv->pressed_button < 0) tree_view->priv->pressed_button < 0)
{ {
tree_view->priv->pressed_button = event->button; tree_view->priv->pressed_button = event->button;