Commit ac1e4ef3 authored by Jonathan Blandford's avatar Jonathan Blandford Committed by Jonathan Blandford

Add heavily modified patch from Kristian Rietveld to handle interactive


Fri Aug 17 19:30:14 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeprivate.h:
	* gtk/gtktreeview.c: (gtk_tree_view_class_init),
	(gtk_tree_view_init), (gtk_tree_view_set_property),
	(gtk_tree_view_get_property), (gtk_tree_view_destroy),
	(gtk_tree_view_key_press), (gtk_tree_view_leave_notify),
	(gtk_tree_view_focus_out), (gtk_tree_view_set_model),
	(gtk_tree_view_set_destroy_count_func),
	(gtk_tree_view_set_enable_search),
	(gtk_tree_view_get_enable_search),
	(gtk_tree_view_get_search_column),
	(gtk_tree_view_set_search_column),
	(gtk_tree_view_get_search_equal_func),
	(gtk_tree_view_set_search_equal_func),
	(gtk_tree_view_search_dialog_destroy),
	(gtk_tree_view_search_position_func),
	(gtk_tree_view_interactive_search),
	(gtk_tree_view_search_delete_event),
	(gtk_tree_view_search_button_press_event),
	(gtk_tree_view_search_key_press_event),
	(gtk_tree_view_search_move), (gtk_tree_view_search_equal_func),
	(gtk_tree_view_search_iter), (gtk_tree_view_search_init):
	* gtk/gtktreeview.h:
	Add heavily modified patch from Kristian Rietveld to handle
	interactive searching.
