From 5a3de51ba18bc6d53285ff90c5c1fa7c56d762d9 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Thu, 13 Dec 2001 17:25:22 +0000 Subject: [PATCH] Compare event->state with the default mod mask. 2001-12-13 Anders Carlsson * gtk/gtktreeview.c (gtk_tree_view_button_press): Compare event->state with the default mod mask. --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtktreeview.c | 2 +- 8 files changed, 36 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 1ae7276d71..036f8f9d4a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2001-12-13 Anders Carlsson + + * gtk/gtktreeview.c (gtk_tree_view_button_press): Compare + event->state with the default mod mask. + 2001-12-12 jacob berkman * gtk/gtk*.h (GTK_IS_*_CLASS): s/obj/klass/ where appropriate diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 1ae7276d71..036f8f9d4a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2001-12-13 Anders Carlsson + + * gtk/gtktreeview.c (gtk_tree_view_button_press): Compare + event->state with the default mod mask. + 2001-12-12 jacob berkman * gtk/gtk*.h (GTK_IS_*_CLASS): s/obj/klass/ where appropriate diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 1ae7276d71..036f8f9d4a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2001-12-13 Anders Carlsson + + * gtk/gtktreeview.c (gtk_tree_view_button_press): Compare + event->state with the default mod mask. + 2001-12-12 jacob berkman * gtk/gtk*.h (GTK_IS_*_CLASS): s/obj/klass/ where appropriate diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 1ae7276d71..036f8f9d4a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2001-12-13 Anders Carlsson + + * gtk/gtktreeview.c (gtk_tree_view_button_press): Compare + event->state with the default mod mask. + 2001-12-12 jacob berkman * gtk/gtk*.h (GTK_IS_*_CLASS): s/obj/klass/ where appropriate diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 1ae7276d71..036f8f9d4a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2001-12-13 Anders Carlsson + + * gtk/gtktreeview.c (gtk_tree_view_button_press): Compare + event->state with the default mod mask. + 2001-12-12 jacob berkman * gtk/gtk*.h (GTK_IS_*_CLASS): s/obj/klass/ where appropriate diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 1ae7276d71..036f8f9d4a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2001-12-13 Anders Carlsson + + * gtk/gtktreeview.c (gtk_tree_view_button_press): Compare + event->state with the default mod mask. + 2001-12-12 jacob berkman * gtk/gtk*.h (GTK_IS_*_CLASS): s/obj/klass/ where appropriate diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 1ae7276d71..036f8f9d4a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2001-12-13 Anders Carlsson + + * gtk/gtktreeview.c (gtk_tree_view_button_press): Compare + event->state with the default mod mask. + 2001-12-12 jacob berkman * gtk/gtk*.h (GTK_IS_*_CLASS): s/obj/klass/ where appropriate diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index e34f3d9346..c813032a8a 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -1756,7 +1756,7 @@ gtk_tree_view_button_press (GtkWidget *widget, } if (event->type == GDK_BUTTON_PRESS && - !event->state) + !(event->state & gtk_accelerator_get_default_mod_mask ())) { GtkCellEditable *cell_editable = NULL; /* FIXME: get the right flags */