From 14bfde56c8c54c7ad947dcf96be38f8b4e71e53e Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Fri, 25 Feb 2000 04:08:59 +0000 Subject: Added duplicate_value and add_value. Use the new compare functions. Made 2000-02-24 Christopher James Lahey * test-table.c: Added duplicate_value and add_value. Use the new compare functions. Made it so we only create one model to better test model view stuff. Changed the test to not have as many extra, useless, columns. * test-cols.c, test-check.c: Added duplicate_value and add_value. Use the new compare functions. * e-table.c, e-table.h: Use all the new features of e-table-groups (sorting and grouping). Handle on the fly reorganization of groups in an idle loop. Compare functions now are to return -1 if the first item is greater, 0 if they are equal, or 1 if the second item is greater. * e-table-subset.c, e-table-subset.h: Made e-table-subset disconnect properly from its signals when it dies. * e-table-subset-variable.c, e-table-subset-variable.h: Virtualized the add and remove commands so that e_table_sorted_variable could override the add command to do sorting. * e-table-sorted.c: Fixed this to inherit properly from ETableSubset. * e-table-simple.h, e-table-simple.c: Added handling of duplicate_value and free_value; * e-table-model.c, e-table-model.h: Added duplicate_value and free_value for memory allocation of table elements outside the table. * e-table-item.c: Fixed a crashing bug. * e-table-group.c: Added sorting. Fixed destruction to delete the right things. * e-table-group-leaf.c, e-table-group-leaf.h: Pass column and sort order information into the e_table_sorted_variable. Properly destroy things when deleted. * e-table-group-container.c, e-table-group-container.h: Properly handle the list of subgroups. Handle proper sorting and grouping of subgroups. * e-table-sorted-variable.c, e-table-sorted-variable.h: Files to do a sorted model that stays sorted as you add and remove rows. * Makefile.am: Added e-table-sorted-variable.c and e-table-sorted-variable.h. svn path=/trunk/; revision=1930 --- widgets/e-table/e-table-simple.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'widgets/e-table/e-table-simple.c') diff --git a/widgets/e-table/e-table-simple.c b/widgets/e-table/e-table-simple.c index 1f64d08f39..e90abfcc4f 100644 --- a/widgets/e-table/e-table-simple.c +++ b/widgets/e-table/e-table-simple.c @@ -55,6 +55,22 @@ simple_is_cell_editable (ETableModel *etm, int col, int row) return simple->is_cell_editable (etm, col, row, simple->data); } +static void * +simple_duplicate_value (ETableModel *etm, int col, const void *value) +{ + ETableSimple *simple = (ETableSimple *)etm; + + return simple->duplicate_value (etm, col, value, simple->data); +} + +static void +simple_free_value (ETableModel *etm, int col, void *value) +{ + ETableSimple *simple = (ETableSimple *)etm; + + simple->free_value (etm, col, value, simple->data); +} + static void simple_thaw (ETableModel *etm) { @@ -73,6 +89,8 @@ e_table_simple_class_init (GtkObjectClass *object_class) model_class->value_at = simple_value_at; model_class->set_value_at = simple_set_value_at; model_class->is_cell_editable = simple_is_cell_editable; + model_class->duplicate_value = simple_duplicate_value; + model_class->free_value = simple_free_value; model_class->thaw = simple_thaw; } @@ -105,6 +123,8 @@ e_table_simple_new (ETableSimpleColumnCountFn col_count, ETableSimpleValueAtFn value_at, ETableSimpleSetValueAtFn set_value_at, ETableSimpleIsCellEditableFn is_cell_editable, + ETableSimpleDuplicateValueFn duplicate_value, + ETableSimpleFreeValueFn free_value, ETableSimpleThawFn thaw, void *data) { @@ -118,6 +138,8 @@ e_table_simple_new (ETableSimpleColumnCountFn col_count, et->set_value_at = set_value_at; et->is_cell_editable = is_cell_editable; et->thaw = thaw; + et->duplicate_value = duplicate_value; + et->free_value = free_value; et->data = data; return (ETableModel *) et; -- cgit v1.2.3