Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge from HEAD:

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

	Merge from HEAD:

	* 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:33:46 +00:00
committed by Federico Mena Quintero
parent 71d1467304
commit b55a0e4921
5 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@@ -1,3 +1,12 @@
2004-06-07 Federico Mena Quintero <federico@ximian.com>
Merge from HEAD:
* 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.
Sat Jun 5 23:07:30 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentrycompletion.c: (gtk_entry_completion_init),

9
ChangeLog.pre-2-10
View File

@@ -1,3 +1,12 @@
2004-06-07 Federico Mena Quintero <federico@ximian.com>
Merge from HEAD:
* 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.
Sat Jun 5 23:07:30 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentrycompletion.c: (gtk_entry_completion_init),

9
ChangeLog.pre-2-6
View File

@@ -1,3 +1,12 @@
2004-06-07 Federico Mena Quintero <federico@ximian.com>
Merge from HEAD:
* 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.
Sat Jun 5 23:07:30 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentrycompletion.c: (gtk_entry_completion_init),

9
ChangeLog.pre-2-8
View File

@@ -1,3 +1,12 @@
2004-06-07 Federico Mena Quintero <federico@ximian.com>
Merge from HEAD:
* 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.
Sat Jun 5 23:07:30 2004 Matthias Clasen <maclas@gmx.de>
* gtk/gtkentrycompletion.c: (gtk_entry_completion_init),

5
gtk/gtktreeview.c
View File

@@ -2089,7 +2089,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 &&
@@ -2295,9 +2294,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;