Merging changes:

2001-12-04  Christopher James Lahey  <clahey@ximian.com>

	* configure.in (GAL_CURRENT): Bumped version number to 0.18.99.0
	and CURRENT to 19.

2001-11-21  Christopher James Lahey  <clahey@ximian.com>

	* gal/widgets/e-reflow.c, gal/widgets/e-reflow.h: Handle
	selection_row_changed signal.

	* gal/widgets/e-selection-model-array.c,
	gal/widgets/e-selection-model-array.h: Properly send
	selection_row_changed signals if changing from a single row
	selected to a single other row selected or if moving the
	selection_end by a single row.

	* gal/widgets/e-selection-model.c,
	gal/widgets/e-selection-model.h: Added selection_row_changed
	signal.
	(e_selection_model_select_as_key_press): Fixed the case statement
	here to make MULTIPLE and EXTENDED the same as BROWSE instead of
	as SINGLE.

From gal/e-table/ChangeLog:

2001-11-21  Christopher James Lahey  <clahey@ximian.com>

	* e-table-item.c, e-table-item.h: Handle selection_row_changed
	signal.  Keep track of the old cursor row so that we only redraw
	two rows when the cursor changes.

	* e-table.c, e-tree.c: Handle selection_row_changed signal.

	* e-tree-selection-model.c: Properly send selection_row_changed
	signals if changing from a single row selected to a single other
	row selected or if moving the selection_end by a single row.

svn path=/trunk/; revision=14870

1 files changed, 76 insertions, 71 deletions

diff --git a/widgets/misc/e-selection-model.h b/widgets/misc/e-selection-model.h
index 611add91c9..fde97a0035 100644
--- a/widgets/misc/e-selection-model.h
+++ b/widgets/misc/e-selection-model.h
@@ -66,94 +66,99 @@ typedef struct {
 	GtkObjectClass parent_class;
 
 	/* Virtual methods */
-	gboolean (*is_row_selected)     (ESelectionModel *esm, int row);
-	void     (*foreach)             (ESelectionModel *esm, EForeachFunc callback, gpointer closure);
-	void     (*clear)               (ESelectionModel *esm);
-	gint     (*selected_count)      (ESelectionModel *esm);
-	void     (*select_all)          (ESelectionModel *esm);
-	void     (*invert_selection)    (ESelectionModel *esm);
-	int      (*row_count)           (ESelectionModel *esm);
+	gboolean (*is_row_selected)       (ESelectionModel *esm, int row);
+	void     (*foreach)               (ESelectionModel *esm, EForeachFunc callback, gpointer closure);
+	void     (*clear)                 (ESelectionModel *esm);
+	gint     (*selected_count)        (ESelectionModel *esm);
+	void     (*select_all)            (ESelectionModel *esm);
+	void     (*invert_selection)      (ESelectionModel *esm);
+	int      (*row_count)             (ESelectionModel *esm);
 
 	/* Protected virtual methods. */
-	void     (*change_one_row)      (ESelectionModel *esm, int row, gboolean on);
-	void     (*change_cursor)       (ESelectionModel *esm, int row, int col);
-	int      (*cursor_row)          (ESelectionModel *esm);
-	int      (*cursor_col)          (ESelectionModel *esm);
+	void     (*change_one_row)        (ESelectionModel *esm, int row, gboolean on);
+	void     (*change_cursor)         (ESelectionModel *esm, int row, int col);
+	int      (*cursor_row)            (ESelectionModel *esm);
+	int      (*cursor_col)            (ESelectionModel *esm);
 
-	void     (*select_single_row)   (ESelectionModel *selection, int row);
-	void     (*toggle_single_row)   (ESelectionModel *selection, int row);
-	void     (*move_selection_end)  (ESelectionModel *selection, int row);
-	void     (*set_selection_end)   (ESelectionModel *selection, int row);
+	void     (*select_single_row)     (ESelectionModel *selection, int row);
+	void     (*toggle_single_row)     (ESelectionModel *selection, int row);
+	void     (*move_selection_end)    (ESelectionModel *selection, int row);
+	void     (*set_selection_end)     (ESelectionModel *selection, int row);
 
 	/*
 	 * Signals
 	 */
 
-	void     (*cursor_changed)      (ESelectionModel *esm, int row, int col);
-	void     (*cursor_activated)    (ESelectionModel *esm, int row, int col);
-	void     (*selection_changed)   (ESelectionModel *esm);
+	void     (*cursor_changed)        (ESelectionModel *esm, int row, int col);
+	void     (*cursor_activated)      (ESelectionModel *esm, int row, int col);
+	void     (*selection_row_changed) (ESelectionModel *esm, int row);
+	void     (*selection_changed)     (ESelectionModel *esm);
 
 } ESelectionModelClass;