parent ad9d2daf
Fri Aug 17 19:30:14 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeprivate.h:
* gtk/gtktreeview.c: (gtk_tree_view_class_init),
(gtk_tree_view_init), (gtk_tree_view_set_property),
(gtk_tree_view_get_property), (gtk_tree_view_destroy),
(gtk_tree_view_key_press), (gtk_tree_view_leave_notify),
(gtk_tree_view_focus_out), (gtk_tree_view_set_model),
(gtk_tree_view_set_destroy_count_func),
(gtk_tree_view_set_enable_search),
(gtk_tree_view_get_enable_search),
(gtk_tree_view_get_search_column),
(gtk_tree_view_set_search_column),
(gtk_tree_view_get_search_equal_func),
(gtk_tree_view_set_search_equal_func),
(gtk_tree_view_search_dialog_destroy),
(gtk_tree_view_search_position_func),
(gtk_tree_view_interactive_search),
(gtk_tree_view_search_delete_event),
(gtk_tree_view_search_button_press_event),
(gtk_tree_view_search_key_press_event),
(gtk_tree_view_search_move), (gtk_tree_view_search_equal_func),
(gtk_tree_view_search_iter), (gtk_tree_view_search_init):
* gtk/gtktreeview.h:
Add heavily modified patch from Kristian Rietveld to handle
interactive searching.
Fri Aug 17 17:30:34 2001 Tim Janik <timj@gtk.org>
* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): const correct
......
Fri Aug 17 19:30:14 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeprivate.h:
* gtk/gtktreeview.c: (gtk_tree_view_class_init),
(gtk_tree_view_init), (gtk_tree_view_set_property),
(gtk_tree_view_get_property), (gtk_tree_view_destroy),
(gtk_tree_view_key_press), (gtk_tree_view_leave_notify),
(gtk_tree_view_focus_out), (gtk_tree_view_set_model),
(gtk_tree_view_set_destroy_count_func),
(gtk_tree_view_set_enable_search),
(gtk_tree_view_get_enable_search),
(gtk_tree_view_get_search_column),
(gtk_tree_view_set_search_column),
(gtk_tree_view_get_search_equal_func),
(gtk_tree_view_set_search_equal_func),
(gtk_tree_view_search_dialog_destroy),
(gtk_tree_view_search_position_func),
(gtk_tree_view_interactive_search),
(gtk_tree_view_search_delete_event),
(gtk_tree_view_search_button_press_event),
(gtk_tree_view_search_key_press_event),
(gtk_tree_view_search_move), (gtk_tree_view_search_equal_func),
(gtk_tree_view_search_iter), (gtk_tree_view_search_init):
* gtk/gtktreeview.h:
Add heavily modified patch from Kristian Rietveld to handle
interactive searching.
Fri Aug 17 17:30:34 2001 Tim Janik <timj@gtk.org>
* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): const correct
......
Fri Aug 17 19:30:14 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeprivate.h:
* gtk/gtktreeview.c: (gtk_tree_view_class_init),
(gtk_tree_view_init), (gtk_tree_view_set_property),
(gtk_tree_view_get_property), (gtk_tree_view_destroy),
(gtk_tree_view_key_press), (gtk_tree_view_leave_notify),
(gtk_tree_view_focus_out), (gtk_tree_view_set_model),
(gtk_tree_view_set_destroy_count_func),
(gtk_tree_view_set_enable_search),
(gtk_tree_view_get_enable_search),
(gtk_tree_view_get_search_column),
(gtk_tree_view_set_search_column),
(gtk_tree_view_get_search_equal_func),
(gtk_tree_view_set_search_equal_func),
(gtk_tree_view_search_dialog_destroy),
(gtk_tree_view_search_position_func),
(gtk_tree_view_interactive_search),
(gtk_tree_view_search_delete_event),
(gtk_tree_view_search_button_press_event),
(gtk_tree_view_search_key_press_event),
(gtk_tree_view_search_move), (gtk_tree_view_search_equal_func),
(gtk_tree_view_search_iter), (gtk_tree_view_search_init):
* gtk/gtktreeview.h:
Add heavily modified patch from Kristian Rietveld to handle
interactive searching.
Fri Aug 17 17:30:34 2001 Tim Janik <timj@gtk.org>
* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): const correct
......
Fri Aug 17 19:30:14 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeprivate.h:
* gtk/gtktreeview.c: (gtk_tree_view_class_init),
(gtk_tree_view_init), (gtk_tree_view_set_property),
(gtk_tree_view_get_property), (gtk_tree_view_destroy),
(gtk_tree_view_key_press), (gtk_tree_view_leave_notify),
(gtk_tree_view_focus_out), (gtk_tree_view_set_model),
(gtk_tree_view_set_destroy_count_func),
(gtk_tree_view_set_enable_search),
(gtk_tree_view_get_enable_search),
(gtk_tree_view_get_search_column),
(gtk_tree_view_set_search_column),
(gtk_tree_view_get_search_equal_func),
(gtk_tree_view_set_search_equal_func),
(gtk_tree_view_search_dialog_destroy),
(gtk_tree_view_search_position_func),
(gtk_tree_view_interactive_search),
(gtk_tree_view_search_delete_event),
(gtk_tree_view_search_button_press_event),
(gtk_tree_view_search_key_press_event),
(gtk_tree_view_search_move), (gtk_tree_view_search_equal_func),
(gtk_tree_view_search_iter), (gtk_tree_view_search_init):
* gtk/gtktreeview.h:
Add heavily modified patch from Kristian Rietveld to handle
interactive searching.
Fri Aug 17 17:30:34 2001 Tim Janik <timj@gtk.org>
* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): const correct
......
Fri Aug 17 19:30:14 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeprivate.h:
* gtk/gtktreeview.c: (gtk_tree_view_class_init),
(gtk_tree_view_init), (gtk_tree_view_set_property),
(gtk_tree_view_get_property), (gtk_tree_view_destroy),
(gtk_tree_view_key_press), (gtk_tree_view_leave_notify),
(gtk_tree_view_focus_out), (gtk_tree_view_set_model),
(gtk_tree_view_set_destroy_count_func),
(gtk_tree_view_set_enable_search),
(gtk_tree_view_get_enable_search),
(gtk_tree_view_get_search_column),
(gtk_tree_view_set_search_column),
(gtk_tree_view_get_search_equal_func),
(gtk_tree_view_set_search_equal_func),
(gtk_tree_view_search_dialog_destroy),
(gtk_tree_view_search_position_func),
(gtk_tree_view_interactive_search),
(gtk_tree_view_search_delete_event),
(gtk_tree_view_search_button_press_event),
(gtk_tree_view_search_key_press_event),
(gtk_tree_view_search_move), (gtk_tree_view_search_equal_func),
(gtk_tree_view_search_iter), (gtk_tree_view_search_init):
* gtk/gtktreeview.h:
Add heavily modified patch from Kristian Rietveld to handle
interactive searching.
Fri Aug 17 17:30:34 2001 Tim Janik <timj@gtk.org>
* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): const correct
......
Fri Aug 17 19:30:14 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeprivate.h:
* gtk/gtktreeview.c: (gtk_tree_view_class_init),
(gtk_tree_view_init), (gtk_tree_view_set_property),
(gtk_tree_view_get_property), (gtk_tree_view_destroy),
(gtk_tree_view_key_press), (gtk_tree_view_leave_notify),
(gtk_tree_view_focus_out), (gtk_tree_view_set_model),
(gtk_tree_view_set_destroy_count_func),
(gtk_tree_view_set_enable_search),
(gtk_tree_view_get_enable_search),
(gtk_tree_view_get_search_column),
(gtk_tree_view_set_search_column),
(gtk_tree_view_get_search_equal_func),
(gtk_tree_view_set_search_equal_func),
(gtk_tree_view_search_dialog_destroy),
(gtk_tree_view_search_position_func),
(gtk_tree_view_interactive_search),
(gtk_tree_view_search_delete_event),
(gtk_tree_view_search_button_press_event),
(gtk_tree_view_search_key_press_event),
(gtk_tree_view_search_move), (gtk_tree_view_search_equal_func),
(gtk_tree_view_search_iter), (gtk_tree_view_search_init):
* gtk/gtktreeview.h:
Add heavily modified patch from Kristian Rietveld to handle
interactive searching.
Fri Aug 17 17:30:34 2001 Tim Janik <timj@gtk.org>
* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): const correct
......
Fri Aug 17 19:30:14 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeprivate.h:
* gtk/gtktreeview.c: (gtk_tree_view_class_init),
(gtk_tree_view_init), (gtk_tree_view_set_property),
(gtk_tree_view_get_property), (gtk_tree_view_destroy),
(gtk_tree_view_key_press), (gtk_tree_view_leave_notify),
(gtk_tree_view_focus_out), (gtk_tree_view_set_model),
(gtk_tree_view_set_destroy_count_func),
(gtk_tree_view_set_enable_search),
(gtk_tree_view_get_enable_search),
(gtk_tree_view_get_search_column),
(gtk_tree_view_set_search_column),
(gtk_tree_view_get_search_equal_func),
(gtk_tree_view_set_search_equal_func),
(gtk_tree_view_search_dialog_destroy),
(gtk_tree_view_search_position_func),
(gtk_tree_view_interactive_search),
(gtk_tree_view_search_delete_event),
(gtk_tree_view_search_button_press_event),
(gtk_tree_view_search_key_press_event),
(gtk_tree_view_search_move), (gtk_tree_view_search_equal_func),
(gtk_tree_view_search_iter), (gtk_tree_view_search_init):
* gtk/gtktreeview.h:
Add heavily modified patch from Kristian Rietveld to handle
interactive searching.
Fri Aug 17 17:30:34 2001 Tim Janik <timj@gtk.org>
* gtk/gtktreemodel.c (gtk_tree_path_new_from_string): const correct
......
......@@ -66,6 +66,9 @@ 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
{
......@@ -171,6 +174,14 @@ struct _GtkTreeViewPrivate
guint in_extended_selection : 1;
guint in_free_motion : 1;
/* interactive search */
guint enable_search : 1;
gint search_column;
GtkTreeViewSearchDialogPositionFunc search_dialog_position_func;
GtkTreeViewSearchEqualFunc search_equal_func;
gpointer search_user_data;
GtkDestroyNotify search_destroy;
};
#ifdef __GNUC__
......
This diff is collapsed.
......@@ -19,6 +19,7 @@
#ifndef __GTK_TREE_VIEW_H__
#define __GTK_TREE_VIEW_H__
#include <gtk/gtkwidget.h>
#include <gtk/gtkcontainer.h>
#include <gtk/gtktreemodel.h>
#include <gtk/gtktreeviewcolumn.h>
......@@ -119,6 +120,10 @@ typedef gboolean (* GtkTreeViewDroppableFunc) (GtkTreeView *tree_vi
GtkTreePath *path,
GtkTreeViewDropPosition *pos,
gpointer user_data);
typedef gboolean (*GtkTreeViewSearchEqualFunc) (GtkTreeModel *model,
gint column,
gchar *key,
GtkTreeIter *iter);
/* Creators */
......@@ -275,13 +280,25 @@ gboolean gtk_tree_view_get_dest_row_at_pos (GtkTreeView
GdkPixmap *gtk_tree_view_create_row_drag_icon (GtkTreeView *tree_view,
GtkTreePath *path);
/* Interactive search */
void gtk_tree_view_set_enable_search (GtkTreeView *tree_view,
gboolean use_search);
gboolean gtk_tree_view_get_enable_search (GtkTreeView *tree_view);
gint gtk_tree_view_get_search_column (GtkTreeView *tree_view);
void gtk_tree_view_set_search_column (GtkTreeView *tree_view,
gint column);
GtkTreeViewSearchEqualFunc gtk_tree_view_get_search_equal_func (GtkTreeView *tree_view);
void gtk_tree_view_set_search_equal_func (GtkTreeView *tree_view,
GtkTreeViewSearchEqualFunc search_compare_func,
gpointer search_data,
GtkDestroyNotify search_destroy);
/* This function should really never be used. It is just for use by ATK.
*/
typedef void (* GtkTreeDestroyCountFunc) (GtkTreeView *tree_view,
GtkTreePath *path,
gint children,
gpointer user_data);
typedef void (* GtkTreeDestroyCountFunc) (GtkTreeView *tree_view,
GtkTreePath *path,
gint children,
gpointer user_data);
void gtk_tree_view_set_destroy_count_func (GtkTreeView *tree_view,
GtkTreeDestroyCountFunc func,
gpointer data,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment