AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Rename interface signals to make them more clear. Also, change

Browse Source 
Wed Sep 12 19:01:05 2001  Jonathan Blandford  <jrb@redhat.com>

	* gtk/gtktreemodel.h (struct _GtkTreeModelIface): Rename interface
	signals to make them more clear.  Also, change ::range_changed to
	::row_changed.
	* gtk/gtktreemodel.c: Adjust to interface change
	* gtk/gtktreemodel.h: ditto
	* gtk/gtktreemodelsort.c: ditto
	* gtk/gtktreestore.c: ditto
	* gtk/gtkliststore.c: ditto
	* gtk/gtktreeview.c: ditto
	* tests/testtreecolumns.c: ditto
	* gtk/gtkmarshal.list: Actually remove a marshaller!
This commit is contained in:
Jonathan Blandford 2001-09-12 23:16:18 +00:00 committed by Jonathan Blandford
parent 15a544def8
commit fc8304b134
21 changed files with 360 additions and 266 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChangeLog
View File

@ -1,3 +1,17 @@
Wed Sep 12 19:01:05 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.h (struct _GtkTreeModelIface): Rename interface
signals to make them more clear. Also, change ::range_changed to
::row_changed.
* gtk/gtktreemodel.c: Adjust to interface change
* gtk/gtktreemodel.h: ditto
* gtk/gtktreemodelsort.c: ditto
* gtk/gtktreestore.c: ditto
* gtk/gtkliststore.c: ditto
* gtk/gtktreeview.c: ditto
* tests/testtreecolumns.c: ditto
* gtk/gtkmarshal.list: Actually remove a marshaller!
2001-09-12 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtktextview.c

14
ChangeLog.pre-2-0
View File

@ -1,3 +1,17 @@
Wed Sep 12 19:01:05 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.h (struct _GtkTreeModelIface): Rename interface
signals to make them more clear. Also, change ::range_changed to
::row_changed.
* gtk/gtktreemodel.c: Adjust to interface change
* gtk/gtktreemodel.h: ditto
* gtk/gtktreemodelsort.c: ditto
* gtk/gtktreestore.c: ditto
* gtk/gtkliststore.c: ditto
* gtk/gtktreeview.c: ditto
* tests/testtreecolumns.c: ditto
* gtk/gtkmarshal.list: Actually remove a marshaller!
2001-09-12 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtktextview.c

14
ChangeLog.pre-2-10
View File

@ -1,3 +1,17 @@
Wed Sep 12 19:01:05 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.h (struct _GtkTreeModelIface): Rename interface
signals to make them more clear. Also, change ::range_changed to
::row_changed.
* gtk/gtktreemodel.c: Adjust to interface change
* gtk/gtktreemodel.h: ditto
* gtk/gtktreemodelsort.c: ditto
* gtk/gtktreestore.c: ditto
* gtk/gtkliststore.c: ditto
* gtk/gtktreeview.c: ditto
* tests/testtreecolumns.c: ditto
* gtk/gtkmarshal.list: Actually remove a marshaller!
2001-09-12 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtktextview.c

14
ChangeLog.pre-2-2
View File

@ -1,3 +1,17 @@
Wed Sep 12 19:01:05 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.h (struct _GtkTreeModelIface): Rename interface
signals to make them more clear. Also, change ::range_changed to
::row_changed.
* gtk/gtktreemodel.c: Adjust to interface change
* gtk/gtktreemodel.h: ditto
* gtk/gtktreemodelsort.c: ditto
* gtk/gtktreestore.c: ditto
* gtk/gtkliststore.c: ditto
* gtk/gtktreeview.c: ditto
* tests/testtreecolumns.c: ditto
* gtk/gtkmarshal.list: Actually remove a marshaller!
2001-09-12 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtktextview.c

14
ChangeLog.pre-2-4
View File

@ -1,3 +1,17 @@
Wed Sep 12 19:01:05 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.h (struct _GtkTreeModelIface): Rename interface
signals to make them more clear. Also, change ::range_changed to
::row_changed.
* gtk/gtktreemodel.c: Adjust to interface change
* gtk/gtktreemodel.h: ditto
* gtk/gtktreemodelsort.c: ditto
* gtk/gtktreestore.c: ditto
* gtk/gtkliststore.c: ditto
* gtk/gtktreeview.c: ditto
* tests/testtreecolumns.c: ditto
* gtk/gtkmarshal.list: Actually remove a marshaller!
2001-09-12 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtktextview.c

14
ChangeLog.pre-2-6
View File

@ -1,3 +1,17 @@
Wed Sep 12 19:01:05 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.h (struct _GtkTreeModelIface): Rename interface
signals to make them more clear. Also, change ::range_changed to
::row_changed.
* gtk/gtktreemodel.c: Adjust to interface change
* gtk/gtktreemodel.h: ditto
* gtk/gtktreemodelsort.c: ditto
* gtk/gtktreestore.c: ditto
* gtk/gtkliststore.c: ditto
* gtk/gtktreeview.c: ditto
* tests/testtreecolumns.c: ditto
* gtk/gtkmarshal.list: Actually remove a marshaller!
2001-09-12 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtktextview.c

14
ChangeLog.pre-2-8
View File

@ -1,3 +1,17 @@
Wed Sep 12 19:01:05 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodel.h (struct _GtkTreeModelIface): Rename interface
signals to make them more clear. Also, change ::range_changed to
::row_changed.
* gtk/gtktreemodel.c: Adjust to interface change
* gtk/gtktreemodel.h: ditto
* gtk/gtktreemodelsort.c: ditto
* gtk/gtktreestore.c: ditto
* gtk/gtkliststore.c: ditto
* gtk/gtktreeview.c: ditto
* tests/testtreecolumns.c: ditto
* gtk/gtkmarshal.list: Actually remove a marshaller!
2001-09-12 Padraig O'Briain <padraig.obriain@sun.com>
* gtk/gtktextview.c

