fix this routine.

1999-12-09  Miguel de Icaza  <miguel@gnu.org>

	* e-table-header.c (e_table_header_col_diff): fix this routine.

1999-12-04  Miguel de Icaza  <miguel@gnu.org>

	* e-table-header-item.c (ethi_event): Started drag and drop
	support.

	* e-table-item.c (eti_table_model_changed): The columns are
	controled by the Header, not by the TableModel.

	* e-table-header-item.c (ethi_draw): Fixed redraw logic to support
	arbitrary header positioning.

	* e-cell.h: Revamped e-cell interface.  We now provide the model
	column and the view column to all methods (so that the methods can
	talk to the view and to the model at the same time).

	* e-table-item.c: Update to new API
	* e-cell-test.c: Update to new API

1999-12-03  Miguel de Icaza  <miguel@gnu.org>

	* e-cell.c (e_cell_class_init): Provide emtpy methods for
	enter_edit, and leave_edit.

	* e-table-item.c: Killed draw cell.
	(eti_draw): Perform column mapping here.
	(e_table_item_leave_edit): ditto.
	(e_table_item_enter_edit): ditto.
	(eti_event): ditto.

svn path=/trunk/; revision=1478

1 files changed, 15 insertions, 12 deletions

diff --git a/widgets/e-table/e-cell.h b/widgets/e-table/e-cell.h
index b0f62d020c..f72f97e8dd 100644
--- a/widgets/e-table/e-cell.h
+++ b/widgets/e-table/e-cell.h
@@ -32,28 +32,31 @@ typedef struct {
 	ECellView *(*realize)   (ECell *ecell, void *view);
 	void       (*unrealize) (ECellView *e_cell_view);
 	void   	   (*draw)      (ECellView *ecell_view, GdkDrawable *drawable,
-	       			 int col, int row, gboolean selected, int x1, int y1, int x2, int y2);
-	gint   	   (*event)     (ECellView *ecell_view, GdkEvent *event, int col, int row);
-	void   	   (*focus)     (ECellView *ecell_view, int col, int row, int x1, int y1, int x2, int y2);
+	       			 int model_col, int view_col, int row,
+				 gboolean selected, int x1, int y1, int x2, int y2);
+	gint   	   (*event)     (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row);
+	void   	   (*focus)     (ECellView *ecell_view, int model_col, int view_col,
+				 int row, int x1, int y1, int x2, int y2);
 	void   	   (*unfocus)   (ECellView *ecell_view);
-	int        (*height)    (ECellView *ecell_view, int col, int row);
+	int        (*height)    (ECellView *ecell_view, int model_col, int view_col, int row);
 
-	void      *(*enter_edit)(ECellView *ecell_view, int col, int row);
-	void       (*leave_edit)(ECellView *ecell_view, int col, int row, void *context);
+	void      *(*enter_edit)(ECellView *ecell_view, int model_col, int view_col, int row);
+	void       (*leave_edit)(ECellView *ecell_view, int model_col, int view_col, int row, void *context);
 } ECellClass;
 
 GtkType    e_cell_get_type  (void);
-void       e_cell_event     (ECellView *ecell_view, GdkEvent *event, int col, int row);
+void       e_cell_event     (ECellView *ecell_view, GdkEvent *event, int model_col, int view_col, int row);
 ECellView *e_cell_realize   (ECell *ecell, void *view);
 void       e_cell_unrealize (ECellView *ecell_view);
 void       e_cell_draw      (ECellView *ecell_view, GdkDrawable *dr, 
-			     int col, int row, gboolean selected,
+			     int model_col, int view_col, int row, gboolean selected,
+			     int x1, int y1, int x2, int y2);
+void       e_cell_focus     (ECellView *ecell_view, int model_col, int view_col, int row,
 			     int x1, int y1, int x2, int y2);
-void       e_cell_focus     (ECellView *ecell_view, int col, int row, int x1, int y1, int x2, int y2);
 void       e_cell_unfocus   (ECellView *ecell_view);
-int        e_cell_height    (ECellView *ecell_view, int col, int row);
+int        e_cell_height    (ECellView *ecell_view, int model_col, int view_col, int row);
 
-void      *e_cell_enter_edit(ECellView *ecell_view, int col, int row);
-void       e_cell_leave_edit(ECellView *ecell_view, int col, int row, void *edit_context);
+void      *e_cell_enter_edit(ECellView *ecell_view, int model_col, int view_col, int row);
+void       e_cell_leave_edit(ECellView *ecell_view, int model_col, int view_col, int row, void *edit_context);
 
 #endif /* _E_CELL_H_ */