-GtkType   e_selection_model_get_type             (void);
-void      e_selection_model_do_something         (ESelectionModel *esm,
-						  guint            row,
-						  guint            col,
-						  GdkModifierType  state);
-gboolean  e_selection_model_maybe_do_something   (ESelectionModel *esm,
-						  guint            row,
-						  guint            col,
-						  GdkModifierType  state);
-void      e_selection_model_right_click_down     (ESelectionModel *selection,
-						  guint            row,
-						  guint            col,
-						  GdkModifierType  state);
-void      e_selection_model_right_click_up       (ESelectionModel *selection);
-gint      e_selection_model_key_press            (ESelectionModel *esm,
-						  GdkEventKey     *key);
-void      e_selection_model_select_as_key_press  (ESelectionModel *esm,
-						  guint            row,
-						  guint            col,
-						  GdkModifierType  state);
+
+
+GtkType   e_selection_model_get_type               (void);
+void      e_selection_model_do_something           (ESelectionModel *esm,
+						    guint            row,
+						    guint            col,
+						    GdkModifierType  state);
+gboolean  e_selection_model_maybe_do_something     (ESelectionModel *esm,
+						    guint            row,
+						    guint            col,
+						    GdkModifierType  state);
+void      e_selection_model_right_click_down       (ESelectionModel *selection,
+						    guint            row,
+						    guint            col,
+						    GdkModifierType  state);
+void      e_selection_model_right_click_up         (ESelectionModel *selection);
+gint      e_selection_model_key_press              (ESelectionModel *esm,
+						    GdkEventKey     *key);
+void      e_selection_model_select_as_key_press    (ESelectionModel *esm,
+						    guint            row,
+						    guint            col,
+						    GdkModifierType  state);
 
 /* Virtual functions */
-gboolean  e_selection_model_is_row_selected      (ESelectionModel *esm,
-						  gint             n);
-void      e_selection_model_foreach              (ESelectionModel *esm,
-						  EForeachFunc     callback,
-						  gpointer         closure);
-void      e_selection_model_clear                (ESelectionModel *esm);
-gint      e_selection_model_selected_count       (ESelectionModel *esm);
-void      e_selection_model_select_all           (ESelectionModel *esm);
-void      e_selection_model_invert_selection     (ESelectionModel *esm);
-int       e_selection_model_row_count            (ESelectionModel *esm);
+gboolean  e_selection_model_is_row_selected        (ESelectionModel *esm,
+						    gint             n);
+void      e_selection_model_foreach                (ESelectionModel *esm,
+						    EForeachFunc     callback,
+						    gpointer         closure);
+void      e_selection_model_clear                  (ESelectionModel *esm);
+gint      e_selection_model_selected_count         (ESelectionModel *esm);
+void      e_selection_model_select_all             (ESelectionModel *esm);
+void      e_selection_model_invert_selection       (ESelectionModel *esm);
+int       e_selection_model_row_count              (ESelectionModel *esm);
 
 
 /* Private virtual Functions */
-void      e_selection_model_change_one_row       (ESelectionModel *esm,
-						  int              row,
-						  gboolean         on);
-void      e_selection_model_change_cursor        (ESelectionModel *esm,
-						  int              row,
-						  int              col);
-int       e_selection_model_cursor_row           (ESelectionModel *esm);
-int       e_selection_model_cursor_col           (ESelectionModel *esm);
-void      e_selection_model_select_single_row    (ESelectionModel *selection,
-						  int              row);
-void      e_selection_model_toggle_single_row    (ESelectionModel *selection,
-						  int              row);
-void      e_selection_model_move_selection_end   (ESelectionModel *selection,
-						  int              row);
-void      e_selection_model_set_selection_end    (ESelectionModel *selection,
-						  int              row);
+void      e_selection_model_change_one_row         (ESelectionModel *esm,
+						    int              row,
+						    gboolean         on);
+void      e_selection_model_change_cursor          (ESelectionModel *esm,
+						    int              row,
+						    int              col);
+int       e_selection_model_cursor_row             (ESelectionModel *esm);
+int       e_selection_model_cursor_col             (ESelectionModel *esm);
+void      e_selection_model_select_single_row      (ESelectionModel *selection,
+						    int              row);
+void      e_selection_model_toggle_single_row      (ESelectionModel *selection,
+						    int              row);
+void      e_selection_model_move_selection_end     (ESelectionModel *selection,
+						    int              row);
+void      e_selection_model_set_selection_end      (ESelectionModel *selection,
+						    int              row);
 
 /* Signals */
-void      e_selection_model_cursor_changed       (ESelectionModel *selection,
-						  int              row,
-						  int              col);
-void      e_selection_model_cursor_activated     (ESelectionModel *selection,
-						  int              row,
-						  int              col);
-void      e_selection_model_selection_changed    (ESelectionModel *selection);
+void      e_selection_model_cursor_changed         (ESelectionModel *selection,
+						    int              row,
+						    int              col);
+void      e_selection_model_cursor_activated       (ESelectionModel *selection,
+						    int              row,
+						    int              col);
+void      e_selection_model_selection_row_changed  (ESelectionModel *selection,
+						    int              row);
+void      e_selection_model_selection_changed      (ESelectionModel *selection);
 
 #ifdef __cplusplus
 }