diff options
| author | Jonathan Blandford <jrb@gnome.org> | 2004-04-11 19:15:24 +0000 |
|---|---|---|
| committer | Jonathan Blandford <jrb@src.gnome.org> | 2004-04-11 19:15:24 +0000 |
| commit | 0aebe3435142d5008b50b0b260163db69c2f7cd5 (patch) | |
| tree | b19c8999fab1b98a5f38f7e5c4900d15cce71ff7 /gtk/gtktreeprivate.h | |
| parent | e9ec1e81b19668e7a73c26fe18a11c9c964237da (diff) | |
| download | gtk+-0aebe3435142d5008b50b0b260163db69c2f7cd5.tar.gz | |
Moved search entries into priv data.
Sun Apr 11 15:08:45 2004 Jonathan Blandford <jrb@gnome.org>
* gtk/gtktreeprivate.h: Moved search entries into priv data.
* gtk/gtktreeview.c: Prep for type-ahead support.
(gtk_tree_view_destroy): Destroy the search window explicitly.
(gtk_tree_view_key_press): Minor change; prep for type-ahead
(gtk_tree_view_ensure_interactive_directory): New function
(gtk_tree_view_focus_out): Rework to handle new entry life-cycle.
(gtk_tree_view_real_start_interactive_search): rework
(gtk_tree_view_search_dialog_hide): ditto
(gtk_tree_view_search_delete_event): ditto
(gtk_tree_view_search_button_press_event): ditto
(gtk_tree_view_search_key_press_event): ditto
(gtk_tree_view_search_move): ditto
(gtk_tree_view_search_init): ditto
* gtk/gtktreeviewcolumn.c:
(gtk_tree_view_column_cell_layout_clear): remove unused variable.
* tests/testfilechooser.c: (main): change
Diffstat (limited to 'gtk/gtktreeprivate.h')
| -rw-r--r-- | gtk/gtktreeprivate.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/gtk/gtktreeprivate.h b/gtk/gtktreeprivate.h index 5940afd3de..58ec1ef5c5 100644 --- a/gtk/gtktreeprivate.h +++ b/gtk/gtktreeprivate.h @@ -28,7 +28,7 @@ extern "C" { #include <gtk/gtktreeview.h> #include <gtk/gtktreeselection.h> #include <gtk/gtkrbtree.h> - + #define TREE_VIEW_DRAG_WIDTH 6 typedef enum @@ -58,7 +58,7 @@ enum DRAG_COLUMN_WINDOW_STATE_ARROW_LEFT = 3, DRAG_COLUMN_WINDOW_STATE_ARROW_RIGHT = 4 }; - + #define GTK_TREE_VIEW_SET_FLAG(tree_view, flag) G_STMT_START{ (tree_view->priv->flags|=flag); }G_STMT_END #define GTK_TREE_VIEW_UNSET_FLAG(tree_view, flag) G_STMT_START{ (tree_view->priv->flags&=~(flag)); }G_STMT_END #define GTK_TREE_VIEW_FLAG_SET(tree_view, flag) ((tree_view->priv->flags&flag)==flag) @@ -201,17 +201,24 @@ struct _GtkTreeViewPrivate guint ctrl_pressed : 1; guint shift_pressed : 1; - + + + guint init_hadjust_value : 1; + /* interactive search */ guint enable_search : 1; guint disable_popdown : 1; + + gint selected_iter; gint search_column; GtkTreeViewSearchDialogPositionFunc search_dialog_position_func; GtkTreeViewSearchEqualFunc search_equal_func; gpointer search_user_data; GtkDestroyNotify search_destroy; - guint init_hadjust_value :1; - gint prev_width; + GtkWidget *search_window; + GtkWidget *search_entry; + + gint prev_width; }; #ifdef __GNUC__ |