Added util/e-sorter-array.lo and widgets/e-reflow-model.lo. Removed

2001-05-07  Christopher James Lahey  <clahey@ximian.com>

	* gal/Makefile.am (libgal_la_LIBADD): Added util/e-sorter-array.lo
	and widgets/e-reflow-model.lo.  Removed
	widgets/e-reflow-sorted.lo.

	* gal/util/Makefile.am (libutil_la_SOURCES): Added
	e-sorter-array.c.
	(libgalinclude_HEADERS): Added e-sorter-array.h.

	* gal/util/e-sorter-array.c, gal/util/e-sorter-array.h: A sorter
	for use with a single compare function to do sorting.

	* gal/util/e-util.c, gal/util/e-util.h
	(e_marshal_INT__OBJECT_POINTER): Added this marshaller.

	* gal/widgets/Makefile.am (libwidgets_la_SOURCES): Added
	e-reflow-model.c.  Removed e-reflow-sorted.c.
	(libwidgetsinclude_HEADERS): Added e-reflow-sorted.h.  Removed
	e-reflow-model.h.

	* gal/widgets/e-reflow-model.c, gal/widgets/e-reflow-model.h:
	Model for EReflow.  Has a number of items and generates canvas
	items on the fly.

	* gal/widgets/e-reflow.c, gal/widgets/e-reflow.h: Major rewrite.
	This now uses a model to generate its canvas items instead of
	having canvas items added to it.  It doesn't create the canvas
	items now until they will be shown on screen.

svn path=/trunk/; revision=9710

1 files changed, 83 insertions, 0 deletions

diff --git a/widgets/misc/e-reflow-model.h b/widgets/misc/e-reflow-model.h
new file mode 100644
index 0000000000..db26335a35
--- /dev/null
+++ b/widgets/misc/e-reflow-model.h
@@ -0,0 +1,83 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+#ifndef _E_REFLOW_MODEL_H_
+#define _E_REFLOW_MODEL_H_
+
+#include <gtk/gtkobject.h>
+#include <libgnomeui/gnome-canvas.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif /* __cplusplus */
+
+#define E_REFLOW_MODEL_TYPE        (e_reflow_model_get_type ())
+#define E_REFLOW_MODEL(o)          (GTK_CHECK_CAST ((o), E_REFLOW_MODEL_TYPE, EReflowModel))
+#define E_REFLOW_MODEL_CLASS(k)    (GTK_CHECK_CLASS_CAST((k), E_REFLOW_MODEL_TYPE, EReflowModelClass))
+#define E_IS_REFLOW_MODEL(o)       (GTK_CHECK_TYPE ((o), E_REFLOW_MODEL_TYPE))
+#define E_IS_REFLOW_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_REFLOW_MODEL_TYPE))
+
+typedef struct {
+	GtkObject   base;
+} EReflowModel;
+
+typedef struct {
+	GtkObjectClass parent_class;
+
+	/*
+	 * Virtual methods
+	 */
+	void             (*set_width)      (EReflowModel *etm, int width);
+
+	int              (*count)          (EReflowModel *etm);
+	int              (*height)         (EReflowModel *etm, int n, GnomeCanvasGroup *parent);
+	GnomeCanvasItem *(*incarnate)      (EReflowModel *etm, int n, GnomeCanvasGroup *parent);
+	int              (*compare)        (EReflowModel *etm, int n1, int n2);
+	void             (*reincarnate)    (EReflowModel *etm, int n, GnomeCanvasItem *item);
+	
+	/*
+	 * Signals
+	 */
+
+	/*
+	 * These all come after the change has been made.
+	 * Major structural changes: model_changed
+	 * Changes only in an item: item_changed
+	 */
+	void        (*model_changed)       (EReflowModel *etm);
+	void        (*model_items_inserted) (EReflowModel *etm, int position, int count);
+	void        (*model_item_changed)  (EReflowModel *etm, int n);
+} EReflowModelClass;
+
+GtkType          e_reflow_model_get_type        (void);
+
+/**/
+void             e_reflow_model_set_width       (EReflowModel     *e_reflow_model,
+						 int               width);
+int              e_reflow_model_count           (EReflowModel     *e_reflow_model);
+int              e_reflow_model_height          (EReflowModel     *e_reflow_model,
+						 int               n,
+						 GnomeCanvasGroup *parent);
+GnomeCanvasItem *e_reflow_model_incarnate       (EReflowModel     *e_reflow_model,
+						 int               n,
+						 GnomeCanvasGroup *parent);
+int              e_reflow_model_compare         (EReflowModel     *e_reflow_model,
+						 int               n1,
+						 int               n2);
+void             e_reflow_model_reincarnate     (EReflowModel     *e_reflow_model,
+						 int               n,
+						 GnomeCanvasItem  *item);
+
+/*
+ * Routines for emitting signals on the e_reflow
+ */
+void             e_reflow_model_changed         (EReflowModel     *e_reflow_model);
+void             e_reflow_model_items_inserted  (EReflowModel     *e_reflow_model,
+						 int               position,
+						 int               count);
+void             e_reflow_model_item_changed    (EReflowModel     *e_reflow_model,
+						 int               n);
+
+#ifdef __cplusplus
+}
+#endif /* __cplusplus */
+
+#endif /* _E_REFLOW_MODEL_H_ */