callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed expand_row/collapse_row to be 2 signals each -- test_expand_row

Browse Source 
Mon Jun 11 12:43:08 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreeview.c (gtk_tree_view_class_init): changed
	expand_row/collapse_row to be 2 signals each -- test_expand_row
	and row_expanded as well as test_collapse_row and row_collapsed.
This commit is contained in:
Jonathan Blandford 2001-06-11 16:59:28 +00:00 committed by Jonathan Blandford
parent 5d58e47c53
commit 5f437331f1
9 changed files with 106 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Jun 11 12:43:08 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_class_init): changed
expand_row/collapse_row to be 2 signals each -- test_expand_row
and row_expanded as well as test_collapse_row and row_collapsed.
2001-06-10 Anders Carlsson <andersca@codefactory.se> 2001-06-10 Anders Carlsson <andersca@codefactory.se>
* demos/gtk-demo/stock_browser.c (do_stock_browser): Update * demos/gtk-demo/stock_browser.c (do_stock_browser): Update

6
ChangeLog.pre-2-0
View File

@ -1,3 +1,9 @@
Mon Jun 11 12:43:08 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_class_init): changed
expand_row/collapse_row to be 2 signals each -- test_expand_row
and row_expanded as well as test_collapse_row and row_collapsed.
2001-06-10 Anders Carlsson <andersca@codefactory.se> 2001-06-10 Anders Carlsson <andersca@codefactory.se>
* demos/gtk-demo/stock_browser.c (do_stock_browser): Update * demos/gtk-demo/stock_browser.c (do_stock_browser): Update

6
ChangeLog.pre-2-10
View File

@ -1,3 +1,9 @@
Mon Jun 11 12:43:08 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_class_init): changed
expand_row/collapse_row to be 2 signals each -- test_expand_row
and row_expanded as well as test_collapse_row and row_collapsed.
2001-06-10 Anders Carlsson <andersca@codefactory.se> 2001-06-10 Anders Carlsson <andersca@codefactory.se>
* demos/gtk-demo/stock_browser.c (do_stock_browser): Update * demos/gtk-demo/stock_browser.c (do_stock_browser): Update

6
ChangeLog.pre-2-2
View File

@ -1,3 +1,9 @@
Mon Jun 11 12:43:08 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_class_init): changed
expand_row/collapse_row to be 2 signals each -- test_expand_row
and row_expanded as well as test_collapse_row and row_collapsed.
2001-06-10 Anders Carlsson <andersca@codefactory.se> 2001-06-10 Anders Carlsson <andersca@codefactory.se>
* demos/gtk-demo/stock_browser.c (do_stock_browser): Update * demos/gtk-demo/stock_browser.c (do_stock_browser): Update

6
ChangeLog.pre-2-4
View File

@ -1,3 +1,9 @@
Mon Jun 11 12:43:08 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_class_init): changed
expand_row/collapse_row to be 2 signals each -- test_expand_row
and row_expanded as well as test_collapse_row and row_collapsed.
2001-06-10 Anders Carlsson <andersca@codefactory.se> 2001-06-10 Anders Carlsson <andersca@codefactory.se>
* demos/gtk-demo/stock_browser.c (do_stock_browser): Update * demos/gtk-demo/stock_browser.c (do_stock_browser): Update

6
ChangeLog.pre-2-6
View File

@ -1,3 +1,9 @@
Mon Jun 11 12:43:08 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_class_init): changed
expand_row/collapse_row to be 2 signals each -- test_expand_row
and row_expanded as well as test_collapse_row and row_collapsed.
2001-06-10 Anders Carlsson <andersca@codefactory.se> 2001-06-10 Anders Carlsson <andersca@codefactory.se>
* demos/gtk-demo/stock_browser.c (do_stock_browser): Update * demos/gtk-demo/stock_browser.c (do_stock_browser): Update

6
ChangeLog.pre-2-8
View File

@ -1,3 +1,9 @@
Mon Jun 11 12:43:08 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreeview.c (gtk_tree_view_class_init): changed
expand_row/collapse_row to be 2 signals each -- test_expand_row
and row_expanded as well as test_collapse_row and row_collapsed.
2001-06-10 Anders Carlsson <andersca@codefactory.se> 2001-06-10 Anders Carlsson <andersca@codefactory.se>
* demos/gtk-demo/stock_browser.c (do_stock_browser): Update * demos/gtk-demo/stock_browser.c (do_stock_browser): Update

