More table work

svn path=/trunk/; revision=1383

1 files changed, 17 insertions, 37 deletions

diff --git a/widgets/table/e-table-header.h b/widgets/table/e-table-header.h
index d8e04ea8fd..89eced0158 100644
--- a/widgets/table/e-table-header.h
+++ b/widgets/table/e-table-header.h
@@ -6,27 +6,6 @@
 #include "e-table-col.h"
 
 typedef struct _ETableHeader ETableHeader;
-typedef struct _ETableCol ETableCol;
-
-/*
- * Rendering function for the column header
- */
-typedef void (*ETableColRenderFn)(
-	ETableCol *etc, void *gnome_canvas_item, void *drawable,
-	int x, int y, int w, int h, void *data);
-
-/*
- * Information about a single column
- */
-struct _ETableCol {
-	const char        *id;
-	int                width;
-	ETableColRenderFn  render;
-	void              *render_data;
-	unsigned int       selected:1;
-	int                resizeable:1;
-	int                min_size;
-};
 
 #define E_TABLE_HEADER_TYPE        (e_table_header_get_type ())
 #define E_TABLE_HEADER(o)          (GTK_CHECK_CAST ((o), E_TABLE_HEADER_TYPE, ETableHeader))
@@ -48,34 +27,35 @@ struct _ETableHeader {
 typedef struct {
 	GtkObjectClass parent_class;
 
-	void (*structure_change) (ETableHeader *etc);
-	void (*dimension_change) (ETableHeader *etc, int col);
+	void (*structure_change) (ETableHeader *eth);
+	void (*dimension_change) (ETableHeader *eth, int col);
 } ETableHeaderClass;
 
 GtkType        e_table_header_get_type   (void);
 ETableHeader  *e_table_header_new        (void);
 
-void        e_table_header_add_column    (ETableHeader *etc,
+void        e_table_header_add_column    (ETableHeader *eth,
 					  ETableCol *tc, int pos);
-ETableCol * e_table_header_get_column    (ETableHeader *etc,
+ETableCol * e_table_header_get_column    (ETableHeader *eth,
 					  int column);
-int         e_table_header_count         (ETableHeader *etc);
-int         e_table_header_index         (ETableHeader *etc,
+int         e_table_header_count         (ETableHeader *eth);
+int         e_table_header_index         (ETableHeader *eth,
 					  const char *identifier);
-int         e_table_header_get_index_at  (ETableHeader *etc,
+int         e_table_header_get_index_at  (ETableHeader *eth,
 					  int x_offset);
-ETableCol **e_table_header_get_columns   (ETableHeader *etc);
-gboolean    e_table_header_selection_ok  (ETableHeader *etc);
-int         e_table_header_get_selected  (ETableHeader *etc);
-int         e_table_header_total_width   (ETableHeader *etc);
-void        e_table_header_move          (ETableHeader *etc,
+ETableCol **e_table_header_get_columns   (ETableHeader *eth);
+gboolean    e_table_header_selection_ok  (ETableHeader *eth);
+int         e_table_header_get_selected  (ETableHeader *eth);
+int         e_table_header_total_width   (ETableHeader *eth);
+void        e_table_header_move          (ETableHeader *eth,
 					  int source_index,
 					  int target_index);
-void        e_table_header_remove        (ETableHeader *etc, int idx);
-void        e_table_header_set_size      (ETableHeader *etc, int idx, int size);
-void        e_table_header_set_selection (ETableHeader *etc,
+void        e_table_header_remove        (ETableHeader *eth, int idx);
+void        e_table_header_set_size      (ETableHeader *eth, int idx, int size);
+void        e_table_header_set_selection (ETableHeader *eth,
 					  gboolean allow_selection);
 
-GList      *e_table_header_get_selected_indexes(ETableHeader *etc);
+GList      *e_table_header_get_selected_indexes(ETableHeader *eth);
+
 
 #endif /* _E_TABLE_HEADER_H_ */