From 0caefdebc078c50e4fafe89ee6d3855f94f5dfee Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 8 Oct 2004 19:00:57 +0000 Subject: [PATCH] Don't start a drag if we loose the grab. 2004-10-08 Matthias Clasen * gtk/gtktreeview.c (gtk_tree_view_grab_notify): Don't start a drag if we loose the grab. --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtktreeview.c | 12 ++++++++++++ 5 files changed, 24 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5836937513..ea5a864f9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-10-08 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_grab_notify): Don't start a + drag if we loose the grab. + * gtk/gtkfilechooserdefault.c (renderer_edited_cb): Set the cell renderer to inert mode to avoid bug #154921. This fixes a crash which would otherwise occur if the editing is stopped for the second diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5836937513..ea5a864f9e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-10-08 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_grab_notify): Don't start a + drag if we loose the grab. + * gtk/gtkfilechooserdefault.c (renderer_edited_cb): Set the cell renderer to inert mode to avoid bug #154921. This fixes a crash which would otherwise occur if the editing is stopped for the second diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 5836937513..ea5a864f9e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-10-08 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_grab_notify): Don't start a + drag if we loose the grab. + * gtk/gtkfilechooserdefault.c (renderer_edited_cb): Set the cell renderer to inert mode to avoid bug #154921. This fixes a crash which would otherwise occur if the editing is stopped for the second diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5836937513..ea5a864f9e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-10-08 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_grab_notify): Don't start a + drag if we loose the grab. + * gtk/gtkfilechooserdefault.c (renderer_edited_cb): Set the cell renderer to inert mode to avoid bug #154921. This fixes a crash which would otherwise occur if the editing is stopped for the second diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 19784432b2..1eb1a3e9bb 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -190,6 +190,8 @@ static gint gtk_tree_view_focus (GtkWidget *widget, static void gtk_tree_view_grab_focus (GtkWidget *widget); static void gtk_tree_view_style_set (GtkWidget *widget, GtkStyle *previous_style); +static void gtk_tree_view_grab_notify (GtkWidget *widget, + gboolean was_grabbed); /* container signals */ static void gtk_tree_view_remove (GtkContainer *container, @@ -531,6 +533,7 @@ gtk_tree_view_class_init (GtkTreeViewClass *class) widget_class->focus = gtk_tree_view_focus; widget_class->grab_focus = gtk_tree_view_grab_focus; widget_class->style_set = gtk_tree_view_style_set; + widget_class->grab_notify = gtk_tree_view_grab_notify; /* GtkContainer signals */ container_class->remove = gtk_tree_view_remove; @@ -12998,4 +13001,13 @@ gtk_tree_view_set_row_separator_func (GtkTreeView *tree_view, } +static void +gtk_tree_view_grab_notify (GtkWidget *widget, + gboolean was_grabbed) +{ + GtkTreeView *tree_view = GTK_TREE_VIEW (widget); + + if (!was_grabbed) + tree_view->priv->pressed_button = -1; +}