GitLab repository storage has been migrated to hashed layout. Please contact Infrastructure team if you notice any issues with repositories or hooks.

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

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

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!
parent 15a544de
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
......
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
......
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
......
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
......
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
......
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
......
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
......
......@@ -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.
......
......@@ -135,6 +135,11 @@ Set the shadow type for the Frame widget.
</para>
<!-- ##### ARG GtkFrame:shadow-type ##### -->
<para>
</para>
<!-- ##### ARG GtkFrame:label-widget ##### -->
<para>
......
......@@ -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.
......
......@@ -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:
......
......@@ -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:
......
......@@ -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);
......
......@@ -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
......
......@@ -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
......
......@@ -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),
G_STRUCT_OFFSET (GtkTreeModelIface, row_changed),
NULL, NULL,
gtk_marshal_VOID__BOXED_BOXED_BOXED_BOXED,
G_TYPE_NONE, 4,
GTK_TYPE_TREE_PATH,
GTK_TYPE_TREE_ITER,
gtk_marshal_VOID__BOXED_BOXED,
G_TYPE_NONE, 2,
GTK_TYPE_TREE_PATH,
GTK_TYPE_TREE_ITER);
g_signal_new ("inserted",
g_signal_new ("row_inserted",
GTK_TYPE_TREE_MODEL,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTreeModelIface, inserted),
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 ("has_child_toggled",
g_signal_new ("row_has_child_toggled",
GTK_TYPE_TREE_MODEL,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTreeModelIface, has_child_toggled),
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 ("deleted",
g_signal_new ("row_deleted",
GTK_TYPE_TREE_MODEL,
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (GtkTreeModelIface, deleted),
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);
#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_return_if_fail (path != NULL);
g_return_if_fail (iter != NULL);
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);
}
......
......@@ -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);
......
......@@ -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);