6
docs/reference/gtk/tmpl/gtk-unused.sgml
View File

@ -745,12 +745,6 @@ gtk_font_selection_set_filter().
@GTK_FONT_SCALABLE_BITMAP: scaled bitmap fonts.
@GTK_FONT_ALL: a bitwise combination of all of the above.
<!-- ##### ARG GtkFrame:shadow-type ##### -->
<para>
</para>
<!-- ##### ARG GtkHScale:adjustment ##### -->
<para>
the #GtkAdjustment which sets the range of the scale.

5
docs/reference/gtk/tmpl/gtkframe.sgml
View File

@ -135,6 +135,11 @@ Set the shadow type for the Frame widget.
</para>
<!-- ##### ARG GtkFrame:shadow-type ##### -->
<para>
</para>
<!-- ##### ARG GtkFrame:label-widget ##### -->
<para>

5
docs/reference/gtk/tmpl/gtkhandlebox.sgml
View File

@ -182,6 +182,11 @@ handlebox are detached from the main window.
Determines the shadow type for the handlebox.
</para>
<!-- ##### ARG GtkHandleBox:shadow-type ##### -->
<para>
</para>
<!-- ##### ARG GtkHandleBox:handle-position ##### -->
<para>
Determines the side of the handlebox where the handle is drawn.

1
docs/reference/gtk/tmpl/gtkrc.sgml
View File

@ -495,7 +495,6 @@ This can later be composited together with other
#GtkRcStyle structures to form a #GtkStyle.
</para>
@parent_instance:
@name:
@bg_pixmap_name:
@font_desc:

10
docs/reference/gtk/tmpl/gtktreemodel.sgml
View File

@ -50,11 +50,11 @@ The tree interface used by #GtkTreeView
</para>
@g_iface:
@range_changed:
@inserted:
@has_child_toggled:
@deleted:
@reordered:
@row_changed:
@row_inserted:
@row_has_child_toggled:
@row_deleted:
@rows_reordered:
@get_flags:
@get_n_columns:
@get_column_type:

28
gtk/gtkliststore.c
View File

