diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2004-10-08 18:59:00 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2004-10-08 18:59:00 +0000 |
| commit | 6ca81efdccbc6a0f49b1d478623a6a7d283ae512 (patch) | |
| tree | 54b43662e9c093c7c2ffb8aaea60eeb1fc48fee9 | |
| parent | 325a04fbcd5fa462feef7de7abc650829b3db7eb (diff) | |
| download | gdk-pixbuf-6ca81efdccbc6a0f49b1d478623a6a7d283ae512.tar.gz | |
Don't start a drag if we loose the grab.
2004-10-08 Matthias Clasen <mclasen@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_grab_notify): Don't start a
drag if we loose the grab.
| -rw-r--r-- | ChangeLog | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 3 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 3 | ||||
| -rw-r--r-- | gtk/gtktreeview.c | 13 |
5 files changed, 25 insertions, 0 deletions
@@ -1,5 +1,8 @@ 2004-10-08 Matthias Clasen <mclasen@redhat.com> + * 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 1d7408ef8..bc4d803e5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-10-08 Matthias Clasen <mclasen@redhat.com> + * 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 1d7408ef8..bc4d803e5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-10-08 Matthias Clasen <mclasen@redhat.com> + * 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 1d7408ef8..bc4d803e5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-10-08 Matthias Clasen <mclasen@redhat.com> + * 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 ec59b810c..ce8d659cc 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -178,6 +178,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, @@ -513,6 +515,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; @@ -12328,3 +12331,13 @@ _gtk_tree_view_set_hover_selection (GtkTreeView *tree_view, tree_view->priv->hover_selection = hover; } + +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; +} |