Added this function.

2002-06-04  Christopher James Lahey  <clahey@ximian.com>

	* e-table-header.c, e-table-header.h
	(e_table_header_prioritized_column_selected): Added this function.

	* e-table-utils.c, e-table-utils.h
	(e_table_util_calculate_current_search_col): Added this function.

	* e-table.c, e-table.h, e-tree.c: Added a "always_search"
	argument.  If this is off, then searches only occur if there's
	sort.  If it's on, sort takes precendence in doing searches,
	followed by the highest priority column shown.

svn path=/trunk/; revision=17109

1 files changed, 47 insertions, 46 deletions

diff --git a/widgets/table/e-table-header.h b/widgets/table/e-table-header.h
index b30bca47cd..c20fd0be6e 100644
--- a/widgets/table/e-table-header.h
+++ b/widgets/table/e-table-header.h
@@ -29,10 +29,9 @@
 #include <gdk/gdk.h>
 #include <gal/e-table/e-table-sort-info.h>
 #include <gal/e-table/e-table-col.h>
+#include <libgnome/gnome-defs.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+BEGIN_GNOME_DECLS
 
 typedef struct _ETableHeader ETableHeader;
 
@@ -42,6 +41,8 @@ typedef struct _ETableHeader ETableHeader;
 #define E_IS_TABLE_HEADER(o)       (GTK_CHECK_TYPE ((o), E_TABLE_HEADER_TYPE))
 #define E_IS_TABLE_HEADER_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), E_TABLE_HEADER_TYPE))
 
+typedef gboolean (*ETableColCheckFunc) (ETableCol *col, gpointer user_data);
+
 /*
  * A Columnar header.
  */
@@ -71,50 +72,50 @@ typedef struct {
 	int (*request_width) (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 *eth,
-						     ETableCol    *tc,
-						     int           pos);
-ETableCol    *e_table_header_get_column             (ETableHeader *eth,
-						     int           column);
-ETableCol    *e_table_header_get_column_by_col_idx  (ETableHeader *eth,
-						     int           col_idx);
-int           e_table_header_count                  (ETableHeader *eth);
-int           e_table_header_index                  (ETableHeader *eth,
-						     int           col);
-int           e_table_header_get_index_at           (ETableHeader *eth,
-						     int           x_offset);
+GtkType       e_table_header_get_type                     (void);
+ETableHeader *e_table_header_new                          (void);
+
+void          e_table_header_add_column                   (ETableHeader       *eth,
+							   ETableCol          *tc,
+							   int                 pos);
+ETableCol    *e_table_header_get_column                   (ETableHeader       *eth,
+							   int                 column);
+ETableCol    *e_table_header_get_column_by_col_idx        (ETableHeader       *eth,
+							   int                 col_idx);
+int           e_table_header_count                        (ETableHeader       *eth);
+int           e_table_header_index                        (ETableHeader       *eth,
+							   int                 col);
+int           e_table_header_get_index_at                 (ETableHeader       *eth,
+							   int                 x_offset);
 ETableCol   **e_table_header_get_columns            (ETableHeader *eth);
-int           e_table_header_get_selected           (ETableHeader *eth);
-
-int           e_table_header_total_width            (ETableHeader *eth);
-int           e_table_header_min_width              (ETableHeader *eth);
-void          e_table_header_move                   (ETableHeader *eth,
-						     int           source_index,
-						     int           target_index);
-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);
-int           e_table_header_col_diff               (ETableHeader *eth,
-						     int           start_col,
-						     int           end_col);
-
-void          e_table_header_calc_widths            (ETableHeader *eth);
-GList        *e_table_header_get_selected_indexes   (ETableHeader *eth);
-
-void          e_table_header_update_horizontal      (ETableHeader *eth);
-int           e_table_header_prioritized_column     (ETableHeader *eth);
-
-
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+int           e_table_header_get_selected                 (ETableHeader       *eth);
+
+int           e_table_header_total_width                  (ETableHeader       *eth);
+int           e_table_header_min_width                    (ETableHeader       *eth);
+void          e_table_header_move                         (ETableHeader       *eth,
+							   int                 source_index,
+							   int                 target_index);
+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);
+int           e_table_header_col_diff                     (ETableHeader       *eth,
+							   int                 start_col,
+							   int                 end_col);
+
+void          e_table_header_calc_widths                  (ETableHeader       *eth);
+GList        *e_table_header_get_selected_indexes         (ETableHeader       *eth);
+void          e_table_header_update_horizontal            (ETableHeader       *eth);
+int           e_table_header_prioritized_column           (ETableHeader       *eth);
+ETableCol    *e_table_header_prioritized_column_selected  (ETableHeader       *eth,
+							   ETableColCheckFunc  check_func,
+							   gpointer            user_data);
+
+
+END_GNOME_DECLS
 
 #endif /* _E_TABLE_HEADER_H_ */