Commit 9ded36af authored by Jonathan Blandford's avatar Jonathan Blandford Committed by Kristian Rietveld
Browse files

Merge from stable.

Fri Sep 12 16:32:53 2003  Jonathan Blandford  <jrb@redhat.com>

	Merge from stable.

	* gtk/gtktreeview.c (gtk_tree_view_button_press): only save the
	pressed button (used to determine if we want to initiate a drag later
	on) if the current grab widget is either NULL or tree_view (Reported
	by Jeroen Zwartepoorte).
parent df145210
Fri Sep 12 16:32:53 2003 Jonathan Blandford <jrb@redhat.com>
Merge from stable.
* gtk/gtktreeview.c (gtk_tree_view_button_press): only save the
pressed button (used to determine if we want to initiate a drag later
on) if the current grab widget is either NULL or tree_view (Reported
by Jeroen Zwartepoorte).
2003-09-12 Matthias Clasen <maclas@gmx.de>
* gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text)
......
Fri Sep 12 16:32:53 2003 Jonathan Blandford <jrb@redhat.com>
Merge from stable.
* gtk/gtktreeview.c (gtk_tree_view_button_press): only save the
pressed button (used to determine if we want to initiate a drag later
on) if the current grab widget is either NULL or tree_view (Reported
by Jeroen Zwartepoorte).
2003-09-12 Matthias Clasen <maclas@gmx.de>
* gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text)
......
Fri Sep 12 16:32:53 2003 Jonathan Blandford <jrb@redhat.com>
Merge from stable.
* gtk/gtktreeview.c (gtk_tree_view_button_press): only save the
pressed button (used to determine if we want to initiate a drag later
on) if the current grab widget is either NULL or tree_view (Reported
by Jeroen Zwartepoorte).
2003-09-12 Matthias Clasen <maclas@gmx.de>
* gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text)
......
Fri Sep 12 16:32:53 2003 Jonathan Blandford <jrb@redhat.com>
Merge from stable.
* gtk/gtktreeview.c (gtk_tree_view_button_press): only save the
pressed button (used to determine if we want to initiate a drag later
on) if the current grab widget is either NULL or tree_view (Reported
by Jeroen Zwartepoorte).
2003-09-12 Matthias Clasen <maclas@gmx.de>
* gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text)
......
Fri Sep 12 16:32:53 2003 Jonathan Blandford <jrb@redhat.com>
Merge from stable.
* gtk/gtktreeview.c (gtk_tree_view_button_press): only save the
pressed button (used to determine if we want to initiate a drag later
on) if the current grab widget is either NULL or tree_view (Reported
by Jeroen Zwartepoorte).
2003-09-12 Matthias Clasen <maclas@gmx.de>
* gdk/gdkdraw.c (gdk_draw_string, gdk_draw_text)
......
......@@ -1991,6 +1991,7 @@ 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 &&
......@@ -2186,7 +2187,9 @@ gtk_tree_view_button_press (GtkWidget *widget,
/* Save press to possibly begin a drag
*/
if (!column_handled_click &&
grab_widget = gtk_grab_get_current ();
if ((grab_widget == NULL || grab_widget == tree_view) &&
!column_handled_click &&
tree_view->priv->pressed_button < 0)
{
tree_view->priv->pressed_button = event->button;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment