aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristopher James Lahey <clahey@ximian.com>2001-10-30 07:06:57 +0800
committerChris Lahey <clahey@src.gnome.org>2001-10-30 07:06:57 +0800
commitbb52386b7da776c5692974b4c5cedbf5d2f46d4c (patch)
treee7f4095feb18fd7c7703af9070431ed4a0a6f082
parent9240ef253f5adb849f2a0eb400bc80e57634bc07 (diff)
downloadgsoc2013-evolution-bb52386b7da776c5692974b4c5cedbf5d2f46d4c.tar.gz
gsoc2013-evolution-bb52386b7da776c5692974b4c5cedbf5d2f46d4c.tar.zst
gsoc2013-evolution-bb52386b7da776c5692974b4c5cedbf5d2f46d4c.zip
Ignore buttons 4 and 5 here. Fixes Ximian bug #13853.
2001-10-29 Christopher James Lahey <clahey@ximian.com> * e-table.c (et_canvas_root_event), e-tree.c (et_canvas_root_event): Ignore buttons 4 and 5 here. Fixes Ximian bug #13853. svn path=/trunk/; revision=14376
-rw-r--r--widgets/table/e-table.c14
-rw-r--r--widgets/table/e-tree.c14
2 files changed, 16 insertions, 12 deletions
diff --git a/widgets/table/e-table.c b/widgets/table/e-table.c
index 0d860ac29b..22ea5b0660 100644
--- a/widgets/table/e-table.c
+++ b/widgets/table/e-table.c
@@ -729,12 +729,14 @@ et_canvas_root_event (GnomeCanvasItem *root, GdkEvent *event, ETable *e_table)
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
- if (GTK_WIDGET_HAS_FOCUS(root->canvas)) {
- GnomeCanvasItem *item = GNOME_CANVAS(root->canvas)->focused_item;
-
- if (E_IS_TABLE_ITEM(item)) {
- e_table_item_leave_edit_(E_TABLE_ITEM(item));
- return TRUE;
+ if (event->button.button != 4 && event->button.button != 5) {
+ if (GTK_WIDGET_HAS_FOCUS(root->canvas)) {
+ GnomeCanvasItem *item = GNOME_CANVAS(root->canvas)->focused_item;
+
+ if (E_IS_TABLE_ITEM(item)) {
+ e_table_item_leave_edit_(E_TABLE_ITEM(item));
+ return TRUE;
+ }
}
}
break;
diff --git a/widgets/table/e-tree.c b/widgets/table/e-tree.c
index 89bb65708d..24db734e2b 100644
--- a/widgets/table/e-tree.c
+++ b/widgets/table/e-tree.c
@@ -714,12 +714,14 @@ et_canvas_root_event (GnomeCanvasItem *root, GdkEvent *event, ETree *e_tree)
case GDK_BUTTON_PRESS:
case GDK_2BUTTON_PRESS:
case GDK_BUTTON_RELEASE:
- if (GTK_WIDGET_HAS_FOCUS(root->canvas)) {
- GnomeCanvasItem *item = GNOME_CANVAS(root->canvas)->focused_item;
-
- if (E_IS_TABLE_ITEM(item)) {
- e_table_item_leave_edit_(E_TABLE_ITEM(item));
- return TRUE;
+ if (event->button.button != 4 && event->button.button != 5) {
+ if (GTK_WIDGET_HAS_FOCUS(root->canvas)) {
+ GnomeCanvasItem *item = GNOME_CANVAS(root->canvas)->focused_item;
+
+ if (E_IS_TABLE_ITEM(item)) {
+ e_table_item_leave_edit_(E_TABLE_ITEM(item));
+ return TRUE;
+ }
}
}
break;