Added e-cell-date.c, e-cell-date.h, e-cell-size.c, and e-cell-size.h.

2001-01-15  Christopher James Lahey  <clahey@ximian.com>

	* Makefile.am: Added e-cell-date.c, e-cell-date.h, e-cell-size.c,
	and e-cell-size.h.

	* e-cell-date.c, e-cell-date.h: New cell to implement displaying a
	date.

	* e-cell-size.c, e-cell-size.h: New cell to implement displaying a
	file size.

	* e-cell-text.c, e-cell-text.h: Got rid of the filter arguments.
	Replaced them with the ability to subclass ECellText and override
	the get_text method.  Added free_text to override if your get_text
	implementation returns allocated memory.

	* e-table-extras.c (ete_init): Added "size" and "date" cells to
	the default ETableExtras.

svn path=/trunk/; revision=7523

1 files changed, 4 insertions, 6 deletions

diff --git a/widgets/table/e-cell-text.h b/widgets/table/e-cell-text.h
index 9392e7afe3..706be9150d 100644
--- a/widgets/table/e-cell-text.h
+++ b/widgets/table/e-cell-text.h
@@ -27,9 +27,6 @@
 #include <libgnomeui/gnome-canvas.h>
 #include <gal/e-table/e-cell.h>
 
-/* Should return a malloced object. */
-typedef char *(*ECellTextFilter) (void *reserved, const void *data, gpointer closure);
-
 #define E_CELL_TEXT_TYPE        (e_cell_text_get_type ())
 #define E_CELL_TEXT(o)          (GTK_CHECK_CAST ((o), E_CELL_TEXT_TYPE, ECellText))
 #define E_CELL_TEXT_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_CELL_TEXT_TYPE, ECellTextClass))
@@ -59,19 +56,20 @@ typedef struct {
 	   See the XParseColor man page for the formats available. */
 	int color_column;
 
-	ECellTextFilter filter_func;
-	gpointer filter_closure;
-
 	/* This stores the colors we have allocated. */
 	GHashTable *colors;
 } ECellText;
 
 typedef struct {
 	ECellClass parent_class;
+
+	char *(*get_text)  (ECellText *cell, ETableModel *model, int col, int row);
+	void  (*free_text) (ECellText *cell, char *text);
 } ECellTextClass;
 
 GtkType    e_cell_text_get_type (void);
 ECell     *e_cell_text_new      (const char *fontname, GtkJustification justify);
+ECell     *e_cell_text_construct(ECellText *cell, const char *fontname, GtkJustification justify);
 
 #endif /* _E_CELL_TEXT_H_ */