From 58e77fe25bde289f178153a8a01e62d8b2e8093b Mon Sep 17 00:00:00 2001 From: Kristian Rietveld Date: Tue, 24 Jan 2006 10:49:29 +0000 Subject: #322591, Jonathan Blandford. 2006-01-24 Kristian Rietveld #322591, Jonathan Blandford. * gtk/gtktreeview.[ch] (gtk_tree_view_get_search_entry), (gtk_tree_view_set_search_entry), (gtk_tree_view_get_search_position_func), (gtk_tree_view_set_search_position_func): New functions, and small adaptions to the tree view code to allow for setting the entry and search position function. * gtk/gtktreeprivate.h: Removed GtkTreeViewSearchDialogPositionFunc typedef, which is now in gtktreeview.h as GtkTreeViewSearchPositionFunc. Add/update fields. * gtk/gtk.symbols: Add new functions. * tests/testtreesort.c: Add a little test for _set_search_entry(). --- gtk/gtktreeprivate.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gtk/gtktreeprivate.h') diff --git a/gtk/gtktreeprivate.h b/gtk/gtktreeprivate.h index e4a333724..459faf0d1 100644 --- a/gtk/gtktreeprivate.h +++ b/gtk/gtktreeprivate.h @@ -70,9 +70,6 @@ enum */ #define TREE_VIEW_COLUMN_DRAG_DEAD_MULTIPLIER(tree_view) (10*TREE_VIEW_HEADER_HEIGHT(tree_view)) -typedef void (*GtkTreeViewSearchDialogPositionFunc) (GtkTreeView *tree_view, - GtkWidget *search_dialog); - typedef struct _GtkTreeViewColumnReorder GtkTreeViewColumnReorder; struct _GtkTreeViewColumnReorder { @@ -207,6 +204,7 @@ struct _GtkTreeViewPrivate /* interactive search */ guint enable_search : 1; guint disable_popdown : 1; + guint search_custom_entry_set : 1; guint hover_selection : 1; guint hover_expand : 1; @@ -217,10 +215,12 @@ struct _GtkTreeViewPrivate gint selected_iter; gint search_column; - GtkTreeViewSearchDialogPositionFunc search_dialog_position_func; + GtkTreeViewSearchPositionFunc search_position_func; GtkTreeViewSearchEqualFunc search_equal_func; gpointer search_user_data; GtkDestroyNotify search_destroy; + gpointer search_position_user_data; + GDestroyNotify search_position_destroy; GtkWidget *search_window; GtkWidget *search_entry; guint search_entry_changed_id; -- cgit v1.2.1