Changed e_table_selection_model_clear to e_selection_model_clear.

2001-02-27  Christopher James Lahey  <clahey@ximian.com>

	* gal/e-text/e-completion-view.c: Changed
	e_table_selection_model_clear to e_selection_model_clear.

	* tests/test-tree-3.c: Changed E_TABLE_CURSOR_LINE to
	E_CURSOR_LINE.

From gal/e-table/ChangeLog:

2001-02-27  Christopher James Lahey  <clahey@ximian.com>

	* e-table-click-to-add.c, e-table-group-container.c,
	e-table-group-container.h, e-table-group-leaf.c,
	e-table-group-leaf.h, e-table-item.c, e-table-item.h,
	e-table-specification.c, e-table-specification.h, e-table.c,
	e-table.h: Changed a lot of the ETableSelectionModels to
	ESelectionModels, a lot of the ETableSorters to ESorters, all the
	ETableCursorModes to ECursorModes, and all of the
	ETableForeachFuncs into EForeachFuncs.

	* e-table-defines.h: Moved ETableForeachFunc and ETableCursorMode
	to e-selection-model.h.

	* e-table-selection-model.c, e-table-selection-model.h: Made this
	a subclass of ESelectionModel which simple connects to an
	ETableModel.

	* e-table-sorter.c, e-table-sorter.h: Made this a subclass of
	ESorter so that implements the same semantics it used to.

svn path=/trunk/; revision=8422

1 files changed, 3 insertions, 44 deletions

diff --git a/widgets/table/e-table-selection-model.h b/widgets/table/e-table-selection-model.h
index 2bfa5c6e7d..42333b2493 100644
--- a/widgets/table/e-table-selection-model.h
+++ b/widgets/table/e-table-selection-model.h
@@ -3,6 +3,7 @@
 #define _E_TABLE_SELECTION_MODEL_H_
 
 #include <gtk/gtkobject.h>
+#include <gal/widgets/e-selection-model.h>
 #include <gal/e-table/e-table-model.h>
 #include <gal/e-table/e-table-defines.h>
 #include <gal/e-table/e-table-sorter.h>
@@ -18,17 +19,9 @@ extern "C" {
 #define E_IS_TABLE_SELECTION_MODEL_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_SELECTION_MODEL_TYPE))
 
 typedef struct {
-	GtkObject     base;
+	ESelectionModel base;
 
 	ETableModel  *model;
-	ETableSorter *sorter;
-
-	gint row_count;
-        guint32 *selection;
-
-	gint cursor_row;
-	gint cursor_col;
-	gint selection_start_row;
 
 	guint model_changed_id;
 	guint model_row_inserted_id, model_row_deleted_id;
@@ -36,47 +29,13 @@ typedef struct {
 	guint frozen : 1;
 	guint selection_model_changed : 1;
 	guint group_info_changed : 1;
-
-	GtkSelectionMode mode;
-	ETableCursorMode cursor_mode;
 } ETableSelectionModel;
 
 typedef struct {
-	GtkObjectClass parent_class;
-
-	/*
-	 * Signals
-	 */
-
-	void         (*cursor_changed)    (ETableSelectionModel *selection, int row, int col);
-	void         (*cursor_activated)  (ETableSelectionModel *selection, int row, int col);
-	void         (*selection_changed) (ETableSelectionModel *selection);
-
+	ESelectionModelClass parent_class;
 } ETableSelectionModelClass;
 
 GtkType               e_table_selection_model_get_type            (void);
-gboolean              e_table_selection_model_is_row_selected     (ETableSelectionModel *selection,
-								   gint                  n);
-void                  e_table_selection_model_foreach             (ETableSelectionModel *selection,
-								   ETableForeachFunc     callback,
-								   gpointer              closure);
-
-void                  e_table_selection_model_do_something        (ETableSelectionModel *selection,
-								   guint                 row,
-								   guint                 col,
-								   GdkModifierType       state);
-void                  e_table_selection_model_maybe_do_something  (ETableSelectionModel *selection,
-								   guint                 row,
-								   guint                 col,
-								   GdkModifierType       state);
-gint                  e_table_selection_model_key_press           (ETableSelectionModel *selection,
-								   GdkEventKey          *key);
-void                  e_table_selection_model_clear               (ETableSelectionModel *selection);
-gint                  e_table_selection_model_selected_count      (ETableSelectionModel *selection);
-
-void                  e_table_selection_model_select_all          (ETableSelectionModel *selection);
-void                  e_table_selection_model_invert_selection    (ETableSelectionModel *selection);
-
 ETableSelectionModel *e_table_selection_model_new                 (void);
 
 #ifdef __cplusplus