@ -636,7 +636,7 @@ gtk_list_store_set_value (GtkListStore *list_store,
_gtk_tree_data_list_value_to_node (list, &real_value);
else
_gtk_tree_data_list_value_to_node (list, value);
gtk_tree_model_range_changed (GTK_TREE_MODEL (list_store), path, iter, path, iter);
gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
if (converted)
g_value_unset (&real_value);
@ -672,7 +672,7 @@ gtk_list_store_set_value (GtkListStore *list_store,
_gtk_tree_data_list_value_to_node (list, &real_value);
else
_gtk_tree_data_list_value_to_node (list, value);
gtk_tree_model_range_changed (GTK_TREE_MODEL (list_store), path, iter, path, iter);
gtk_tree_model_row_changed (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
if (converted)
g_value_unset (&real_value);
@ -858,7 +858,7 @@ gtk_list_store_remove (GtkListStore *list_store,
validate_list_store (list_store);
list_store->stamp ++;
gtk_tree_model_deleted (GTK_TREE_MODEL (list_store), path);
gtk_tree_model_row_deleted (GTK_TREE_MODEL (list_store), path);
gtk_tree_path_free (path);
if (next)
@ -943,7 +943,7 @@ gtk_list_store_insert (GtkListStore *list_store,
path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, position);
gtk_tree_model_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
}
@ -1031,7 +1031,7 @@ gtk_list_store_insert_before (GtkListStore *list_store,
path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, i);
gtk_tree_model_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
}
@ -1084,7 +1084,7 @@ gtk_list_store_insert_after (GtkListStore *list_store,
path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, i);
gtk_tree_model_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
}
@ -1122,7 +1122,7 @@ gtk_list_store_prepend (GtkListStore *list_store,
path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, 0);
gtk_tree_model_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
}
@ -1167,7 +1167,7 @@ gtk_list_store_append (GtkListStore *list_store,
path = gtk_tree_path_new ();
gtk_tree_path_append_index (path, list_store->length - 1);
gtk_tree_model_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_model_row_inserted (GTK_TREE_MODEL (list_store), path, iter);
gtk_tree_path_free (path);
}
@ -1325,7 +1325,7 @@ gtk_list_store_drag_data_received (GtkTreeDragDest *drag_dest,
G_SLIST (dest_iter.user_data)->data = copy_head;
path = gtk_list_store_get_path (GTK_TREE_MODEL (tree_model), &dest_iter);
gtk_tree_model_range_changed (GTK_TREE_MODEL (tree_model), path, &dest_iter, path, &dest_iter);
gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_model), path, &dest_iter);
gtk_tree_path_free (path);
}
}
@ -1482,8 +1482,8 @@ gtk_list_store_sort (GtkListStore *list_store)
path = gtk_tree_path_new ();
iter.stamp = list_store->stamp;
iter.user_data = NULL;
gtk_tree_model_reordered (GTK_TREE_MODEL (list_store),
path, &iter, new_order);
gtk_tree_model_rows_reordered (GTK_TREE_MODEL (list_store),
path, &iter, new_order);
gtk_tree_path_free (path);
g_free (new_order);
g_array_free (sort_array, TRUE);
@ -1664,9 +1664,9 @@ gtk_list_store_sort_iter_changed (GtkListStore *list_store,
tmp_path = gtk_tree_path_new ();
tmp_iter.user_data = NULL;
gtk_tree_model_reordered (GTK_TREE_MODEL (list_store),
tmp_path, &tmp_iter,
new_order);
gtk_tree_model_rows_reordered (GTK_TREE_MODEL (list_store),
tmp_path, &tmp_iter,
new_order);
gtk_tree_path_free (tmp_path);
g_free (new_order);

1
gtk/gtkmarshal.list
View File

@ -43,7 +43,6 @@ VOID:BOOLEAN
VOID:BOOLEAN,BOOLEAN,BOOLEAN
VOID:BOXED
VOID:BOXED,BOXED
VOID:BOXED,BOXED,BOXED,BOXED
VOID:BOXED,BOXED,POINTER
VOID:BOXED,POINTER
VOID:BOXED,OBJECT

1
gtk/gtkmarshalers.list
View File

@ -43,7 +43,6 @@ VOID:BOOLEAN
VOID:BOOLEAN,BOOLEAN,BOOLEAN
VOID:BOXED
VOID:BOXED,BOXED
VOID:BOXED,BOXED,BOXED,BOXED
VOID:BOXED,BOXED,POINTER
VOID:BOXED,POINTER
VOID:BOXED,OBJECT

126
gtk/gtktreemodel.c
View File

@ -71,47 +71,45 @@ gtk_tree_model_base_init (gpointer g_class)
if (! initialized)
{
g_signal_new ("range_changed",
g_signal_new ("row_changed",
GTK_TYPE_TREE_MODEL,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTreeModelIface, range_changed),
NULL, NULL,
gtk_marshal_VOID__BOXED_BOXED_BOXED_BOXED,
G_TYPE_NONE, 4,
GTK_TYPE_TREE_PATH,
GTK_TYPE_TREE_ITER,
GTK_TYPE_TREE_PATH,
GTK_TYPE_TREE_ITER);
g_signal_new ("inserted",
GTK_TYPE_TREE_MODEL,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTreeModelIface, inserted),
G_STRUCT_OFFSET (GtkTreeModelIface, row_changed),
NULL, NULL,
gtk_marshal_VOID__BOXED_BOXED,
G_TYPE_NONE, 2,
GTK_TYPE_TREE_PATH,
GTK_TYPE_TREE_ITER);
g_signal_new ("has_child_toggled",
g_signal_new ("row_inserted",
GTK_TYPE_TREE_MODEL,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTreeModelIface, has_child_toggled),
G_STRUCT_OFFSET (GtkTreeModelIface, row_inserted),
NULL, NULL,
gtk_marshal_VOID__BOXED_BOXED,
G_TYPE_NONE, 2,
GTK_TYPE_TREE_PATH,
GTK_TYPE_TREE_ITER);
g_signal_new ("deleted",
g_signal_new ("row_has_child_toggled",
GTK_TYPE_TREE_MODEL,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTreeModelIface, deleted),
G_STRUCT_OFFSET (GtkTreeModelIface, row_has_child_toggled),
NULL, NULL,
gtk_marshal_VOID__BOXED_BOXED,
G_TYPE_NONE, 2,
GTK_TYPE_TREE_PATH,
GTK_TYPE_TREE_ITER);
g_signal_new ("row_deleted",
GTK_TYPE_TREE_MODEL,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTreeModelIface, row_deleted),
NULL, NULL,
gtk_marshal_VOID__BOXED,
G_TYPE_NONE, 1,
GTK_TYPE_TREE_PATH);
g_signal_new ("reordered",
g_signal_new ("rows_reordered",
GTK_TYPE_TREE_MODEL,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTreeModelIface, reordered),
G_STRUCT_OFFSET (GtkTreeModelIface, rows_reordered),
NULL, NULL,
gtk_marshal_VOID__BOXED_BOXED_POINTER,
G_TYPE_NONE, 3,
@ -1000,78 +998,88 @@ gtk_tree_model_get_valist (GtkTreeModel *tree_model,
}
}
/**
* gtk_tree_model_row_changed:
* @tree_model: A #GtkTreeModel
* @path: A #GtkTreePath pointing to the changed row
* @iter: A valid #GtkTreeIter pointing to the changed row
*
* Emits the "row_changed" signal on @tree_model.
**/
void
gtk_tree_model_range_changed (GtkTreeModel *tree_model,
GtkTreePath *start_path,
GtkTreeIter *start_iter,
GtkTreePath *end_path,
GtkTreeIter *end_iter)
gtk_tree_model_row_changed (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter)
{
gint i;
g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
g_return_if_fail (start_path != NULL);
g_return_if_fail (start_iter != NULL);
g_return_if_fail (end_path != NULL);
g_return_if_fail (end_iter != NULL);
g_return_if_fail (path != NULL);
g_return_if_fail (iter != NULL);
#ifndef G_DISABLE_CHECKS
g_return_if_fail (start_path->depth == end_path->depth);
for (i = 0; i < start_path->depth - 1; i++)
if (start_path->indices[i] != end_path->indices[i])
{
g_warning ("Concurrent paths were not passed in to gtk_tree_model_range_changed.\n");
return;
}
#endif
g_signal_emit_by_name (tree_model, "range_changed",
start_path, start_iter,
end_path, end_iter);
g_signal_emit_by_name (tree_model, "row_changed", path, iter);
}
/**
* gtk_tree_model_row_inserted:
* @tree_model: A #GtkTreeModel
* @path: A #GtkTreePath pointing to the inserted row
* @iter: A valid #GtkTreeIter pointing to the inserted row
*
* Emits the "row_inserted" signal on @tree_model
**/
void
gtk_tree_model_inserted (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter)
gtk_tree_model_row_inserted (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter)
{
g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
g_return_if_fail (path != NULL);
g_return_if_fail (iter != NULL);
g_signal_emit_by_name (tree_model, "inserted", path, iter);
g_signal_emit_by_name (tree_model, "row_inserted", path, iter);
}
/**
* gtk_tree_model_row_has_child_toggled:
* @tree_model: A #GtkTreeModel
* @path: A #GtkTreePath pointing to the changed row
* @iter: A valid #GtkTreeIter pointing to the changed row
*
* Emits the "row_has_child_toggled" signal on @tree_model. This should be
* called by models after the child state of a node changes.
**/
void
gtk_tree_model_has_child_toggled (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter)
gtk_tree_model_row_has_child_toggled (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter)
{
g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
g_return_if_fail (path != NULL);
g_return_if_fail (iter != NULL);
g_signal_emit_by_name (tree_model, "has_child_toggled", path, iter);
g_signal_emit_by_name (tree_model, "row_has_child_toggled", path, iter);
}
void
gtk_tree_model_deleted (GtkTreeModel *tree_model,
GtkTreePath *path)
gtk_tree_model_row_deleted (GtkTreeModel *tree_model,
GtkTreePath *path)
{
g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
g_return_if_fail (path != NULL);
g_signal_emit_by_name (tree_model, "deleted", path);
g_signal_emit_by_name (tree_model, "row_deleted", path);
}
void
gtk_tree_model_reordered (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter,
gint *new_order)
gtk_tree_model_rows_reordered (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter,
gint *new_order)
{
g_return_if_fail (GTK_IS_TREE_MODEL (tree_model));
g_return_if_fail (new_order != NULL);
g_signal_emit_by_name (tree_model, "reordered", path, iter, new_order);
g_signal_emit_by_name (tree_model, "rows_reordered", path, iter, new_order);
}
@ -1344,15 +1352,15 @@ static void
connect_ref_callbacks (GtkTreeModel *model)
{
g_signal_connect (G_OBJECT (model),
"inserted",
"row_inserted",
(GCallback) gtk_tree_row_ref_inserted_callback,
model);
g_signal_connect (G_OBJECT (model),
"deleted",
"row_deleted",
(GCallback) gtk_tree_row_ref_deleted_callback,
model);
g_signal_connect (G_OBJECT (model),
"reordered",
"rows_reordered",
(GCallback) gtk_tree_row_ref_reordered_callback,
model);
}

