diff options
| author | Christopher James Lahey <clahey@helixcode.com> | 2000-06-14 15:07:37 +0800 |
|---|---|---|
| committer | Chris Lahey <clahey@src.gnome.org> | 2000-06-14 15:07:37 +0800 |
| commit | fabd9d91ab1aee4a091ddcdd6e189bacfcd4a920 (patch) | |
| tree | 5e6aee9da053b96ea5d155b841d3afd2744b0923 | |
| parent | da4535cdc2b93c81060b38ac780757f243c53138 (diff) | |
| download | gsoc2013-evolution-fabd9d91ab1aee4a091ddcdd6e189bacfcd4a920.tar gsoc2013-evolution-fabd9d91ab1aee4a091ddcdd6e189bacfcd4a920.tar.gz gsoc2013-evolution-fabd9d91ab1aee4a091ddcdd6e189bacfcd4a920.tar.bz2 gsoc2013-evolution-fabd9d91ab1aee4a091ddcdd6e189bacfcd4a920.tar.lz gsoc2013-evolution-fabd9d91ab1aee4a091ddcdd6e189bacfcd4a920.tar.xz gsoc2013-evolution-fabd9d91ab1aee4a091ddcdd6e189bacfcd4a920.tar.zst gsoc2013-evolution-fabd9d91ab1aee4a091ddcdd6e189bacfcd4a920.zip | |
Request the value of e_table_is_cell_editable of the model_col instead of
2000-06-14 Christopher James Lahey <clahey@helixcode.com>
* e-cell-text.c: Request the value of e_table_is_cell_editable of
the model_col instead of the view_col.
* e-table-item.h: Slight style fixup.
svn path=/trunk/; revision=3564
| -rw-r--r-- | widgets/e-table/ChangeLog | 7 | ||||
| -rw-r--r-- | widgets/e-table/e-cell-text.c | 4 | ||||
| -rw-r--r-- | widgets/e-table/e-table-item.h | 10 | ||||
| -rw-r--r-- | widgets/table/e-cell-text.c | 4 | ||||
| -rw-r--r-- | widgets/table/e-table-item.h | 10 |
5 files changed, 21 insertions, 14 deletions
diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog index 18016efb8b..91cc91a58b 100644 --- a/widgets/e-table/ChangeLog +++ b/widgets/e-table/ChangeLog @@ -1,3 +1,10 @@ +2000-06-14 Christopher James Lahey <clahey@helixcode.com> + + * e-cell-text.c: Request the value of e_table_is_cell_editable of + the model_col instead of the view_col. + + * e-table-item.h: Slight style fixup. + 2000-06-13 Christopher James Lahey <clahey@helixcode.com> * e-cell-text.c: Clip the contained text. diff --git a/widgets/e-table/e-cell-text.c b/widgets/e-table/e-cell-text.c index 7fe9cc1815..c9260ad545 100644 --- a/widgets/e-table/e-cell-text.c +++ b/widgets/e-table/e-cell-text.c @@ -876,7 +876,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, break; } - if ((!edit_display) && e_table_model_is_cell_editable (ecell_view->e_table_model, view_col, row)) { + if ((!edit_display) && e_table_model_is_cell_editable (ecell_view->e_table_model, model_col, row)) { e_table_item_enter_edit (text_view->cell_view.e_table_item_view, view_col, row); ect_edit_select_all (text_view); edit = text_view->edit; @@ -908,7 +908,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, event->button.x -= 4; event->button.y -= 1; if ((!edit_display) - && e_table_model_is_cell_editable (ecell_view->e_table_model, view_col, row) + && e_table_model_is_cell_editable (ecell_view->e_table_model, model_col, row) && event->type == GDK_BUTTON_RELEASE && event->button.button == 1) { GdkEventButton button = event->button; diff --git a/widgets/e-table/e-table-item.h b/widgets/e-table/e-table-item.h index aa9d703910..7ad5955cdc 100644 --- a/widgets/e-table/e-table-item.h +++ b/widgets/e-table/e-table-item.h @@ -46,11 +46,11 @@ typedef struct { GdkGC *focus_gc; GdkBitmap *stipple; - unsigned int draw_grid:1; - unsigned int draw_focus:1; - unsigned int renderers_can_change_size:1; - unsigned int cell_views_realized:1; - + guint draw_grid:1; + guint draw_focus:1; + guint renderers_can_change_size:1; + guint cell_views_realized:1; + guint needs_redraw : 1; guint needs_compute_height : 1; guint needs_compute_width : 1; diff --git a/widgets/table/e-cell-text.c b/widgets/table/e-cell-text.c index 7fe9cc1815..c9260ad545 100644 --- a/widgets/table/e-cell-text.c +++ b/widgets/table/e-cell-text.c @@ -876,7 +876,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, break; } - if ((!edit_display) && e_table_model_is_cell_editable (ecell_view->e_table_model, view_col, row)) { + if ((!edit_display) && e_table_model_is_cell_editable (ecell_view->e_table_model, model_col, row)) { e_table_item_enter_edit (text_view->cell_view.e_table_item_view, view_col, row); ect_edit_select_all (text_view); edit = text_view->edit; @@ -908,7 +908,7 @@ ect_event (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, event->button.x -= 4; event->button.y -= 1; if ((!edit_display) - && e_table_model_is_cell_editable (ecell_view->e_table_model, view_col, row) + && e_table_model_is_cell_editable (ecell_view->e_table_model, model_col, row) && event->type == GDK_BUTTON_RELEASE && event->button.button == 1) { GdkEventButton button = event->button; diff --git a/widgets/table/e-table-item.h b/widgets/table/e-table-item.h index aa9d703910..7ad5955cdc 100644 --- a/widgets/table/e-table-item.h +++ b/widgets/table/e-table-item.h @@ -46,11 +46,11 @@ typedef struct { GdkGC *focus_gc; GdkBitmap *stipple; - unsigned int draw_grid:1; - unsigned int draw_focus:1; - unsigned int renderers_can_change_size:1; - unsigned int cell_views_realized:1; - + guint draw_grid:1; + guint draw_focus:1; + guint renderers_can_change_size:1; + guint cell_views_realized:1; + guint needs_redraw : 1; guint needs_compute_height : 1; guint needs_compute_width : 1; |