Commit 6529c076 authored by Colin Walters's avatar Colin Walters Committed by Johan Dahlin

[introspection] Merge in Gtk-custom.c annotations

The Gtk-custom.c file in gir-repository contained a number of
introspection annotations.  Merge those into the GTK source files.

Some documentation was moved from the tmpl/ files to accomodate
the addition of annotations.
parent b3c48a45
...@@ -264,12 +264,6 @@ directions for the visible progress bar. ...@@ -264,12 +264,6 @@ directions for the visible progress bar.
<!-- ##### FUNCTION gtk_progress_bar_new_with_adjustment ##### --> <!-- ##### FUNCTION gtk_progress_bar_new_with_adjustment ##### -->
<para>
Creates a new #GtkProgressBar with an associated #GtkAdjustment.
</para>
@adjustment: a #GtkAdjustment.
@Returns: a #GtkProgressBar.
<!-- ##### FUNCTION gtk_progress_bar_set_bar_style ##### --> <!-- ##### FUNCTION gtk_progress_bar_set_bar_style ##### -->
......
...@@ -197,13 +197,6 @@ gtk_radio_button_get_group(). ...@@ -197,13 +197,6 @@ gtk_radio_button_get_group().
<!-- ##### FUNCTION gtk_radio_button_get_group ##### --> <!-- ##### FUNCTION gtk_radio_button_get_group ##### -->
<para>
Retrieves the group assigned to a radio button.
</para>
@radio_button: a #GtkRadioButton.
@Returns: a linked list containing all the radio buttons in the same group
as @radio_button. The returned list is owned by the radio button
and must not be modified or freed.
...@@ -80,14 +80,6 @@ Creates a new #GtkRadioMenuItem. ...@@ -80,14 +80,6 @@ Creates a new #GtkRadioMenuItem.
<!-- ##### FUNCTION gtk_radio_menu_item_new_with_label ##### --> <!-- ##### FUNCTION gtk_radio_menu_item_new_with_label ##### -->
<para>
Creates a new #GtkRadioMenuItem whose child is a simple #GtkLabel.
</para>
@group: the group to which the radio menu item is to be attached
@label: the text for the label
@Returns: a new #GtkRadioMenuItem
<!-- ##### FUNCTION gtk_radio_menu_item_new_with_mnemonic ##### --> <!-- ##### FUNCTION gtk_radio_menu_item_new_with_mnemonic ##### -->
<para> <para>
......
...@@ -246,13 +246,12 @@ GTK_SPIN_END</entry> ...@@ -246,13 +246,12 @@ GTK_SPIN_END</entry>
<!-- ##### FUNCTION gtk_spin_button_configure ##### --> <!-- ##### FUNCTION gtk_spin_button_configure ##### -->
<para> <para>
Changes the properties of an existing spin button. The adjustment, climb rate, and number of decimal places are all changed accordingly, after this function call.
</para> </para>
@spin_button: a #GtkSpinButton.
@adjustment: a #GtkAdjustment. @adjustment:
@climb_rate: the new climb rate.
@digits: the number of decimal places to display in the spin button.
<!-- ##### FUNCTION gtk_spin_button_new ##### --> <!-- ##### FUNCTION gtk_spin_button_new ##### -->
......
...@@ -136,15 +136,6 @@ Returns whether the style is attached to a window. ...@@ -136,15 +136,6 @@ Returns whether the style is attached to a window.
</para> </para>
@style:
@window:
@set_bg:
@state_type:
@area:
@x:
@y:
@width:
@height:
<!-- ##### MACRO gtk_style_apply_default_pixmap ##### --> <!-- ##### MACRO gtk_style_apply_default_pixmap ##### -->
......
...@@ -146,16 +146,6 @@ Sets the time between the user moving the mouse over a widget and the widget's t ...@@ -146,16 +146,6 @@ Sets the time between the user moving the mouse over a widget and the widget's t
<!-- ##### FUNCTION gtk_tooltips_set_tip ##### --> <!-- ##### FUNCTION gtk_tooltips_set_tip ##### -->
<para>
Adds a tooltip containing the message @tip_text to the specified #GtkWidget.
</para>
@tooltips: a #GtkTooltips.
@widget: the #GtkWidget you wish to associate the tip with.
@tip_text: a string containing the tip itself.
@tip_private: a string of any further information that may be useful if the user gets stuck.
@Deprecated: 2.12:
<!-- ##### FUNCTION gtk_tooltips_data_get ##### --> <!-- ##### FUNCTION gtk_tooltips_data_get ##### -->
<para> <para>
......
...@@ -933,7 +933,7 @@ update_name_version (GtkAboutDialog *about) ...@@ -933,7 +933,7 @@ update_name_version (GtkAboutDialog *about)
/** /**
* gtk_about_dialog_set_name: * gtk_about_dialog_set_name:
* @about: a #GtkAboutDialog * @about: a #GtkAboutDialog
* @name: the program name * @name: (allow-none): the program name
* *
* Sets the name to display in the about dialog. * Sets the name to display in the about dialog.
* If this is not set, it defaults to g_get_application_name(). * If this is not set, it defaults to g_get_application_name().
...@@ -1005,7 +1005,7 @@ gtk_about_dialog_get_version (GtkAboutDialog *about) ...@@ -1005,7 +1005,7 @@ gtk_about_dialog_get_version (GtkAboutDialog *about)
/** /**
* gtk_about_dialog_set_version: * gtk_about_dialog_set_version:
* @about: a #GtkAboutDialog * @about: a #GtkAboutDialog
* @version: the version string * @version: (allow-none): the version string
* *
* Sets the version string to display in the about dialog. * Sets the version string to display in the about dialog.
* *
...@@ -1057,7 +1057,7 @@ gtk_about_dialog_get_copyright (GtkAboutDialog *about) ...@@ -1057,7 +1057,7 @@ gtk_about_dialog_get_copyright (GtkAboutDialog *about)
/** /**
* gtk_about_dialog_set_copyright: * gtk_about_dialog_set_copyright:
* @about: a #GtkAboutDialog * @about: a #GtkAboutDialog
* @copyright: the copyright string * @copyright: (allow-none) the copyright string
* *
* Sets the copyright string to display in the about dialog. * Sets the copyright string to display in the about dialog.
* This should be a short string of one or two lines. * This should be a short string of one or two lines.
...@@ -1120,7 +1120,7 @@ gtk_about_dialog_get_comments (GtkAboutDialog *about) ...@@ -1120,7 +1120,7 @@ gtk_about_dialog_get_comments (GtkAboutDialog *about)
/** /**
* gtk_about_dialog_set_comments: * gtk_about_dialog_set_comments:
* @about: a #GtkAboutDialog * @about: a #GtkAboutDialog
* @comments: a comments string * @comments: (allow-none): a comments string
* *
* Sets the comments string to display in the about dialog. * Sets the comments string to display in the about dialog.
* This should be a short string of one or two lines. * This should be a short string of one or two lines.
...@@ -1181,7 +1181,7 @@ gtk_about_dialog_get_license (GtkAboutDialog *about) ...@@ -1181,7 +1181,7 @@ gtk_about_dialog_get_license (GtkAboutDialog *about)
/** /**
* gtk_about_dialog_set_license: * gtk_about_dialog_set_license:
* @about: a #GtkAboutDialog * @about: a #GtkAboutDialog
* @license: the license information or %NULL * @license: (allow-none): the license information or %NULL
* *
* Sets the license information to be displayed in the secondary * Sets the license information to be displayed in the secondary
* license dialog. If @license is %NULL, the license button is * license dialog. If @license is %NULL, the license button is
...@@ -1295,7 +1295,7 @@ gtk_about_dialog_get_website (GtkAboutDialog *about) ...@@ -1295,7 +1295,7 @@ gtk_about_dialog_get_website (GtkAboutDialog *about)
/** /**
* gtk_about_dialog_set_website: * gtk_about_dialog_set_website:
* @about: a #GtkAboutDialog * @about: a #GtkAboutDialog
* @website: a URL string starting with "http://" * @website: (allow-none): a URL string starting with "http://"
* *
* Sets the URL to use for the website link. * Sets the URL to use for the website link.
* *
...@@ -1587,7 +1587,7 @@ gtk_about_dialog_get_translator_credits (GtkAboutDialog *about) ...@@ -1587,7 +1587,7 @@ gtk_about_dialog_get_translator_credits (GtkAboutDialog *about)
/** /**
* gtk_about_dialog_set_translator_credits: * gtk_about_dialog_set_translator_credits:
* @about: a #GtkAboutDialog * @about: a #GtkAboutDialog
* @translator_credits: the translator credits * @translator_credits: (allow-none): the translator credits
* *
* Sets the translator credits string which is displayed in * Sets the translator credits string which is displayed in
* the translators tab of the secondary credits dialog. * the translators tab of the secondary credits dialog.
...@@ -1674,7 +1674,7 @@ icon_set_new_from_pixbufs (GList *pixbufs) ...@@ -1674,7 +1674,7 @@ icon_set_new_from_pixbufs (GList *pixbufs)
/** /**
* gtk_about_dialog_set_logo: * gtk_about_dialog_set_logo:
* @about: a #GtkAboutDialog * @about: a #GtkAboutDialog
* @logo: a #GdkPixbuf, or %NULL * @logo: (allow-none): a #GdkPixbuf, or %NULL
* *
* Sets the pixbuf to be displayed as logo in the about dialog. * Sets the pixbuf to be displayed as logo in the about dialog.
* If it is %NULL, the default window icon set with * If it is %NULL, the default window icon set with
...@@ -1751,7 +1751,7 @@ gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about) ...@@ -1751,7 +1751,7 @@ gtk_about_dialog_get_logo_icon_name (GtkAboutDialog *about)
/** /**
* gtk_about_dialog_set_logo_icon_name: * gtk_about_dialog_set_logo_icon_name:
* @about: a #GtkAboutDialog * @about: a #GtkAboutDialog
* @icon_name: an icon name, or %NULL * @icon_name: (allow-none): an icon name, or %NULL
* *
* Sets the pixbuf to be displayed as logo in the about dialog. * Sets the pixbuf to be displayed as logo in the about dialog.
* If it is %NULL, the default window icon set with * If it is %NULL, the default window icon set with
......
...@@ -351,10 +351,11 @@ _gtk_accel_group_detach (GtkAccelGroup *accel_group, ...@@ -351,10 +351,11 @@ _gtk_accel_group_detach (GtkAccelGroup *accel_group,
/** /**
* gtk_accel_groups_from_object: * gtk_accel_groups_from_object:
* @object: a #GObject, usually a #GtkWindow * @object: a #GObject, usually a #GtkWindow
* @returns: a list of all accel groups which are attached to @object
* *
* Gets a list of all accel groups which are attached to @object. * Gets a list of all accel groups which are attached to @object.
*
* Returns: (element-type GtkAccelGroup) (transfer none): a list of all accel groups which are attached to @object
*/ */
GSList* GSList*
gtk_accel_groups_from_object (GObject *object) gtk_accel_groups_from_object (GObject *object)
......
...@@ -978,8 +978,8 @@ gtk_action_disconnect_proxy (GtkAction *action, ...@@ -978,8 +978,8 @@ gtk_action_disconnect_proxy (GtkAction *action,
* *
* Returns the proxy widgets for an action. * Returns the proxy widgets for an action.
* See also gtk_widget_get_action(). * See also gtk_widget_get_action().
* *
* Return value: a #GSList of proxy widgets. The list is owned by GTK+ * Return value: (element-type GtkWidget) (transfer none): a #GSList of proxy widgets. The list is owned by GTK+
* and must not be modified. * and must not be modified.
* *
* Since: 2.4 * Since: 2.4
...@@ -1811,8 +1811,8 @@ gtk_action_get_accel_closure (GtkAction *action) ...@@ -1811,8 +1811,8 @@ gtk_action_get_accel_closure (GtkAction *action)
/** /**
* gtk_action_set_accel_group: * gtk_action_set_accel_group:
* @action: the action object * @action: the action object
* @accel_group: a #GtkAccelGroup or %NULL * @accel_group: (allow-none): a #GtkAccelGroup or %NULL
* *
* Sets the #GtkAccelGroup in which the accelerator for this action * Sets the #GtkAccelGroup in which the accelerator for this action
* will be installed. * will be installed.
* *
......
...@@ -731,7 +731,7 @@ gtk_action_group_set_visible (GtkActionGroup *action_group, ...@@ -731,7 +731,7 @@ gtk_action_group_set_visible (GtkActionGroup *action_group,
* *
* Looks up an action in the action group by name. * Looks up an action in the action group by name.
* *
* Returns: the action, or %NULL if no action by that name exists * Returns: (transfer-none): the action, or %NULL if no action by that name exists
* *
* Since: 2.4 * Since: 2.4
*/ */
...@@ -805,11 +805,11 @@ gtk_action_group_add_action (GtkActionGroup *action_group, ...@@ -805,11 +805,11 @@ gtk_action_group_add_action (GtkActionGroup *action_group,
/** /**
* gtk_action_group_add_action_with_accel: * gtk_action_group_add_action_with_accel:
* @action_group: the action group * @action_group: the action group
* @action: the action to add * @action: the action to add
* @accelerator: the accelerator for the action, in * @accelerator: (allow-none): the accelerator for the action, in
* the format understood by gtk_accelerator_parse(), or "" for no accelerator, or * the format understood by gtk_accelerator_parse(), or "" for no accelerator, or
* %NULL to use the stock accelerator * %NULL to use the stock accelerator
* *
* Adds an action object to the action group and sets up the accelerator. * Adds an action object to the action group and sets up the accelerator.
* *
...@@ -920,8 +920,8 @@ add_single_action (gpointer key, ...@@ -920,8 +920,8 @@ add_single_action (gpointer key,
* *
* Lists the actions in the action group. * Lists the actions in the action group.
* *
* Returns: an allocated list of the action objects in the action group * Returns: (element-type GtkAction) (transfer container): an allocated list of the action objects in the action group
* *
* Since: 2.4 * Since: 2.4
*/ */
GList * GList *
......
...@@ -1980,8 +1980,8 @@ gtk_assistant_get_page_type (GtkAssistant *assistant, ...@@ -1980,8 +1980,8 @@ gtk_assistant_get_page_type (GtkAssistant *assistant,
* gtk_assistant_set_page_header_image: * gtk_assistant_set_page_header_image:
* @assistant: a #GtkAssistant * @assistant: a #GtkAssistant
* @page: a page of @assistant * @page: a page of @assistant
* @pixbuf: the new header image @page * @pixbuf: (allow-none): the new header image @page
* *
* Sets a header image for @page. This image is displayed in the header * Sets a header image for @page. This image is displayed in the header
* area of the assistant when @page is the current page. * area of the assistant when @page is the current page.
* *
...@@ -2060,8 +2060,8 @@ gtk_assistant_get_page_header_image (GtkAssistant *assistant, ...@@ -2060,8 +2060,8 @@ gtk_assistant_get_page_header_image (GtkAssistant *assistant,
* gtk_assistant_set_page_side_image: * gtk_assistant_set_page_side_image:
* @assistant: a #GtkAssistant * @assistant: a #GtkAssistant
* @page: a page of @assistant * @page: a page of @assistant
* @pixbuf: the new header image @page * @pixbuf: (allow-none): the new header image @page
* *
* Sets a header image for @page. This image is displayed in the side * Sets a header image for @page. This image is displayed in the side
* area of the assistant when @page is the current page. * area of the assistant when @page is the current page.
* *
......
...@@ -135,8 +135,8 @@ gtk_bin_forall (GtkContainer *container, ...@@ -135,8 +135,8 @@ gtk_bin_forall (GtkContainer *container,
* Gets the child of the #GtkBin, or %NULL if the bin contains * Gets the child of the #GtkBin, or %NULL if the bin contains
* no child widget. The returned widget does not have a reference * no child widget. The returned widget does not have a reference
* added, so you do not need to unref it. * added, so you do not need to unref it.
* *
* Return value: pointer to child of the #GtkBin * Return value: (transfer none): pointer to child of the #GtkBin
**/ **/
GtkWidget* GtkWidget*
gtk_bin_get_child (GtkBin *bin) gtk_bin_get_child (GtkBin *bin)
......
...@@ -888,7 +888,7 @@ object_add_to_list (gchar *object_id, ...@@ -888,7 +888,7 @@ object_add_to_list (gchar *object_id,
* this function does not increment the reference counts of the returned * this function does not increment the reference counts of the returned
* objects. * objects.
* *
* Return value: a newly-allocated #GSList containing all the objects * Return value: (element-type GObject) (transfer container): a newly-allocated #GSList containing all the objects
* constructed by the #GtkBuilder instance. It should be freed by * constructed by the #GtkBuilder instance. It should be freed by
* g_slist_free() * g_slist_free()
* *
......
...@@ -292,10 +292,10 @@ gtk_cell_layout_reorder (GtkCellLayout *cell_layout, ...@@ -292,10 +292,10 @@ gtk_cell_layout_reorder (GtkCellLayout *cell_layout,
* *
* Returns the cell renderers which have been added to @cell_layout. * Returns the cell renderers which have been added to @cell_layout.
* *
* Return value: a list of cell renderers. The list, but not the * Return value: (element-type GtkCellRenderer) (transfer container): a list of cell renderers. The list, but not the
* renderers has been newly allocated and should be freed with * renderers has been newly allocated and should be freed with
* g_list_free() when no longer needed. * g_list_free() when no longer needed.
* *
* Since: 2.12 * Since: 2.12
*/ */
GList * GList *
......
...@@ -857,10 +857,10 @@ gtk_cell_view_set_value (GtkCellView *cell_view, ...@@ -857,10 +857,10 @@ gtk_cell_view_set_value (GtkCellView *cell_view,
/** /**
* gtk_cell_view_set_model: * gtk_cell_view_set_model:
* @cell_view: a #GtkCellView * @cell_view: a #GtkCellView
* @model: a #GtkTreeModel * @model: (allow-none): a #GtkTreeModel
* *
* Sets the model for @cell_view. If @cell_view already has a model * Sets the model for @cell_view. If @cell_view already has a model
* set, it will remove it before setting the new model. If @model is * set, it will remove it before setting the new model. If @model is
* %NULL, then it will unset the old model. * %NULL, then it will unset the old model.
* *
* Since: 2.6 * Since: 2.6
...@@ -910,8 +910,8 @@ gtk_cell_view_get_model (GtkCellView *cell_view) ...@@ -910,8 +910,8 @@ gtk_cell_view_get_model (GtkCellView *cell_view)
/** /**
* gtk_cell_view_set_displayed_row: * gtk_cell_view_set_displayed_row:
* @cell_view: a #GtkCellView * @cell_view: a #GtkCellView
* @path: a #GtkTreePath or %NULL to unset. * @path: (allow-none): a #GtkTreePath or %NULL to unset.
* *
* Sets the row of the model that is currently displayed * Sets the row of the model that is currently displayed
* by the #GtkCellView. If the path is unset, then the * by the #GtkCellView. If the path is unset, then the
* contents of the cellview "stick" at their last value; * contents of the cellview "stick" at their last value;
......
...@@ -1526,12 +1526,13 @@ clipboard_uris_received_func (GtkClipboard *clipboard, ...@@ -1526,12 +1526,13 @@ clipboard_uris_received_func (GtkClipboard *clipboard,
* Requests the contents of the clipboard as URIs. This function waits * Requests the contents of the clipboard as URIs. This function waits
* for the data to be received using the main loop, so events, * for the data to be received using the main loop, so events,
* timeouts, etc, may be dispatched during the wait. * timeouts, etc, may be dispatched during the wait.
* *
* Return value: a newly-allocated %NULL-terminated array of strings which must * Return value: (array zero-terminated=1) (element-type utf8) (transfer full): a newly-allocated
* %NULL-terminated array of strings which must
* be freed with g_strfreev(), or %NULL if * be freed with g_strfreev(), or %NULL if
* retrieving the selection data failed. (This * retrieving the selection data failed. (This
* could happen for various reasons, in particular * could happen for various reasons, in particular
* if the clipboard was empty or if the contents of * if the clipboard was empty or if the contents of
* the clipboard could not be converted into URI form.) * the clipboard could not be converted into URI form.)
* *
* Since: 2.14 * Since: 2.14
......
...@@ -2274,6 +2274,10 @@ gtk_clist_get_text (GtkCList *clist, ...@@ -2274,6 +2274,10 @@ gtk_clist_get_text (GtkCList *clist,
return 1; return 1;
} }
/**
* gtk_clist_set_pixmap:
* @mask: (allow-none):
*/
void void
gtk_clist_set_pixmap (GtkCList *clist, gtk_clist_set_pixmap (GtkCList *clist,
gint row, gint row,
......
...@@ -5020,9 +5020,9 @@ gtk_combo_box_set_active_iter (GtkComboBox *combo_box, ...@@ -5020,9 +5020,9 @@ gtk_combo_box_set_active_iter (GtkComboBox *combo_box,
/** /**
* gtk_combo_box_set_model: * gtk_combo_box_set_model:
* @combo_box: A #GtkComboBox * @combo_box: A #GtkComboBox
* @model: A #GtkTreeModel * @model: (allow-none): A #GtkTreeModel
* *
* Sets the model used by @combo_box to be @model. Will unset a previously set * Sets the model used by @combo_box to be @model. Will unset a previously set
* model (if applicable). If model is %NULL, then it will unset the model. * model (if applicable). If model is %NULL, then it will unset the model.
* *
* Note that this function does not clear the cell renderers, you have to * Note that this function does not clear the cell renderers, you have to
...@@ -5104,7 +5104,7 @@ out: ...@@ -5104,7 +5104,7 @@ out:
* *
* Returns the #GtkTreeModel which is acting as data source for @combo_box. * Returns the #GtkTreeModel which is acting as data source for @combo_box.
* *
* Return value: A #GtkTreeModel which was passed during construction. * Return value: (transfer none): A #GtkTreeModel which was passed during construction.
* *
* Since: 2.4 * Since: 2.4
*/ */
...@@ -5129,7 +5129,7 @@ gtk_combo_box_get_model (GtkComboBox *combo_box) ...@@ -5129,7 +5129,7 @@ gtk_combo_box_get_model (GtkComboBox *combo_box)
* gtk_combo_box_insert_text(), gtk_combo_box_prepend_text() and * gtk_combo_box_insert_text(), gtk_combo_box_prepend_text() and
* gtk_combo_box_remove_text(). * gtk_combo_box_remove_text().
* *
* Return value: A new text combo box. * Return value: (transfer none): A new text combo box.
* *
* Since: 2.4 * Since: 2.4
*/ */
......
...@@ -1586,7 +1586,7 @@ gtk_container_foreach_full (GtkContainer *container, ...@@ -1586,7 +1586,7 @@ gtk_container_foreach_full (GtkContainer *container,
/** /**
* gtk_container_set_focus_child: * gtk_container_set_focus_child:
* @container: a #GtkContainer * @container: a #GtkContainer
* @child: a #GtkWidget, or %NULL * @child: (allow-none): a #GtkWidget, or %NULL
* *
* Sets, or unsets if @child is %NULL, the focused child of @container. * Sets, or unsets if @child is %NULL, the focused child of @container.
* *
...@@ -1629,9 +1629,9 @@ gtk_container_get_focus_child (GtkContainer *container) ...@@ -1629,9 +1629,9 @@ gtk_container_get_focus_child (GtkContainer *container)
* @container: a #GtkContainer * @container: a #GtkContainer
* *
* Returns the container's non-internal children. See * Returns the container's non-internal children. See
* gtk_container_forall() for details on what constitutes an "internal" child. * gtk_container_forall() for details on what constitutes an "internal" child.
* *
* Return value: a newly-allocated list of the container's non-internal children. * Return value: (element-type GtkWidget) (transfer container): a newly-allocated list of the container's non-internal children.
**/ **/
GList* GList*
gtk_container_get_children (GtkContainer *container) gtk_container_get_children (GtkContainer *container)
...@@ -2403,7 +2403,8 @@ gtk_container_set_focus_chain (GtkContainer *container, ...@@ -2403,7 +2403,8 @@ gtk_container_set_focus_chain (GtkContainer *container,
/** /**
* gtk_container_get_focus_chain: * gtk_container_get_focus_chain:
* @container: a #GtkContainer * @container: a #GtkContainer
* @focusable_widgets: location to store the focus chain of the * @focusable_widgets: (element-type GtkWidget) (out) (transfer container): location
* to store the focus chain of the
* container, or %NULL. You should free this list * container, or %NULL. You should free this list
* using g_list_free() when you are done with it, however * using g_list_free() when you are done with it, however
* no additional reference count is added to the * no additional reference count is added to the
...@@ -2513,7 +2514,7 @@ gtk_container_set_focus_vadjustment (GtkContainer *container, ...@@ -2513,7 +2514,7 @@ gtk_container_set_focus_vadjustment (GtkContainer *container,
* Retrieves the vertical focus adjustment for the container. See * Retrieves the vertical focus adjustment for the container. See
* gtk_container_set_focus_vadjustment(). * gtk_container_set_focus_vadjustment().
* *
* Return value: the vertical focus adjustment, or %NULL if * Return value: (transfer none): the vertical focus adjustment, or %NULL if
* none has been set. * none has been set.
**/ **/
GtkAdjustment * GtkAdjustment *
...@@ -2568,7 +2569,7 @@ gtk_container_set_focus_hadjustment (GtkContainer *container, ...@@ -2568,7 +2569,7 @@ gtk_container_set_focus_hadjustment (GtkContainer *container,
* Retrieves the horizontal focus adjustment for the container. See * Retrieves the horizontal focus adjustment for the container. See
* gtk_container_set_focus_hadjustment (). * gtk_container_set_focus_hadjustment ().
* *
* Return value: the horizontal focus adjustment, or %NULL if * Return value: (transfer none): the horizontal focus adjustment, or %NULL if
* none has been set. * none has been set.
**/ **/
GtkAdjustment * GtkAdjustment *
......
...@@ -3626,9 +3626,17 @@ real_insert_row (GtkCList *clist, ...@@ -3626,9 +3626,17 @@ real_insert_row (GtkCList *clist,
return row; return row;
} }
GtkCTreeNode *
/**
* gtk_ctree_insert_node:
* @pixmap_closed: (allow-none):
* @mask_closed: (allow-none):
* @pixmap_opened: (allow-none):
* @mask_opened: (allow-none):
*/
GtkCTreeNode *
gtk_ctree_insert_node (GtkCTree *ctree, gtk_ctree_insert_node (GtkCTree *ctree,
GtkCTreeNode *parent, GtkCTreeNode *parent,
GtkCTreeNode *sibling, GtkCTreeNode *sibling,
gchar *text[], gchar *text[],
guint8 spacing, guint8 spacing,
...@@ -4286,10 +4294,15 @@ gtk_ctree_is_hot_spot (GtkCTree *ctree, ...@@ -4286,10 +4294,15 @@ gtk_ctree_is_hot_spot (GtkCTree *ctree,
***********************************************************/ ***********************************************************/
/**
* gtk_ctree_move:
* @new_parent: (allow-none):
* @new_sibling: (allow-none):
*/
void void
gtk_ctree_move (GtkCTree *ctree, gtk_ctree_move (GtkCTree *ctree,
GtkCTreeNode *node, GtkCTreeNode *node,
GtkCTreeNode *new_parent, GtkCTreeNode *new_parent,
GtkCTreeNode *new_sibling) GtkCTreeNode *new_sibling)
{ {
g_return_if_fail (GTK_IS_CTREE (ctree)); g_return_if_fail (GTK_IS_CTREE (ctree));
...@@ -4599,7 +4612,12 @@ gtk_ctree_node_set_text (GtkCTree *ctree, ...@@ -4599,7 +4612,12 @@ gtk_ctree_node_set_text (GtkCTree *ctree,
tree_draw_node (ctree, node); tree_draw_node (ctree, node);
} }
void
/**
* gtk_ctree_node_set_pixmap:
* @mask: (allow-none):
*/
void
gtk_ctree_node_set_pixmap (GtkCTree *ctree, gtk_ctree_node_set_pixmap (GtkCTree *ctree,
GtkCTreeNode *node, GtkCTreeNode *node,
gint column, gint column,
...@@ -4628,7 +4646,12 @@ gtk_ctree_node_set_pixmap (GtkCTree *ctree, ...@@ -4628,7 +4646,12 @@ gtk_ctree_node_set_pixmap (GtkCTree *ctree,
tree_draw_node (ctree, node); tree_draw_node (ctree, node);
} }
void
/**
* gtk_ctree_node_set_pixtext:
* @mask: (allow-none):
*/
void
gtk_ctree_node_set_pixtext (GtkCTree *ctree, gtk_ctree_node_set_pixtext (GtkCTree *ctree,
GtkCTreeNode *node, GtkCTreeNode *node,
gint column, gint column,
...@@ -4662,7 +4685,15 @@ gtk_ctree_node_set_pixtext (GtkCTree *ctree, ...@@ -4662,7 +4685,15 @@ gtk_ctree_node_set_pixtext (GtkCTree *ctree,
tree_draw_node (ctree, node); tree_draw_node (ctree, node);
} }
void
/**
* gtk_ctree_set_node_info:
* @pixmap_closed: (allow-none):
* @mask_closed: (allow-none):
* @pixmap_opened: (allow-none):
* @mask_opened: (allow-none):
*/
void
gtk_ctree_set_node_info (GtkCTree *ctree, gtk_ctree_set_node_info (GtkCTree *ctree,
GtkCTreeNode *node, GtkCTreeNode *node,
const gchar *text, const gchar *text,
......
...@@ -529,12 +529,12 @@ gtk_dialog_new_empty (const gchar *title, ...@@ -529,12 +529,12 @@ gtk_dialog_new_empty (const gchar *title,
/** /**
* gtk_dialog_new_with_buttons: * gtk_dialog_new_with_buttons:
* @title: Title of the dialog, or %NULL * @title: (allow-none): Title of the dialog, or %NULL
* @parent: Transient parent of the dialog, or %NULL * @parent: (allow-none): Transient parent of the dialog, or %NULL
* @flags: from #GtkDialogFlags * @flags: from #GtkDialogFlags
* @first_button_text: stock ID or text to go in first button, or %NULL * @first_button_text: (allow-none): stock ID or text to go in first button, or %NULL