65
gtk/gtktreemodel.h
View File

@ -58,23 +58,21 @@ struct _GtkTreeModelIface
GTypeInterface g_iface;
/* Signals */
void (* range_changed) (GtkTreeModel *tree_model,
GtkTreePath *start_path,
GtkTreeIter *start_iter,
GtkTreePath *end_path,
GtkTreeIter *end_iter);
void (* inserted) (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter);
void (* has_child_toggled) (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter);
void (* deleted) (GtkTreeModel *tree_model,
GtkTreePath *path);
void (* reordered) (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter,
gint *new_order);
void (* row_changed) (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter);
void (* row_inserted) (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter);
void (* row_has_child_toggled) (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter);
void (* row_deleted) (GtkTreeModel *tree_model,
GtkTreePath *path);
void (* rows_reordered) (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter,
gint *new_order);
/* Virtual Table */
GtkTreeModelFlags (* get_flags) (GtkTreeModel *tree_model);
@ -220,23 +218,22 @@ void gtk_tree_model_foreach (GtkTreeModel *model
/* Signals */
void gtk_tree_model_range_changed (GtkTreeModel *tree_model,
GtkTreePath *start_path,
GtkTreeIter *start_iter,
GtkTreePath *end_path,
GtkTreeIter *end_iter);
void gtk_tree_model_inserted (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter);
void gtk_tree_model_has_child_toggled (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter);
void gtk_tree_model_deleted (GtkTreeModel *tree_model,
GtkTreePath *path);
void gtk_tree_model_reordered (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter,
gint *new_order);
void gtk_tree_model_row_changed (GtkTreeModel *tree_model,
GtkTreePath *start_path,
GtkTreeIter *start_iter);
void gtk_tree_model_row_inserted (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter);
void gtk_tree_model_row_has_child_toggled (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter);
void gtk_tree_model_row_deleted (GtkTreeModel *tree_model,
GtkTreePath *path);
void gtk_tree_model_rows_reordered (GtkTreeModel *tree_model,
GtkTreePath *path,
GtkTreeIter *iter,
gint *new_order);

146
gtk/gtktreemodelsort.c
View File

@ -60,34 +60,32 @@ struct _SortTuple
#define get_array(e,t) ((GArray *)((e)->parent?(e)->parent->children:GTK_TREE_MODEL_SORT(t)->root))
/* object init and signal handlers */
static void gtk_tree_model_sort_init (GtkTreeModelSort *tree_model_sort);
static void gtk_tree_model_sort_class_init (GtkTreeModelSortClass *tree_model_sort_class);
static void gtk_tree_model_sort_tree_model_init (GtkTreeModelIface *iface);
static void gtk_tree_model_sort_tree_sortable_init (GtkTreeSortableIface *iface);
static void gtk_tree_model_sort_finalize (GObject *object);
static void gtk_tree_model_sort_range_changed (GtkTreeModel *model,
GtkTreePath *start_path,
GtkTreeIter *start_iter,
GtkTreePath *end_path,
GtkTreeIter *end_iter,
gpointer data);
static void gtk_tree_model_sort_inserted (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data);
static void gtk_tree_model_sort_has_child_toggled (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data);
static void gtk_tree_model_sort_deleted (GtkTreeModel *model,
GtkTreePath *path,
gpointer data);
static void gtk_tree_model_sort_init (GtkTreeModelSort *tree_model_sort);
static void gtk_tree_model_sort_class_init (GtkTreeModelSortClass *tree_model_sort_class);
static void gtk_tree_model_sort_tree_model_init (GtkTreeModelIface *iface);
static void gtk_tree_model_sort_tree_sortable_init (GtkTreeSortableIface *iface);
static void gtk_tree_model_sort_finalize (GObject *object);
static void gtk_tree_model_sort_row_changed (GtkTreeModel *model,
GtkTreePath *start_path,
GtkTreeIter *start_iter,
gpointer data);
static void gtk_tree_model_sort_row_inserted (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data);
static void gtk_tree_model_sort_row_has_child_toggled (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data);
static void gtk_tree_model_sort_row_deleted (GtkTreeModel *model,
GtkTreePath *path,
gpointer data);
static void gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
GtkTreePath *s_path,
GtkTreeIter *s_iter,
gint *new_order,
gpointer data);
static void gtk_tree_model_sort_reordered (GtkTreeModel *s_model,
GtkTreePath *s_path,
GtkTreeIter *s_iter,
gint *new_order,
gpointer data);
/* TreeModel interface */
static gint gtk_tree_model_sort_get_n_columns (GtkTreeModel *tree_model);
@ -357,28 +355,28 @@ gtk_tree_model_sort_set_model (GtkTreeModelSort *tree_model_sort,
tree_model_sort->changed_id =
g_signal_connect (child_model,
"range_changed",
G_CALLBACK (gtk_tree_model_sort_range_changed),
"row_changed",
G_CALLBACK (gtk_tree_model_sort_row_changed),
tree_model_sort);
tree_model_sort->inserted_id =
g_signal_connect (child_model,
"inserted",
G_CALLBACK (gtk_tree_model_sort_inserted),
"row_inserted",
G_CALLBACK (gtk_tree_model_sort_row_inserted),
tree_model_sort);
tree_model_sort->has_child_toggled_id =
g_signal_connect (child_model,
"has_child_toggled",
G_CALLBACK (gtk_tree_model_sort_has_child_toggled),
"row_has_child_toggled",
G_CALLBACK (gtk_tree_model_sort_row_has_child_toggled),
tree_model_sort);
tree_model_sort->deleted_id =
g_signal_connect (child_model,
"deleted",
G_CALLBACK (gtk_tree_model_sort_deleted),
"row_deleted",
G_CALLBACK (gtk_tree_model_sort_row_deleted),
tree_model_sort);
tree_model_sort->reordered_id =
g_signal_connect (child_model,
"reordered",
G_CALLBACK (gtk_tree_model_sort_reordered),
"rows_reordered",
G_CALLBACK (gtk_tree_model_sort_rows_reordered),
tree_model_sort);
tree_model_sort->flags = gtk_tree_model_get_flags (child_model);
@ -484,12 +482,10 @@ gtk_tree_model_sort_finalize (GObject *object)
}
static void
gtk_tree_model_sort_range_changed (GtkTreeModel *s_model,
GtkTreePath *s_start_path,
GtkTreeIter *s_start_iter,
GtkTreePath *s_end_path,
GtkTreeIter *s_end_iter,
gpointer data)
gtk_tree_model_sort_row_changed (GtkTreeModel *s_model,
GtkTreePath *s_path,
GtkTreeIter *s_iter,
gpointer data)
{
GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data);
GtkTreePath *path;
@ -503,19 +499,19 @@ gtk_tree_model_sort_range_changed (GtkTreeModel *s_model,
gint index;
SortElt tmp;
g_return_if_fail (s_start_path != NULL || s_start_iter != NULL);
g_return_if_fail (s_path != NULL || s_iter != NULL);
if (s_start_path == NULL)
if (s_path == NULL)
{
free_s_path = TRUE;
s_start_path = gtk_tree_model_get_path (s_model, s_start_iter);
s_path = gtk_tree_model_get_path (s_model, s_iter);
}
path = gtk_tree_model_sort_convert_path_real (tree_model_sort, s_start_path, FALSE);
path = gtk_tree_model_sort_convert_path_real (tree_model_sort, s_path, FALSE);
if (path == NULL)
{
if (free_s_path)
gtk_tree_path_free (s_start_path);
gtk_tree_path_free (s_path);
return;
}
@ -527,7 +523,7 @@ gtk_tree_model_sort_range_changed (GtkTreeModel *s_model,
{
/* we're not going to care about this */
if (free_s_path)
gtk_tree_path_free (s_start_path);
gtk_tree_path_free (s_path);
gtk_tree_path_free (path);
return;
}
@ -566,12 +562,11 @@ gtk_tree_model_sort_range_changed (GtkTreeModel *s_model,
g_array_insert_val (array, index, tmp);
gtk_tree_model_range_changed (GTK_TREE_MODEL (data), path, &iter,
path, &iter);
gtk_tree_model_row_changed (GTK_TREE_MODEL (data), path, &iter);
gtk_tree_path_free (path);
if (free_s_path)
gtk_tree_path_free (s_start_path);
gtk_tree_path_free (s_path);
}
/* Returns FALSE if the value was inserted, TRUE otherwise */
@ -669,10 +664,10 @@ gtk_tree_model_sort_insert_value (GtkTreeModelSort *tree_model_sort,
}
static void
gtk_tree_model_sort_inserted (GtkTreeModel *s_model,
GtkTreePath *s_path,
GtkTreeIter *s_iter,
gpointer data)
gtk_tree_model_sort_row_inserted (GtkTreeModel *s_model,
GtkTreePath *s_path,
GtkTreeIter *s_iter,
gpointer data)
{
GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data);
GtkTreePath *path;
@ -714,15 +709,15 @@ gtk_tree_model_sort_inserted (GtkTreeModel *s_model,
gtk_tree_model_get_iter (GTK_TREE_MODEL (data), &iter, path);
tree_model_sort->stamp++;
gtk_tree_model_inserted (GTK_TREE_MODEL (data), path, &iter);
gtk_tree_model_row_inserted (GTK_TREE_MODEL (data), path, &iter);
gtk_tree_path_free (path);
}
static void
gtk_tree_model_sort_has_child_toggled (GtkTreeModel *s_model,
GtkTreePath *s_path,
GtkTreeIter *s_iter,
gpointer data)
gtk_tree_model_sort_row_has_child_toggled (GtkTreeModel *s_model,
GtkTreePath *s_path,
GtkTreeIter *s_iter,
gpointer data)
{
GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data);
GtkTreePath *path;
@ -746,16 +741,16 @@ gtk_tree_model_sort_has_child_toggled (GtkTreeModel *s_model,
path = gtk_tree_model_sort_convert_path_real (tree_model_sort, s_path, FALSE); if (path == NULL)
return;
gtk_tree_model_get_iter (GTK_TREE_MODEL (data), &iter, path);
gtk_tree_model_has_child_toggled (GTK_TREE_MODEL (data), path, &iter);
gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (data), path, &iter);
gtk_tree_path_free (path);
if (free_s_path)
gtk_tree_path_free (s_path);
}
static void
gtk_tree_model_sort_deleted (GtkTreeModel *s_model,
GtkTreePath *s_path,
gpointer data)
gtk_tree_model_sort_row_deleted (GtkTreeModel *s_model,
GtkTreePath *s_path,
gpointer data)
{
GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data);
GtkTreePath *path;
@ -808,17 +803,17 @@ gtk_tree_model_sort_deleted (GtkTreeModel *s_model,
}
}
gtk_tree_model_deleted (GTK_TREE_MODEL (data), path);
gtk_tree_model_row_deleted (GTK_TREE_MODEL (data), path);
tree_model_sort->stamp++;
gtk_tree_path_free (path);
}
static void
gtk_tree_model_sort_reordered (GtkTreeModel *s_model,
GtkTreePath *s_path,
GtkTreeIter *s_iter,
gint *new_order,
gpointer data)
gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model,
GtkTreePath *s_path,
GtkTreeIter *s_iter,
gint *new_order,
gpointer data)
{
gint i = 0;
GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data);
@ -826,7 +821,6 @@ gtk_tree_model_sort_reordered (GtkTreeModel *s_model,
GtkTreeIter iter;
SortElt *elt = NULL;
GArray *array;
GArray *new_array;
gint len;
/* header is used for checking if we can already sort things */
@ -1615,16 +1609,16 @@ gtk_tree_model_sort_sort_helper (GtkTreeModelSort *tree_model_sort,
{
path = gtk_tree_model_sort_generate_path (iter.user_data);
gtk_tree_model_reordered (GTK_TREE_MODEL (tree_model_sort), path,
&iter, new_order);
gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_model_sort), path,
&iter, new_order);
}
else
{
/* toplevel list */
path = gtk_tree_path_new ();
gtk_tree_model_reordered (GTK_TREE_MODEL (tree_model_sort),
path, NULL, new_order);
gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_model_sort),
path, NULL, new_order);
}
gtk_tree_path_free (path);

