summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Blandford <jrb@redhat.com>2002-01-28 19:48:48 +0000
committerJonathan Blandford <jrb@src.gnome.org>2002-01-28 19:48:48 +0000
commitd8068f867cd25f28298fb510c39ba0fd20be6ce5 (patch)
treeab0ee273fb9ffd0269d6e932943a4a9014efb91d
parent7160e77b6b6259239449ab927743f846f139db74 (diff)
downloadgdk-pixbuf-d8068f867cd25f28298fb510c39ba0fd20be6ce5.tar.gz
Only activate/edit the row if shift is not pressed, #69248
Mon Jan 28 14:44:40 2002 Jonathan Blandford <jrb@redhat.com> * gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only activate/edit the row if shift is not pressed, #69248
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-05
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-25
-rw-r--r--ChangeLog.pre-2-45
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--gtk/gtktreeview.c7
8 files changed, 41 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 64e165f5e..4e1ff7ab3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jan 28 14:44:40 2002 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only
+ activate/edit the row if shift is not pressed, #69248
+
2002-01-28 Anders Carlsson <andersca@gnu.org>
* gtk/gtkcurve.c (gtk_curve_set_vector): Fix build.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 64e165f5e..4e1ff7ab3 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Mon Jan 28 14:44:40 2002 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only
+ activate/edit the row if shift is not pressed, #69248
+
2002-01-28 Anders Carlsson <andersca@gnu.org>
* gtk/gtkcurve.c (gtk_curve_set_vector): Fix build.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 64e165f5e..4e1ff7ab3 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Mon Jan 28 14:44:40 2002 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only
+ activate/edit the row if shift is not pressed, #69248
+
2002-01-28 Anders Carlsson <andersca@gnu.org>
* gtk/gtkcurve.c (gtk_curve_set_vector): Fix build.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 64e165f5e..4e1ff7ab3 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Mon Jan 28 14:44:40 2002 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only
+ activate/edit the row if shift is not pressed, #69248
+
2002-01-28 Anders Carlsson <andersca@gnu.org>
* gtk/gtkcurve.c (gtk_curve_set_vector): Fix build.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 64e165f5e..4e1ff7ab3 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Mon Jan 28 14:44:40 2002 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only
+ activate/edit the row if shift is not pressed, #69248
+
2002-01-28 Anders Carlsson <andersca@gnu.org>
* gtk/gtkcurve.c (gtk_curve_set_vector): Fix build.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 64e165f5e..4e1ff7ab3 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Mon Jan 28 14:44:40 2002 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only
+ activate/edit the row if shift is not pressed, #69248
+
2002-01-28 Anders Carlsson <andersca@gnu.org>
* gtk/gtkcurve.c (gtk_curve_set_vector): Fix build.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 64e165f5e..4e1ff7ab3 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Mon Jan 28 14:44:40 2002 Jonathan Blandford <jrb@redhat.com>
+
+ * gtk/gtktreeview.c (gtk_tree_view_real_select_cursor_row): Only
+ activate/edit the row if shift is not pressed, #69248
+
2002-01-28 Anders Carlsson <andersca@gnu.org>
* gtk/gtkcurve.c (gtk_curve_set_vector): Fix build.
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 90f27f9f4..29f45fe84 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -6366,7 +6366,9 @@ gtk_tree_view_real_select_cursor_row (GtkTreeView *tree_view,
gtk_get_current_event_state (&state);
- if (start_editing && tree_view->priv->focus_column)
+ if (! (state & GDK_SHIFT_MASK) &&
+ start_editing &&
+ tree_view->priv->focus_column)
{
if (gtk_tree_view_start_editing (tree_view, cursor_path))
{
@@ -6385,6 +6387,9 @@ gtk_tree_view_real_select_cursor_row (GtkTreeView *tree_view,
gtk_widget_grab_focus (GTK_WIDGET (tree_view));
_gtk_tree_view_queue_draw_node (tree_view, cursor_tree, cursor_node, NULL);
+ if (! (state & GDK_SHIFT_MASK))
+ gtk_tree_view_row_activated (tree_view, cursor_path, tree_view->priv->focus_column);
+
gtk_tree_path_free (cursor_path);
}