[gtk+/gi-annotations: 10/10] Update GI annotations in 'Tree, List and Icon Grid Widgets', pt. I
- From: Pavel Holejsovsky <pholejs src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gi-annotations: 10/10] Update GI annotations in 'Tree, List and Icon Grid Widgets', pt. I
- Date: Mon, 10 Jan 2011 16:05:03 +0000 (UTC)
commit bc4f32c7755ad8dee47fd237e52c27bfa4523c4a
Author: Pavel Holejsovsky <pavel holejsovsky gmail com>
Date: Mon Jan 10 17:00:22 2011 +0100
Update GI annotations in 'Tree, List and Icon Grid Widgets', pt. I
'Tree, List and Icon Grid Widgets' group from GTK+ manual, this patch
goes through: GtkTreeModel, GtkTreeSelection, GtkTreeViewColumn,
GtkTreeView, GtkTreeView drag-and-drop, GtkCellView, GtkIconView,
GtkTreeSortable, GtkTreeModelSort, GtkTreeModelFilter.
gtk/gtkcellview.c | 2 +-
gtk/gtkiconview.c | 40 +++++++++++++++++++--------------
gtk/gtktreednd.c | 7 +++--
gtk/gtktreemodel.c | 14 +++++-----
gtk/gtktreemodelfilter.c | 10 ++++----
gtk/gtktreemodelfilter.h | 4 +-
gtk/gtktreeselection.h | 4 +-
gtk/gtktreesortable.c | 8 +++---
gtk/gtktreeview.c | 56 +++++++++++++++++++++++----------------------
gtk/gtktreeview.h | 6 ++--
gtk/gtktreeviewcolumn.c | 17 +++++++------
11 files changed, 89 insertions(+), 79 deletions(-)
---
diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index 168bf04..3d11c88 100644
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -1177,7 +1177,7 @@ gtk_cell_view_get_displayed_row (GtkCellView *cell_view)
* gtk_cell_view_get_size_of_row:
* @cell_view: a #GtkCellView
* @path: a #GtkTreePath
- * @requisition: return location for the size
+ * @requisition: (out): return location for the size
*
* Sets @requisition to the size needed by @cell_view to display
* the model row pointed to by @path.
diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
index 47dc4c7..5bd16dc 100644
--- a/gtk/gtkiconview.c
+++ b/gtk/gtkiconview.c
@@ -1934,8 +1934,9 @@ gtk_icon_view_set_cursor (GtkIconView *icon_view,
/**
* gtk_icon_view_get_cursor:
* @icon_view: A #GtkIconView
- * @path: (allow-none): Return location for the current cursor path, or %NULL
- * @cell: (allow-none): Return location the current focus cell, or %NULL
+ * @path: (out) (allow-none): Return location for the current cursor path,
+ * or %NULL
+ * @cell: (out) (allow-none): Return location the current focus cell, or %NULL
*
* Fills in @path and @cell with the current cursor path and cell.
* If the cursor isn't currently set, then * path will be %NULL.
@@ -4202,8 +4203,8 @@ gtk_icon_view_new_with_model (GtkTreeModel *model)
* @icon_view: a #GtkIconView
* @wx: X coordinate relative to the widget
* @wy: Y coordinate relative to the widget
- * @bx: return location for bin_window X coordinate
- * @by: return location for bin_window Y coordinate
+ * @bx: (out): return location for bin_window X coordinate
+ * @by: (out): return location for bin_window Y coordinate
*
* Converts widget coordinates to coordinates for the bin_window,
* as expected by e.g. gtk_icon_view_get_path_at_pos().
@@ -4274,9 +4275,9 @@ gtk_icon_view_get_path_at_pos (GtkIconView *icon_view,
* @icon_view: A #GtkIconView.
* @x: The x position to be identified
* @y: The y position to be identified
- * @path: (allow-none): Return location for the path, or %NULL
- * @cell: Return location for the renderer responsible for the cell
- * at (@x, @y), or %NULL
+ * @path: (out) (allow-none): Return location for the path, or %NULL
+ * @cell: (out) (allow-none): Return location for the renderer
+ * responsible for the cell at (@x, @y), or %NULL
*
* Finds the path at the point (@x, @y), relative to bin_window coordinates.
* In contrast to gtk_icon_view_get_path_at_pos(), this function also
@@ -4562,7 +4563,7 @@ gtk_icon_view_set_tooltip_column (GtkIconView *icon_view,
g_object_notify (G_OBJECT (icon_view), "tooltip-column");
}
-/**
+/**
* gtk_icon_view_get_tooltip_column:
* @icon_view: a #GtkIconView
*
@@ -4585,8 +4586,9 @@ gtk_icon_view_get_tooltip_column (GtkIconView *icon_view)
/**
* gtk_icon_view_get_visible_range:
* @icon_view: A #GtkIconView
- * @start_path: (allow-none): Return location for start of region, or %NULL
- * @end_path: (allow-none): Return location for end of region, or %NULL
+ * @start_path: (out) (allow-none): Return location for start of region,
+ * or %NULL
+ * @end_path: (out) (allow-none): Return location for end of region, or %NULL
*
* Sets @start_path and @end_path to be the first and last visible path.
* Note that there may be invisible paths in between.
@@ -6548,7 +6550,8 @@ gtk_icon_view_drag_data_received (GtkWidget *widget,
* gtk_icon_view_enable_model_drag_source:
* @icon_view: a #GtkIconTreeView
* @start_button_mask: Mask of allowed buttons to start drag
- * @targets: the table of targets that the drag will support
+ * @targets: (array length=n_targets): the table of targets that
+ * the drag will support
* @n_targets: the number of items in @targets
* @actions: the bitmask of possible actions for a drag from this
* widget
@@ -6580,7 +6583,8 @@ gtk_icon_view_enable_model_drag_source (GtkIconView *icon_view,
/**
* gtk_icon_view_enable_model_drag_dest:
* @icon_view: a #GtkIconView
- * @targets: the table of targets that the drag will support
+ * @targets: (array length=n_targets): the table of targets that
+ * the drag will support
* @n_targets: the number of items in @targets
* @actions: the bitmask of possible actions for a drag to this
* widget
@@ -6716,8 +6720,9 @@ gtk_icon_view_set_drag_dest_item (GtkIconView *icon_view,
/**
* gtk_icon_view_get_drag_dest_item:
* @icon_view: a #GtkIconView
- * @path: (allow-none): Return location for the path of the highlighted item, or %NULL.
- * @pos: (allow-none): Return location for the drop position, or %NULL
+ * @path: (out) (allow-none): Return location for the path of
+ * the highlighted item, or %NULL.
+ * @pos: (out) (allow-none): Return location for the drop position, or %NULL
*
* Gets information about the item that is highlighted for feedback.
*
@@ -6747,8 +6752,9 @@ gtk_icon_view_get_drag_dest_item (GtkIconView *icon_view,
* @icon_view: a #GtkIconView
* @drag_x: the position to determine the destination item for
* @drag_y: the position to determine the destination item for
- * @path: (allow-none): Return location for the path of the item, or %NULL.
- * @pos: (allow-none): Return location for the drop position, or %NULL
+ * @path: (out) (allow-none): Return location for the path of the item,
+ * or %NULL.
+ * @pos: (out) (allow-none): Return location for the drop position, or %NULL
*
* Determines the destination item for a given position.
*
@@ -6814,7 +6820,7 @@ gtk_icon_view_get_dest_item_at_pos (GtkIconView *icon_view,
* Creates a #cairo_surface_t representation of the item at @path.
* This image is used for a drag icon.
*
- * Return value: (transfer full) a newly-allocated surface of the drag icon.
+ * Return value: (transfer full): a newly-allocated surface of the drag icon.
*
* Since: 2.8
**/
diff --git a/gtk/gtktreednd.c b/gtk/gtktreednd.c
index 68cc171..367fbd6 100644
--- a/gtk/gtktreednd.c
+++ b/gtk/gtktreednd.c
@@ -159,7 +159,8 @@ gtk_tree_drag_source_drag_data_delete (GtkTreeDragSource *drag_source,
* gtk_tree_drag_source_drag_data_get:
* @drag_source: a #GtkTreeDragSource
* @path: row that was dragged
- * @selection_data: a #GtkSelectionData to fill with data from the dragged row
+ * @selection_data: (out): a #GtkSelectionData to fill with data
+ * from the dragged row
*
* Asks the #GtkTreeDragSource to fill in @selection_data with a
* representation of the row at @path. @selection_data->target gives
@@ -306,8 +307,8 @@ gtk_tree_set_row_drag_data (GtkSelectionData *selection_data,
/**
* gtk_tree_get_row_drag_data:
* @selection_data: a #GtkSelectionData
- * @tree_model: a #GtkTreeModel
- * @path: row in @tree_model
+ * @tree_model: (out): a #GtkTreeModel
+ * @path: (out): row in @tree_model
*
* Obtains a @tree_model and @path from selection data of target type
* %GTK_TREE_MODEL_ROW. Normally called from a drag_data_received handler.
diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c
index 7b6622f..5456199 100644
--- a/gtk/gtktreemodel.c
+++ b/gtk/gtktreemodel.c
@@ -251,7 +251,7 @@ gtk_tree_model_base_init (gpointer g_class)
row_deleted_params);
/**
- * GtkTreeModel::rows-reordered:
+ * GtkTreeModel::rows-reordered: (skip)
* @tree_model: the #GtkTreeModel on which the signal is emitted
* @path: a #GtkTreePath identifying the tree node whose children
* have been reordered
@@ -961,7 +961,7 @@ gtk_tree_model_get_n_columns (GtkTreeModel *tree_model)
*
* Returns the type of the column.
*
- * Return value: (transfer none): The type of the column.
+ * Return value: The type of the column.
**/
GType
gtk_tree_model_get_column_type (GtkTreeModel *tree_model,
@@ -1131,7 +1131,7 @@ gtk_tree_model_get_path (GtkTreeModel *tree_model,
* @tree_model: A #GtkTreeModel.
* @iter: The #GtkTreeIter.
* @column: The column to lookup the value at.
- * @value: (out) (transfer none): An empty #GValue to set.
+ * @value: (out): An empty #GValue to set.
*
* Initializes and sets @value to that at @column.
* When done with @value, g_value_unset() needs to be called
@@ -1158,7 +1158,7 @@ gtk_tree_model_get_value (GtkTreeModel *tree_model,
/**
* gtk_tree_model_iter_next:
* @tree_model: A #GtkTreeModel.
- * @iter: (in): The #GtkTreeIter.
+ * @iter: The #GtkTreeIter.
*
* Sets @iter to point to the node following it at the current level. If there
* is no next @iter, %FALSE is returned and @iter is set to be invalid.
@@ -1204,7 +1204,7 @@ gtk_tree_model_iter_previous_default (GtkTreeModel *tree_model,
/**
* gtk_tree_model_iter_previous:
* @tree_model: a #GtkTreeModel
- * @iter: (inout): the #GtkTreeIter
+ * @iter: the #GtkTreeIter
*
* Sets @iter to point to the previous node at the current level. If there
* is no previous @iter, %FALSE is returned and @iter is set to be invalid.
@@ -1606,7 +1606,7 @@ gtk_tree_model_row_deleted (GtkTreeModel *tree_model,
}
/**
- * gtk_tree_model_rows_reordered:
+ * gtk_tree_model_rows_reordered: (skip)
* @tree_model: A #GtkTreeModel
* @path: A #GtkTreePath pointing to the tree node whose children have been
* reordered
@@ -2199,7 +2199,7 @@ gtk_tree_row_reference_deleted (GObject *proxy,
}
/**
- * gtk_tree_row_reference_reordered:
+ * gtk_tree_row_reference_reordered: (skip)
* @proxy: A #GObject
* @path: The parent path of the reordered signal
* @iter: The iter pointing to the parent of the reordered
diff --git a/gtk/gtktreemodelfilter.c b/gtk/gtktreemodelfilter.c
index 18e0d59..f8431b9 100644
--- a/gtk/gtktreemodelfilter.c
+++ b/gtk/gtktreemodelfilter.c
@@ -3113,8 +3113,8 @@ gtk_tree_model_filter_get_model (GtkTreeModelFilter *filter)
* gtk_tree_model_filter_set_visible_func:
* @filter: A #GtkTreeModelFilter.
* @func: A #GtkTreeModelFilterVisibleFunc, the visible function.
- * @data: (allow-none): User data to pass to the visible function, or %NULL.
- * @destroy: (allow-none): Destroy notifier of @data, or %NULL.
+ * @data: User data to pass to the visible function, or %NULL.
+ * @destroy: Destroy notifier of @data, or %NULL.
*
* Sets the visible function used when filtering the @filter to be @func. The
* function should return %TRUE if the given row should be visible and
@@ -3171,10 +3171,10 @@ gtk_tree_model_filter_set_visible_func (GtkTreeModelFilter *filter,
* gtk_tree_model_filter_set_modify_func:
* @filter: A #GtkTreeModelFilter.
* @n_columns: The number of columns in the filter model.
- * @types: The #GType<!-- -->s of the columns.
+ * @types: (array length=n_columns): The #GType<!-- -->s of the columns.
* @func: A #GtkTreeModelFilterModifyFunc
- * @data: (allow-none): User data to pass to the modify function, or %NULL.
- * @destroy: (allow-none): Destroy notifier of @data, or %NULL.
+ * @data: User data to pass to the modify function, or %NULL.
+ * @destroy: Destroy notifier of @data, or %NULL.
*
* With the @n_columns and @types parameters, you give an array of column
* types for this model (which will be exposed to the parent model/view).
diff --git a/gtk/gtktreemodelfilter.h b/gtk/gtktreemodelfilter.h
index b8c3376..b887a0a 100644
--- a/gtk/gtktreemodelfilter.h
+++ b/gtk/gtktreemodelfilter.h
@@ -41,7 +41,7 @@ G_BEGIN_DECLS
* @model: the child model of the #GtkTreeModelFilter
* @iter: a #GtkTreeIter pointing to the row in @model whose visibility
* is determined
- * @data: user data given to gtk_tree_model_filter_set_visible_func()
+ * @data: (closure): user data given to gtk_tree_model_filter_set_visible_func()
*
* A function which decides whether the row indicated by @iter is visible.
*
@@ -58,7 +58,7 @@ typedef gboolean (* GtkTreeModelFilterVisibleFunc) (GtkTreeModel *model,
* @value: A #GValue which is already initialized for with the correct type for
* the column @column.
* @column: the column whose display value is determined
- * @data: user data given to gtk_tree_model_filter_set_modify_func()
+ * @data: (closure): user data given to gtk_tree_model_filter_set_modify_func()
*
* A function which calculates display values from raw values in the model.
* It must fill @value with the display value for the column @column in the
diff --git a/gtk/gtktreeselection.h b/gtk/gtktreeselection.h
index 36cfafa..9dfdb9f 100644
--- a/gtk/gtktreeselection.h
+++ b/gtk/gtktreeselection.h
@@ -44,7 +44,7 @@ typedef struct _GtkTreeSelectionPrivate GtkTreeSelectionPrivate;
* @model: A #GtkTreeModel being viewed
* @path: The #GtkTreePath of the row in question
* @path_currently_selected: %TRUE, if the path is currently selected
- * @data: user data
+ * @data: (closure): user data
*
* A function used by gtk_tree_selection_set_select_function() to filter
* whether or not a row may be selected. It is called whenever a row's
@@ -64,7 +64,7 @@ typedef gboolean (* GtkTreeSelectionFunc) (GtkTreeSelection *selection,
* @model: The #GtkTreeModel being viewed
* @path: The #GtkTreePath of a selected row
* @iter: A #GtkTreeIter pointing to a selected row
- * @data: user data
+ * @data: (closure): user data
*
* A function used by gtk_tree_selection_selected_foreach() to map all
* selected rows. It will be called on every selected row in the view.
diff --git a/gtk/gtktreesortable.c b/gtk/gtktreesortable.c
index 111a3e5..f8b09a0 100644
--- a/gtk/gtktreesortable.c
+++ b/gtk/gtktreesortable.c
@@ -182,8 +182,8 @@ gtk_tree_sortable_set_sort_column_id (GtkTreeSortable *sortable,
* @sortable: A #GtkTreeSortable
* @sort_column_id: the sort column id to set the function for
* @sort_func: The comparison function
- * @user_data: (allow-none): User data to pass to @sort_func, or %NULL
- * @destroy: (allow-none): Destroy notifier of @user_data, or %NULL
+ * @user_data: User data to pass to @sort_func, or %NULL
+ * @destroy: Destroy notifier of @user_data, or %NULL
*
* Sets the comparison function used when sorting to be @sort_func. If the
* current sort column id of @sortable is the same as @sort_column_id, then
@@ -214,8 +214,8 @@ gtk_tree_sortable_set_sort_func (GtkTreeSortable *sortable,
* gtk_tree_sortable_set_default_sort_func:
* @sortable: A #GtkTreeSortable
* @sort_func: The comparison function
- * @user_data: (allow-none): User data to pass to @sort_func, or %NULL
- * @destroy: (allow-none): Destroy notifier of @user_data, or %NULL
+ * @user_data: User data to pass to @sort_func, or %NULL
+ * @destroy: Destroy notifier of @user_data, or %NULL
*
* Sets the default comparison function used when sorting to be @sort_func.
* If the current sort column id of @sortable is
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 76b748f..1b22266 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -13583,7 +13583,7 @@ gtk_tree_view_get_cell_area_y_offset (GtkTreeView *tree_view,
* @tree_view: a #GtkTreeView
* @path: (allow-none): a #GtkTreePath for the row, or %NULL to get only horizontal coordinates
* @column: (allow-none): a #GtkTreeViewColumn for the column, or %NULL to get only vertical coordinates
- * @rect: rectangle to fill with cell rect
+ * @rect: (out): rectangle to fill with cell rect
*
* Fills the bounding rectangle in bin_window coordinates for the cell at the
* row specified by @path and the column specified by @column. If @path is
@@ -13716,7 +13716,7 @@ gtk_tree_view_get_row_y_offset (GtkTreeView *tree_view,
* @tree_view: a #GtkTreeView
* @path: (allow-none): a #GtkTreePath for the row, or %NULL to get only horizontal coordinates
* @column: (allow-none): a #GtkTreeViewColumn for the column, or %NULL to get only vertical coordiantes
- * @rect: rectangle to fill with cell background rect
+ * @rect: (out): rectangle to fill with cell background rect
*
* Fills the bounding rectangle in bin_window coordinates for the cell at the
* row specified by @path and the column specified by @column. If @path is
@@ -13771,7 +13771,7 @@ gtk_tree_view_get_background_area (GtkTreeView *tree_view,
/**
* gtk_tree_view_get_visible_rect:
* @tree_view: a #GtkTreeView
- * @visible_rect: rectangle to fill
+ * @visible_rect: (out): rectangle to fill
*
* Fills @visible_rect with the currently-visible region of the
* buffer, in tree coordinates. Convert to bin_window coordinates with
@@ -13805,8 +13805,8 @@ gtk_tree_view_get_visible_rect (GtkTreeView *tree_view,
* @tree_view: a #GtkTreeView
* @wx: X coordinate relative to the widget
* @wy: Y coordinate relative to the widget
- * @tx: return location for tree X coordinate
- * @ty: return location for tree Y coordinate
+ * @tx: (out): return location for tree X coordinate
+ * @ty: (out): return location for tree Y coordinate
*
* Converts widget coordinates to coordinates for the
* tree (the full scrollable area of the tree).
@@ -13837,8 +13837,8 @@ gtk_tree_view_convert_widget_to_tree_coords (GtkTreeView *tree_view,
* @tree_view: a #GtkTreeView
* @tx: X coordinate relative to the tree
* @ty: Y coordinate relative to the tree
- * @wx: return location for widget X coordinate
- * @wy: return location for widget Y coordinate
+ * @wx: (out): return location for widget X coordinate
+ * @wy: (out): return location for widget Y coordinate
*
* Converts tree coordinates (coordinates in full scrollable area of the tree)
* to widget coordinates.
@@ -13869,8 +13869,8 @@ gtk_tree_view_convert_tree_to_widget_coords (GtkTreeView *tree_view,
* @tree_view: a #GtkTreeView
* @wx: X coordinate relative to the widget
* @wy: Y coordinate relative to the widget
- * @bx: return location for bin_window X coordinate
- * @by: return location for bin_window Y coordinate
+ * @bx: (out): return location for bin_window X coordinate
+ * @by: (out): return location for bin_window Y coordinate
*
* Converts widget coordinates to coordinates for the bin_window
* (see gtk_tree_view_get_bin_window()).
@@ -13897,8 +13897,8 @@ gtk_tree_view_convert_widget_to_bin_window_coords (GtkTreeView *tree_view,
* @tree_view: a #GtkTreeView
* @bx: bin_window X coordinate
* @by: bin_window Y coordinate
- * @wx: return location for widget X coordinate
- * @wy: return location for widget Y coordinate
+ * @wx: (out): return location for widget X coordinate
+ * @wy: (out): return location for widget Y coordinate
*
* Converts bin_window coordinates (see gtk_tree_view_get_bin_window())
* to widget relative coordinates.
@@ -13925,8 +13925,8 @@ gtk_tree_view_convert_bin_window_to_widget_coords (GtkTreeView *tree_view,
* @tree_view: a #GtkTreeView
* @tx: tree X coordinate
* @ty: tree Y coordinate
- * @bx: return location for X coordinate relative to bin_window
- * @by: return location for Y coordinate relative to bin_window
+ * @bx: (out): return location for X coordinate relative to bin_window
+ * @by: (out): return location for Y coordinate relative to bin_window
*
* Converts tree coordinates (coordinates in full scrollable area of the tree)
* to bin_window coordinates.
@@ -13953,8 +13953,8 @@ gtk_tree_view_convert_tree_to_bin_window_coords (GtkTreeView *tree_view,
* @tree_view: a #GtkTreeView
* @bx: X coordinate relative to bin_window
* @by: Y coordinate relative to bin_window
- * @tx: return location for tree X coordinate
- * @ty: return location for tree Y coordinate
+ * @tx: (out): return location for tree X coordinate
+ * @ty: (out): return location for tree Y coordinate
*
* Converts bin_window coordinates to coordinates for the
* tree (the full scrollable area of the tree).
@@ -13981,8 +13981,9 @@ gtk_tree_view_convert_bin_window_to_tree_coords (GtkTreeView *tree_view,
/**
* gtk_tree_view_get_visible_range:
* @tree_view: A #GtkTreeView
- * @start_path: (allow-none): Return location for start of region, or %NULL.
- * @end_path: (allow-none): Return location for end of region, or %NULL.
+ * @start_path: (out) (allow-none): Return location for start of region,
+ * or %NULL.
+ * @end_path: (out) (allow-none): Return location for end of region, or %NULL.
*
* Sets @start_path and @end_path to be the first and last visible path.
* Note that there may be invisible paths in between.
@@ -14193,7 +14194,8 @@ gtk_tree_view_enable_model_drag_source (GtkTreeView *tree_view,
/**
* gtk_tree_view_enable_model_drag_dest:
* @tree_view: a #GtkTreeView
- * @targets: (array): the table of targets that the drag will support
+ * @targets: (array length=n_targets): the table of targets that
+ * the drag will support
* @n_targets: the number of items in @targets
* @actions: the bitmask of possible actions for a drag from this
* widget
@@ -14777,7 +14779,7 @@ gtk_tree_view_set_search_column (GtkTreeView *tree_view,
}
/**
- * gtk_tree_view_get_search_equal_func:
+ * gtk_tree_view_get_search_equal_func: (skip)
* @tree_view: A #GtkTreeView
*
* Returns the compare function currently in use.
@@ -14797,8 +14799,8 @@ gtk_tree_view_get_search_equal_func (GtkTreeView *tree_view)
* gtk_tree_view_set_search_equal_func:
* @tree_view: A #GtkTreeView
* @search_equal_func: the compare function to use during the search
- * @search_user_data: (allow-none): user data to pass to @search_equal_func, or %NULL
- * @search_destroy: (allow-none): Destroy notifier for @search_user_data, or %NULL
+ * @search_user_data: user data to pass to @search_equal_func, or %NULL
+ * @search_destroy: Destroy notifier for @search_user_data, or %NULL
*
* Sets the compare function for the interactive search capabilities; note
* that somewhat like strcmp() returning 0 for equality
@@ -14918,8 +14920,8 @@ gtk_tree_view_set_search_entry (GtkTreeView *tree_view,
* @tree_view: A #GtkTreeView
* @func: (allow-none): the function to use to position the search dialog, or %NULL
* to use the default search position function
- * @data: (allow-none): user data to pass to @func, or %NULL
- * @destroy: (allow-none): Destroy notifier for @data, or %NULL
+ * @data: user data to pass to @func, or %NULL
+ * @destroy: Destroy notifier for @data, or %NULL
*
* Sets the function to use when positioning the search dialog.
*
@@ -14944,7 +14946,7 @@ gtk_tree_view_set_search_position_func (GtkTreeView *tree_view
}
/**
- * gtk_tree_view_get_search_position_func:
+ * gtk_tree_view_get_search_position_func: (skip)
* @tree_view: A #GtkTreeView
*
* Returns the positioning function currently in use.
@@ -15794,7 +15796,7 @@ gtk_tree_view_is_rubber_banding_active (GtkTreeView *tree_view)
}
/**
- * gtk_tree_view_get_row_separator_func:
+ * gtk_tree_view_get_row_separator_func: (skip)
* @tree_view: a #GtkTreeView
*
* Returns the current row separator function.
@@ -15815,8 +15817,8 @@ gtk_tree_view_get_row_separator_func (GtkTreeView *tree_view)
* gtk_tree_view_set_row_separator_func:
* @tree_view: a #GtkTreeView
* @func: (allow-none): a #GtkTreeViewRowSeparatorFunc
- * @data: (allow-none): user data to pass to @func, or %NULL
- * @destroy: (allow-none): destroy notifier for @data, or %NULL
+ * @data: user data to pass to @func, or %NULL
+ * @destroy: destroy notifier for @data, or %NULL
*
* Sets the row separator function, which is used to determine
* whether a row should be drawn as a separator. If the row separator
diff --git a/gtk/gtktreeview.h b/gtk/gtktreeview.h
index 9e2227b..80aa134 100644
--- a/gtk/gtktreeview.h
+++ b/gtk/gtktreeview.h
@@ -129,7 +129,7 @@ struct _GtkTreeViewClass
* @column: The #GtkTreeViewColumn being dragged
* @prev_column: A #GtkTreeViewColumn on one side of @column
* @next_column: A #GtkTreeViewColumn on the other side of @column
- * @data: user data
+ * @data: (closure): user data
*
* Function type for determining whether @column can be dropped in a
* particular spot (as determined by @prev_column and @next_column). In
@@ -167,7 +167,7 @@ typedef void (* GtkTreeViewMappingFunc) (GtkTreeView *tree_vi
* @key: the key string to compare with
* @iter: a #GtkTreeIter pointing the row of @model that should be compared
* with @key.
- * @search_data: user data from gtk_tree_view_set_search_equal_func()
+ * @search_data: (closure): user data from gtk_tree_view_set_search_equal_func()
*
* A function used for checking whether a row in @model matches
* a search key string entered by the user. Note the return value
@@ -186,7 +186,7 @@ typedef gboolean (*GtkTreeViewSearchEqualFunc) (GtkTreeModel *model,
* GtkTreeViewRowSeparatorFunc:
* @model: the #GtkTreeModel
* @iter: a #GtkTreeIter pointing at a row in @model
- * @data: user data
+ * @data: (closure): user data
*
* Function type for determining whether the row pointed to by @iter should
* be rendered as a separator. A common way to implement this is to have a
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index eebcf5e..ad338e8 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -1770,7 +1770,7 @@ gtk_tree_view_column_set_attributes (GtkTreeViewColumn *tree_column,
* gtk_tree_view_column_set_cell_data_func:
* @tree_column: A #GtkTreeViewColumn
* @cell_renderer: A #GtkCellRenderer
- * @func: The #GtkTreeViewColumnFunc to use.
+ * @func: (allow-none): The #GtkTreeViewColumnFunc to use.
* @func_data: The user data for @func.
* @destroy: The destroy notification for @func_data
*
@@ -2792,10 +2792,10 @@ gtk_tree_view_column_cell_set_cell_data (GtkTreeViewColumn *tree_column,
* gtk_tree_view_column_cell_get_size:
* @tree_column: A #GtkTreeViewColumn.
* @cell_area: (allow-none): The area a cell in the column will be allocated, or %NULL
- * @x_offset: (allow-none): location to return x offset of a cell relative to @cell_area, or %NULL
- * @y_offset: (allow-none): location to return y offset of a cell relative to @cell_area, or %NULL
- * @width: (allow-none): location to return width needed to render a cell, or %NULL
- * @height: (allow-none): location to return height needed to render a cell, or %NULL
+ * @x_offset: (out) (allow-none): location to return x offset of a cell relative to @cell_area, or %NULL
+ * @y_offset: (out) (allow-none): location to return y offset of a cell relative to @cell_area, or %NULL
+ * @width: (out) (allow-none): location to return width needed to render a cell, or %NULL
+ * @height: (out) (allow-none): location to return height needed to render a cell, or %NULL
*
* Obtains the width and height needed to render the column. This is used
* primarily by the #GtkTreeView.
@@ -2994,9 +2994,10 @@ _gtk_tree_view_column_cell_get_dirty (GtkTreeViewColumn *tree_column)
* gtk_tree_view_column_cell_get_position:
* @tree_column: a #GtkTreeViewColumn
* @cell_renderer: a #GtkCellRenderer
- * @x_offset: return location for the horizontal position of @cell within
- * @tree_column, may be %NULL
- * @width: return location for the width of @cell, may be %NULL
+ * @x_offset: (out) (allow-none): return location for the horizontal
+ * position of @cell within @tree_column, may be %NULL
+ * @width: (out) (allow-none): return location for the width of @cell,
+ * may be %NULL
*
* Obtains the horizontal position and size of a cell in a column. If the
* cell is not found in the column, @start_pos and @width are not changed and
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]