34
gtk/gtktreestore.c
View File

@ -753,7 +753,7 @@ gtk_tree_store_set_value (GtkTreeStore *tree_store,
_gtk_tree_data_list_value_to_node (list, &real_value);
else
_gtk_tree_data_list_value_to_node (list, value);
gtk_tree_model_range_changed (GTK_TREE_MODEL (tree_store), path, iter, path, iter);
gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_path_free (path);
if (converted)
g_value_unset (&real_value);
@ -787,7 +787,7 @@ gtk_tree_store_set_value (GtkTreeStore *tree_store,
_gtk_tree_data_list_value_to_node (list, &real_value);
else
_gtk_tree_data_list_value_to_node (list, value);
gtk_tree_model_range_changed (GTK_TREE_MODEL (tree_store), path, iter, path, iter);
gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_path_free (path);
if (converted)
g_value_unset (&real_value);
@ -915,7 +915,7 @@ gtk_tree_store_remove (GtkTreeStore *tree_store,
g_node_destroy (G_NODE (iter->user_data));
tree_store->stamp++;
gtk_tree_model_deleted (GTK_TREE_MODEL (tree_store), path);
gtk_tree_model_row_deleted (GTK_TREE_MODEL (tree_store), path);
if (parent != G_NODE (tree_store->root))
{
@ -926,7 +926,7 @@ gtk_tree_store_remove (GtkTreeStore *tree_store,
new_iter.stamp = tree_store->stamp;
new_iter.user_data = parent;
gtk_tree_model_has_child_toggled (GTK_TREE_MODEL (tree_store), path, &new_iter);
gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, &new_iter);
}
}
gtk_tree_path_free (path);
@ -982,7 +982,7 @@ gtk_tree_store_insert (GtkTreeStore *tree_store,
g_node_insert (parent_node, position, G_NODE (iter->user_data));
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
gtk_tree_model_inserted (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_path_free (path);
@ -1046,7 +1046,7 @@ gtk_tree_store_insert_before (GtkTreeStore *tree_store,
iter->user_data = new_node;
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
gtk_tree_model_inserted (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_path_free (path);
@ -1112,7 +1112,7 @@ gtk_tree_store_insert_after (GtkTreeStore *tree_store,
iter->user_data = new_node;
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
gtk_tree_model_inserted (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_path_free (path);
@ -1160,14 +1160,14 @@ gtk_tree_store_prepend (GtkTreeStore *tree_store,
if (parent_node != tree_store->root)
{
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), parent);
gtk_tree_model_has_child_toggled (GTK_TREE_MODEL (tree_store), path, parent);
gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, parent);
gtk_tree_path_append_index (path, 0);
}
else
{
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
}
gtk_tree_model_inserted (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_path_free (path);
}
else
@ -1220,7 +1220,7 @@ gtk_tree_store_append (GtkTreeStore *tree_store,
if (parent_node != tree_store->root)
{
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), parent);
gtk_tree_model_has_child_toggled (GTK_TREE_MODEL (tree_store), path, parent);
gtk_tree_model_row_has_child_toggled (GTK_TREE_MODEL (tree_store), path, parent);
gtk_tree_path_append_index (path, 0);
}
else
@ -1228,7 +1228,7 @@ gtk_tree_store_append (GtkTreeStore *tree_store,
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), iter);
}
gtk_tree_model_inserted (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_model_row_inserted (GTK_TREE_MODEL (tree_store), path, iter);
gtk_tree_path_free (path);
}
else
@ -1390,7 +1390,7 @@ copy_node_data (GtkTreeStore *tree_store,
G_NODE (dest_iter->user_data)->data = copy_head;
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), dest_iter);
gtk_tree_model_range_changed (GTK_TREE_MODEL (tree_store), path, dest_iter, path, dest_iter);
gtk_tree_model_row_changed (GTK_TREE_MODEL (tree_store), path, dest_iter);
gtk_tree_path_free (path);
}
@ -1701,8 +1701,8 @@ gtk_tree_store_sort_helper (GtkTreeStore *tree_store,
iter.stamp = tree_store->stamp;
iter.user_data = parent;
path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), &iter);
gtk_tree_model_reordered (GTK_TREE_MODEL (tree_store),
path, &iter, new_order);
gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store),
path, &iter, new_order);
gtk_tree_path_free (path);
g_free (new_order);
g_array_free (sort_array, TRUE);
@ -1917,9 +1917,9 @@ gtk_tree_store_sort_iter_changed (GtkTreeStore *tree_store,
tmp_iter.user_data = node->parent;
tmp_path = gtk_tree_store_get_path (GTK_TREE_MODEL (tree_store), &tmp_iter);
gtk_tree_model_reordered (GTK_TREE_MODEL (tree_store),
tmp_path, &tmp_iter,
new_order);
gtk_tree_model_rows_reordered (GTK_TREE_MODEL (tree_store),
tmp_path, &tmp_iter,
new_order);
gtk_tree_path_free (tmp_path);
g_free (new_order);

86
gtk/gtktreeview.c
View File

@ -230,24 +230,22 @@ static void gtk_tree_view_real_expand_collapse_cursor_row (GtkTreeView *tree
gboolean expand,
gboolean open_all);
static void gtk_tree_view_real_select_cursor_parent (GtkTreeView *tree_view);
static void gtk_tree_view_range_changed (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
GtkTreePath *end_path,
GtkTreeIter *end_iter,
gpointer data);
static void gtk_tree_view_inserted (GtkTreeModel *model,
static void gtk_tree_view_row_changed (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data);
static void gtk_tree_view_has_child_toggled (GtkTreeModel *model,
static void gtk_tree_view_row_inserted (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data);
static void gtk_tree_view_deleted (GtkTreeModel *model,
static void gtk_tree_view_row_has_child_toggled (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data);
static void gtk_tree_view_row_deleted (GtkTreeModel *model,
GtkTreePath *path,
gpointer data);
static void gtk_tree_view_reordered (GtkTreeModel *model,
static void gtk_tree_view_rows_reordered (GtkTreeModel *model,
GtkTreePath *parent,
GtkTreeIter *iter,
gint *new_order,
@ -4261,11 +4259,9 @@ gtk_tree_view_real_move_cursor (GtkTreeView *tree_view,
*/
static void
gtk_tree_view_range_changed (GtkTreeModel *model,
gtk_tree_view_row_changed (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
GtkTreePath *end_path,
GtkTreeIter *end_iter,
gpointer data)
{
GtkTreeView *tree_view = (GtkTreeView *)data;
@ -4322,10 +4318,10 @@ gtk_tree_view_range_changed (GtkTreeModel *model,
}
static void
gtk_tree_view_inserted (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data)
gtk_tree_view_row_inserted (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data)
{
GtkTreeView *tree_view = (GtkTreeView *) data;
gint *indices;
@ -4382,7 +4378,7 @@ gtk_tree_view_inserted (GtkTreeModel *model,
GtkTreePath *tmppath = _gtk_tree_view_find_path (tree_view,
tree,
tmpnode);
gtk_tree_view_has_child_toggled (model, tmppath, NULL, data);
gtk_tree_view_row_has_child_toggled (model, tmppath, NULL, data);
gtk_tree_path_free (tmppath);
goto done;
}
@ -4420,10 +4416,10 @@ gtk_tree_view_inserted (GtkTreeModel *model,
}
static void
gtk_tree_view_has_child_toggled (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data)
gtk_tree_view_row_has_child_toggled (GtkTreeModel *model,
GtkTreePath *path,
GtkTreeIter *iter,
gpointer data)
{
GtkTreeView *tree_view = (GtkTreeView *)data;
GtkTreeIter real_iter;
@ -4505,9 +4501,9 @@ count_children_helper (GtkRBTree *tree,
}
static void
gtk_tree_view_deleted (GtkTreeModel *model,
GtkTreePath *path,
gpointer data)
gtk_tree_view_row_deleted (GtkTreeModel *model,
GtkTreePath *path,
gpointer data)
{
GtkTreeView *tree_view = (GtkTreeView *)data;
GtkRBTree *tree;
@ -4576,11 +4572,11 @@ gtk_tree_view_deleted (GtkTreeModel *model,
static void
gtk_tree_view_reordered (GtkTreeModel *model,
GtkTreePath *parent,
GtkTreeIter *iter,
gint *new_order,
gpointer data)
gtk_tree_view_rows_reordered (GtkTreeModel *model,
GtkTreePath *parent,
GtkTreeIter *iter,
gint *new_order,
gpointer data)
{
GtkTreeView *tree_view = GTK_TREE_VIEW (data);
GtkRBTree *tree;
@ -6269,15 +6265,15 @@ gtk_tree_view_set_model (GtkTreeView *tree_view,
gtk_tree_view_unref_and_check_selection_tree (tree_view, tree_view->priv->tree);
g_signal_handlers_disconnect_by_func (G_OBJECT (tree_view->priv->model),
gtk_tree_view_range_changed, tree_view);
gtk_tree_view_row_changed, tree_view);
g_signal_handlers_disconnect_by_func (G_OBJECT (tree_view->priv->model),
gtk_tree_view_inserted, tree_view);
gtk_tree_view_row_inserted, tree_view);
g_signal_handlers_disconnect_by_func (G_OBJECT (tree_view->priv->model),
gtk_tree_view_has_child_toggled, tree_view);
gtk_tree_view_row_has_child_toggled, tree_view);
g_signal_handlers_disconnect_by_func (G_OBJECT (tree_view->priv->model),
gtk_tree_view_deleted, tree_view);
gtk_tree_view_row_deleted, tree_view);
g_signal_handlers_disconnect_by_func (G_OBJECT (tree_view->priv->model),
gtk_tree_view_reordered, tree_view);
gtk_tree_view_rows_reordered, tree_view);
if (tree_view->priv->tree)
{
_gtk_rbtree_free (tree_view->priv->tree);
@ -6317,24 +6313,24 @@ gtk_tree_view_set_model (GtkTreeView *tree_view,
}
g_object_ref (tree_view->priv->model);
g_signal_connect (tree_view->priv->model,
"range_changed",
G_CALLBACK (gtk_tree_view_range_changed),
"row_changed",
G_CALLBACK (gtk_tree_view_row_changed),
tree_view);
g_signal_connect (tree_view->priv->model,
"inserted",
G_CALLBACK (gtk_tree_view_inserted),
"row_inserted",
G_CALLBACK (gtk_tree_view_row_inserted),
tree_view);
g_signal_connect (tree_view->priv->model,
"has_child_toggled",
G_CALLBACK (gtk_tree_view_has_child_toggled),
"row_has_child_toggled",
G_CALLBACK (gtk_tree_view_row_has_child_toggled),
tree_view);
g_signal_connect (tree_view->priv->model,
"deleted",
G_CALLBACK (gtk_tree_view_deleted),
"row_deleted",
G_CALLBACK (gtk_tree_view_row_deleted),
tree_view);
g_signal_connect (tree_view->priv->model,
"reordered",
G_CALLBACK (gtk_tree_view_reordered),
"rows_reordered",
G_CALLBACK (gtk_tree_view_rows_reordered),
tree_view);
path = gtk_tree_path_new_root ();

14
tests/testtreecolumns.c
View File

@ -312,14 +312,14 @@ update_columns (GtkTreeView *view, ViewColumnModel *view_model)
if (length < old_length)
{
view_model->stamp++;
gtk_tree_model_deleted (GTK_TREE_MODEL (view_model), path);
gtk_tree_model_row_deleted (GTK_TREE_MODEL (view_model), path);
}
else
{
GtkTreeIter iter;
iter.stamp = view_model->stamp;
iter.user_data = b;
gtk_tree_model_inserted (GTK_TREE_MODEL (view_model), path, &iter);
gtk_tree_model_row_inserted (GTK_TREE_MODEL (view_model), path, &iter);
}
gtk_tree_path_free (path);
}
@ -376,10 +376,10 @@ update_columns (GtkTreeView *view, ViewColumnModel *view_model)
}
path = gtk_tree_path_new ();
gtk_tree_model_reordered (GTK_TREE_MODEL (view_model),
path,
NULL,
new_order);
gtk_tree_model_rows_reordered (GTK_TREE_MODEL (view_model),
path,
NULL,
new_order);
gtk_tree_path_free (path);
g_free (new_order);
}
@ -464,7 +464,7 @@ set_visible (GtkCellRendererToggle *cell,
if (column)
{
gtk_tree_view_column_set_visible (column, ! gtk_tree_view_column_get_visible (column));
gtk_tree_model_range_changed (model, path, &iter, path, &iter);
gtk_tree_model_row_changed (model, path, &iter);
}
gtk_tree_path_free (path);
}