diff options
| -rw-r--r-- | widgets/e-table/ChangeLog | 5 | ||||
| -rw-r--r-- | widgets/e-table/e-table-item.c | 6 | ||||
| -rw-r--r-- | widgets/table/e-table-item.c | 6 |
3 files changed, 11 insertions, 6 deletions
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog index 3ba522c152..1b1aa42ab4 100644 --- a/widgets/e-table/ChangeLog +++ b/widgets/e-table/ChangeLog @@ -1,5 +1,10 @@ 2000-07-08 Christopher James Lahey <clahey@helixcode.com> + * e-table-item.c (eti_event): Don't call e_cell_event if we're not + editing. + +2000-07-08 Christopher James Lahey <clahey@helixcode.com> + * e-table-item.c (eti_table_model_changed): Commented out some unnecessary and buggy code. diff --git a/widgets/e-table/e-table-item.c b/widgets/e-table/e-table-item.c index 90fd37e168..8e0c07436c 100644 --- a/widgets/e-table/e-table-item.c +++ b/widgets/e-table/e-table-item.c @@ -1273,7 +1273,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) } } - if (eti->cursor_row == view_to_model_row(eti, row) && eti->cursor_col == col){ + if (eti_editing(eti) && eti->cursor_row == view_to_model_row(eti, row) && eti->cursor_col == col){ e_table_item_focus (eti, col, view_to_model_row(eti, row), shifted); @@ -1319,7 +1319,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) if (!find_cell (eti, e->button.x, e->button.y, &col, &row, &x1, &y1)) return TRUE; - if (eti->cursor_row == view_to_model_row(eti, row) && eti->cursor_col == col){ + if (eti_editing(eti) && eti->cursor_row == view_to_model_row(eti, row) && eti->cursor_col == col){ ecol = e_table_header_get_column (eti->header, col); ecell_view = eti->cell_views [col]; @@ -1369,7 +1369,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) if (!find_cell (eti, e->motion.x, e->motion.y, &col, &row, &x1, &y1)) return TRUE; - if (eti->cursor_row == view_to_model_row(eti, row) && eti->cursor_col == col){ + if (eti_editing(eti) && eti->cursor_row == view_to_model_row(eti, row) && eti->cursor_col == col){ ecol = e_table_header_get_column (eti->header, col); ecell_view = eti->cell_views [col]; diff --git a/widgets/table/e-table-item.c b/widgets/table/e-table-item.c index 90fd37e168..8e0c07436c 100644 --- a/widgets/table/e-table-item.c +++ b/widgets/table/e-table-item.c @@ -1273,7 +1273,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) } } - if (eti->cursor_row == view_to_model_row(eti, row) && eti->cursor_col == col){ + if (eti_editing(eti) && eti->cursor_row == view_to_model_row(eti, row) && eti->cursor_col == col){ e_table_item_focus (eti, col, view_to_model_row(eti, row), shifted); @@ -1319,7 +1319,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) if (!find_cell (eti, e->button.x, e->button.y, &col, &row, &x1, &y1)) return TRUE; - if (eti->cursor_row == view_to_model_row(eti, row) && eti->cursor_col == col){ + if (eti_editing(eti) && eti->cursor_row == view_to_model_row(eti, row) && eti->cursor_col == col){ ecol = e_table_header_get_column (eti->header, col); ecell_view = eti->cell_views [col]; @@ -1369,7 +1369,7 @@ eti_event (GnomeCanvasItem *item, GdkEvent *e) if (!find_cell (eti, e->motion.x, e->motion.y, &col, &row, &x1, &y1)) return TRUE; - if (eti->cursor_row == view_to_model_row(eti, row) && eti->cursor_col == col){ + if (eti_editing(eti) && eti->cursor_row == view_to_model_row(eti, row) && eti->cursor_col == col){ ecol = e_table_header_get_column (eti->header, col); ecell_view = eti->cell_views [col]; |