Added duplicate_value and add_value. Use the new compare functions. Made

2000-02-24  Christopher James Lahey  <clahey@helixcode.com>

        * 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

1 files changed, 13 insertions, 5 deletions

diff --git a/widgets/e-table/e-table-group-leaf.c b/widgets/e-table/e-table-group-leaf.c
index ba73ad9886..2e939453d7 100644
--- a/widgets/e-table/e-table-group-leaf.c
+++ b/widgets/e-table/e-table-group-leaf.c
@@ -36,23 +36,31 @@ static void etgl_get_arg (GtkObject *object, GtkArg *arg, guint arg_id);
 static void
 etgl_destroy (GtkObject *object)
 {
-	GTK_OBJECT_CLASS (etgl_parent_class)->destroy (object);
+	ETableGroupLeaf *etgl = E_TABLE_GROUP_LEAF(object);
+	gtk_object_unref(GTK_OBJECT(etgl->subset));
+	gtk_object_destroy(GTK_OBJECT(etgl->item));
+	if ( GTK_OBJECT_CLASS (etgl_parent_class)->destroy )
+		GTK_OBJECT_CLASS (etgl_parent_class)->destroy (object);
 }
 
 static void
 e_table_group_leaf_construct (GnomeCanvasGroup *parent, ETableGroupLeaf *etgl,
 			      ETableHeader *full_header,
 			      ETableHeader     *header,
-			      ETableModel *model)
+			      ETableModel *model,
+			      int          col,
+			      int          ascending)
 {
+	etgl->subset = E_TABLE_SUBSET_VARIABLE(e_table_sorted_variable_new(model, col, ascending, e_table_header_get_column(full_header, col)->compare));
 	e_table_group_construct (parent, E_TABLE_GROUP (etgl), full_header, header, model);
-	etgl->subset = E_TABLE_SUBSET_VARIABLE(e_table_subset_variable_new(model));
 }
 
 ETableGroup *
 e_table_group_leaf_new       (GnomeCanvasGroup *parent, ETableHeader *full_header,
 			      ETableHeader     *header,
-			      ETableModel *model)
+			      ETableModel *model,
+			      int          col,
+			      int          ascending)
 {
 	ETableGroupLeaf *etgl;
 
@@ -61,7 +69,7 @@ e_table_group_leaf_new       (GnomeCanvasGroup *parent, ETableHeader *full_heade
 	etgl = gtk_type_new (e_table_group_leaf_get_type ());
 
 	e_table_group_leaf_construct (parent, etgl, full_header,
-				      header, model);
+				      header, model, col, ascending);
 	return E_TABLE_GROUP (etgl);
 }