From f7069251d4161f1a6662185ba34b8cb05477b3af Mon Sep 17 00:00:00 2001
From: Federico Mena Quintero <federico@src.gnome.org>
Date: Wed, 22 Nov 2000 18:28:44 +0000
Subject: Save the children - Federico
svn path=/trunk/; revision=6652
---
widgets/table/e-cell-tree.c | 3 +--
widgets/table/e-cell.c | 4 ++--
widgets/table/e-cell.h | 2 +-
widgets/table/e-table-item.c | 21 +++++++++++++++------
4 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/widgets/table/e-cell-tree.c b/widgets/table/e-cell-tree.c
index 8861399c3e..a465d3b290 100644
--- a/widgets/table/e-cell-tree.c
+++ b/widgets/table/e-cell-tree.c
@@ -339,8 +339,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col,
default:
/* nada */
}
- e_cell_event(tree_view->subcell_view, event, model_col, view_col, row);
- return TRUE;
+ return e_cell_event(tree_view->subcell_view, event, model_col, view_col, row);
}
}
diff --git a/widgets/table/e-cell.c b/widgets/table/e-cell.c
index 320f86b726..8fe664f7e1 100644
--- a/widgets/table/e-cell.c
+++ b/widgets/table/e-cell.c
@@ -125,10 +125,10 @@ e_cell_init (GtkObject *object)
E_MAKE_TYPE(e_cell, "ECell", ECell, e_cell_class_init, e_cell_init, PARENT_TYPE);
-void
+gint
e_cell_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row)
{
- E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->event (
+ return E_CELL_CLASS (GTK_OBJECT (ecell_view->ecell)->klass)->event (
ecell_view, event, model_col, view_col, row);
}
diff --git a/widgets/table/e-cell.h b/widgets/table/e-cell.h
index 3ff346d8a2..986af546c5 100644
--- a/widgets/table/e-cell.h
+++ b/widgets/table/e-cell.h
@@ -80,7 +80,7 @@ GtkType e_cell_get_type (void);
ECellView *e_cell_new_view (ECell *ecell, ETableModel *table_model, void *e_table_item_view);
void e_cell_kill_view (ECellView *ecell_view);
-void e_cell_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row);
+gint e_cell_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row);
void e_cell_realize (ECellView *ecell_view);
void e_cell_unrealize (ECellView *ecell_view);
diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c
index 0c6067ee86..8a927ed11b 100644
--- a/widgets/table/e-table-item.c
+++ b/widgets/table/e-table-item.c
@@ -1541,7 +1541,8 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
e->button.x = x1;
e->button.y = y1;
- e_cell_event (ecell_view, e, view_to_model_col(eti, col), col, row);
+ return_val = e_cell_event (ecell_view, e,
+ view_to_model_col(eti, col), col, row);
}
break;
@@ -1600,7 +1601,8 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
e->button.x = x1;
e->button.y = y1;
- e_cell_event (ecell_view, e, view_to_model_col(eti, col), col, row);
+ return_val = e_cell_event (ecell_view, e,
+ view_to_model_col(eti, col), col, row);
}
break;
case 3:
@@ -1662,7 +1664,8 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
e->motion.x = x1;
e->motion.y = y1;
- e_cell_event (ecell_view, e, view_to_model_col(eti, col), col, row);
+ return_val = e_cell_event (ecell_view, e,
+ view_to_model_col(eti, col), col, row);
}
break;
}
@@ -1751,7 +1754,9 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
e_table_item_leave_edit (eti);
#if 0
ecell_view = eti->cell_views [eti->editing_col];
- e_cell_event (ecell_view, e, view_to_model_col(eti, eti->editing_col), eti->editing_col, eti->editing_row);
+ return_val = e_cell_event (ecell_view, e,
+ view_to_model_col(eti, eti->editing_col),
+ eti->editing_col, eti->editing_row);
#endif
}
return_val = FALSE;
@@ -1777,7 +1782,9 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
model_to_view_row(eti, cursor_row), cursor_col, e, &return_val);
} else {
ecell_view = eti->cell_views [eti->editing_col];
- e_cell_event (ecell_view, e, view_to_model_col(eti, eti->editing_col), eti->editing_col, eti->editing_row);
+ return_val = e_cell_event (ecell_view, e,
+ view_to_model_col(eti, eti->editing_col),
+ eti->editing_col, eti->editing_row);
}
}
break;
@@ -1796,7 +1803,9 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e)
if (eti_editing (eti)){
ecell_view = eti->cell_views [eti->editing_col];
- e_cell_event (ecell_view, e, view_to_model_col(eti, eti->editing_col), eti->editing_col, eti->editing_row);
+ return_val = e_cell_event (ecell_view, e,
+ view_to_model_col(eti, eti->editing_col),
+ eti->editing_col, eti->editing_row);
}
break;
}
--
cgit