62
gtk/gtktreeview.c
View File

@ -93,8 +93,10 @@ struct _TreeViewDragInfo
enum enum
{ {
ROW_ACTIVATED, ROW_ACTIVATED,
EXPAND_ROW, TEST_EXPAND_ROW,
COLLAPSE_ROW, TEST_COLLAPSE_ROW,
ROW_EXPANDED,
ROW_COLLAPSED,
COLUMNS_CHANGED, COLUMNS_CHANGED,
BEGIN_EXTENDED_SELECTION, BEGIN_EXTENDED_SELECTION,
END_EXTENDED_SELECTION, END_EXTENDED_SELECTION,
@ -573,28 +575,50 @@ gtk_tree_view_class_init (GtkTreeViewClass *class)
GTK_TYPE_TREE_PATH, GTK_TYPE_TREE_PATH,
GTK_TYPE_TREE_VIEW_COLUMN); GTK_TYPE_TREE_VIEW_COLUMN);
tree_view_signals[EXPAND_ROW] = tree_view_signals[TEST_EXPAND_ROW] =
g_signal_newc ("expand_row", g_signal_newc ("test_expand_row",
G_TYPE_FROM_CLASS (object_class), G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTreeViewClass, expand_row), G_STRUCT_OFFSET (GtkTreeViewClass, test_expand_row),
_gtk_boolean_handled_accumulator, NULL, _gtk_boolean_handled_accumulator, NULL,
gtk_marshal_BOOLEAN__BOXED_BOXED, gtk_marshal_BOOLEAN__BOXED_BOXED,
G_TYPE_BOOLEAN, 2, G_TYPE_BOOLEAN, 2,
GTK_TYPE_TREE_ITER, GTK_TYPE_TREE_ITER,
GTK_TYPE_TREE_PATH); GTK_TYPE_TREE_PATH);
tree_view_signals[COLLAPSE_ROW] = tree_view_signals[TEST_COLLAPSE_ROW] =
g_signal_newc ("collapse_row", g_signal_newc ("test_collapse_row",
G_TYPE_FROM_CLASS (object_class), G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST, G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTreeViewClass, collapse_row), G_STRUCT_OFFSET (GtkTreeViewClass, test_collapse_row),
_gtk_boolean_handled_accumulator, NULL, _gtk_boolean_handled_accumulator, NULL,
gtk_marshal_BOOLEAN__BOXED_BOXED, gtk_marshal_BOOLEAN__BOXED_BOXED,
G_TYPE_BOOLEAN, 2, G_TYPE_BOOLEAN, 2,
GTK_TYPE_TREE_ITER, GTK_TYPE_TREE_ITER,
GTK_TYPE_TREE_PATH); GTK_TYPE_TREE_PATH);
tree_view_signals[ROW_EXPANDED] =
g_signal_newc ("row_expanded",
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTreeViewClass, row_expanded),
NULL, NULL,
gtk_marshal_VOID__BOXED_BOXED,
GTK_TYPE_NONE, 2,
GTK_TYPE_TREE_ITER,
GTK_TYPE_TREE_PATH);
tree_view_signals[ROW_COLLAPSED] =
g_signal_newc ("row_collapsed",
G_TYPE_FROM_CLASS (object_class),
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTreeViewClass, row_collapsed),
NULL, NULL,
gtk_marshal_VOID__BOXED_BOXED,
GTK_TYPE_NONE, 2,
GTK_TYPE_TREE_ITER,
GTK_TYPE_TREE_PATH);
tree_view_signals[COLUMNS_CHANGED] = tree_view_signals[COLUMNS_CHANGED] =
g_signal_newc ("columns_changed", g_signal_newc ("columns_changed",
G_TYPE_FROM_CLASS (object_class), G_TYPE_FROM_CLASS (object_class),
@ -7036,7 +7060,7 @@ gtk_tree_view_real_expand_row (GtkTreeView *tree_view,
if (! gtk_tree_model_iter_has_child (tree_view->priv->model, &iter)) if (! gtk_tree_model_iter_has_child (tree_view->priv->model, &iter))
return FALSE; return FALSE;
g_signal_emit (G_OBJECT (tree_view), tree_view_signals[EXPAND_ROW], 0, &iter, path, &expand); g_signal_emit (G_OBJECT (tree_view), tree_view_signals[TEST_EXPAND_ROW], 0, &iter, path, &expand);
if (expand) if (expand)
return FALSE; return FALSE;
@ -7058,9 +7082,13 @@ gtk_tree_view_real_expand_row (GtkTreeView *tree_view,
gtk_widget_queue_draw (GTK_WIDGET (tree_view)); gtk_widget_queue_draw (GTK_WIDGET (tree_view));
_gtk_tree_view_update_size (tree_view); _gtk_tree_view_update_size (tree_view);
} }
g_signal_emit (G_OBJECT (tree_view), tree_view_signals[ROW_EXPANDED], 0, &iter, path);
return TRUE; return TRUE;
} }
/** /**
* gtk_tree_view_expand_row: * gtk_tree_view_expand_row:
* @tree_view: a #GtkTreeView * @tree_view: a #GtkTreeView
@ -7103,7 +7131,7 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
gtk_tree_model_get_iter (tree_view->priv->model, &iter, path); gtk_tree_model_get_iter (tree_view->priv->model, &iter, path);
g_signal_emit (G_OBJECT (tree_view), tree_view_signals[COLLAPSE_ROW], 0, &iter, path, &collapse); g_signal_emit (G_OBJECT (tree_view), tree_view_signals[TEST_COLLAPSE_ROW], 0, &iter, path, &collapse);
if (collapse) if (collapse)
return FALSE; return FALSE;
@ -7130,6 +7158,9 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
gtk_widget_queue_draw (GTK_WIDGET (tree_view)); gtk_widget_queue_draw (GTK_WIDGET (tree_view));
_gtk_tree_view_update_size (tree_view); _gtk_tree_view_update_size (tree_view);
} }
g_signal_emit (G_OBJECT (tree_view), tree_view_signals[ROW_COLLAPSED], 0, &iter, path);
return TRUE; return TRUE;
} }
@ -7302,6 +7333,17 @@ gtk_tree_view_real_set_cursor (GtkTreeView *tree_view,
gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL); gtk_tree_view_queue_draw_node (tree_view, tree, node, NULL);
} }
static void
gtk_tree_view_set_anchor (GtkTreeView *tree_view,
GtkTreePath *path)
{
if (tree_view->priv->anchor)
gtk_tree_row_reference_free (tree_view->priv->anchor);
tree_view->priv->anchor = gtk_tree_row_reference_new_proxy (G_OBJECT (tree_view),
tree_view->priv->model,
path);
}
/** /**
* gtk_tree_view_set_cursor: * gtk_tree_view_set_cursor:
* @tree_view: A #GtkTreeView * @tree_view: A #GtkTreeView

10
gtk/gtktreeview.h
View File

@ -70,10 +70,16 @@ struct _GtkTreeViewClass
void (* row_activated) (GtkTreeView *tree_view, void (* row_activated) (GtkTreeView *tree_view,
GtkTreePath *path, GtkTreePath *path,
GtkTreeViewColumn *column); GtkTreeViewColumn *column);
gboolean (* expand_row) (GtkTreeView *tree_view, gboolean (* test_expand_row) (GtkTreeView *tree_view,
GtkTreeIter *iter, GtkTreeIter *iter,
GtkTreePath *path); GtkTreePath *path);
gboolean (* collapse_row) (GtkTreeView *tree_view, gboolean (* test_collapse_row) (GtkTreeView *tree_view,
GtkTreeIter *iter,
GtkTreePath *path);
void (* row_expanded) (GtkTreeView *tree_view,
GtkTreeIter *iter,
GtkTreePath *path);
void (* row_collapsed) (GtkTreeView *tree_view,
GtkTreeIter *iter, GtkTreeIter *iter,
GtkTreePath *path); GtkTreePath *path);
void (* columns_changed) (GtkTreeView *tree_view); void (* columns_changed) (GtkTreeView *tree_view);