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, 47 insertions, 19 deletions

diff --git a/widgets/table/e-table-model.c b/widgets/table/e-table-model.c
index e84e6da4d3..ef14b98018 100644
--- a/widgets/table/e-table-model.c
+++ b/widgets/table/e-table-model.c
@@ -13,6 +13,9 @@
 
 #define ETM_CLASS(e) ((ETableModelClass *)((GtkObject *)e)->klass)
 
+#define PARENT_TYPE gtk_object_get_type();
+					  
+
 static GtkObjectClass *e_table_model_parent_class;
 
 enum {
@@ -80,6 +83,28 @@ e_table_model_is_cell_editable (ETableModel *e_table_model, int col, int row)
 	return ETM_CLASS (e_table_model)->is_cell_editable (e_table_model, col, row);
 }
 
+void *
+e_table_model_duplicate_value (ETableModel *e_table_model, int col, const void *value)
+{
+	g_return_val_if_fail (e_table_model != NULL, NULL);
+	g_return_val_if_fail (E_IS_TABLE_MODEL (e_table_model), NULL);
+
+	if (ETM_CLASS (e_table_model)->duplicate_value)
+		return ETM_CLASS (e_table_model)->duplicate_value (e_table_model, col, value);
+	else
+		return NULL;
+}
+
+void
+e_table_model_free_value (ETableModel *e_table_model, int col, void *value)
+{
+	g_return_if_fail (e_table_model != NULL);
+	g_return_if_fail (E_IS_TABLE_MODEL (e_table_model));
+
+	if (ETM_CLASS (e_table_model)->free_value)
+		ETM_CLASS (e_table_model)->free_value (e_table_model, col, value);
+}
+
 static void
 e_table_model_destroy (GtkObject *object)
 {
@@ -121,27 +146,30 @@ e_table_model_class_init (GtkObjectClass *object_class)
 	gtk_object_class_add_signals (object_class, e_table_model_signals, LAST_SIGNAL);
 }
 
-GtkType
+
+guint
 e_table_model_get_type (void)
 {
-	static GtkType type = 0;
-
-	if (!type){
-		GtkTypeInfo info = {
-			"ETableModel",
-			sizeof (ETableModel),
-			sizeof (ETableModelClass),
-			(GtkClassInitFunc) e_table_model_class_init,
-			(GtkObjectInitFunc) NULL,
-			NULL, /* reserved 1 */
-			NULL, /* reserved 2 */
-			(GtkClassInitFunc) NULL
-		};
-
-		type = gtk_type_unique (gtk_object_get_type (), &info);
-	}
-
-	return type;
+  static guint type = 0;
+
+  if (!type)
+    {
+      GtkTypeInfo info =
+      {
+	"ETableModle",
+	sizeof (ETableModel),
+	sizeof (ETableModelClass),
+	(GtkClassInitFunc) e_table_model_class_init,
+	NULL,
+	/* reserved_1 */ NULL,
+        /* reserved_2 */ NULL,
+        (GtkClassInitFunc) NULL,
+      };
+
+      type = gtk_type_unique (gtk_object_get_type(), &info);
+    }
+
+  return type;
 }
 
 void