Merge branch 'ebassi/for-master' into 'master'

Introspection fixes

Closes #3281

See merge request GNOME/gtk!2852
This commit is contained in:
Emmanuele Bassi 2020-11-17 16:04:03 +00:00
commit b76e514322
5 changed files with 12 additions and 11 deletions

View File

@ -66,7 +66,7 @@ typedef enum
* GdkTimeCoord:
* @time: The timestamp for this event.
* @flags: Flags indicating what axes are present
* @axes: axis values
* @axes: (array fixed-size=12): axis values
*
* A #GdkTimeCoord stores a single event in a motion history.
*/

View File

@ -300,10 +300,10 @@ gdk_popup_layout_set_offset (GdkPopupLayout *layout,
/**
* gdk_popup_layout_get_offset:
* @layout: a #GdkPopupLayout
* @dx: a pointer to where to store the delta x coordinate
* @dy: a pointer to where to store the delta y coordinate
* @dx: (out): return location for the delta X coordinate
* @dy: (out): return location for the delta Y coordinate
*
* Get the delta the anchor rectangle is offset with
* Retrieves the offset for the anchor rectangle.
*/
void
gdk_popup_layout_get_offset (GdkPopupLayout *layout,

View File

@ -940,8 +940,9 @@ gsk_border_node_peek_outline (GskRenderNode *node)
*
* Retrieves the stroke widths of the border.
*
* Returns: (transfer none): an array of 4 floats for the top,
* right, bottom and left stroke width of the border
* Returns: (transfer none) (array fixed-size=4): an array of 4 floats
* for the top, right, bottom and left stroke width of the border,
* respectively
*/
const float *
gsk_border_node_peek_widths (GskRenderNode *node)

View File

@ -319,7 +319,7 @@ gtk_nothing_action_init (GtkNothingAction *self)
* Gets the nothing action. This is an action that does nothing and where
* activating it always fails.
*
* Returns: (transfer none): The nothing action
* Returns: (transfer none) (type GtkNothingAction): The nothing action
*/
GtkShortcutAction *
gtk_nothing_action_get (void)
@ -409,7 +409,7 @@ gtk_callback_action_init (GtkCallbackAction *self)
* Create a custom action that calls the given @callback when
* activated.
*
* Returns: (transfer full): A new shortcut action
* Returns: (transfer full) (type GtkCallbackAction): A new shortcut action
*/
GtkShortcutAction *
gtk_callback_action_new (GtkShortcutFunc callback,
@ -491,7 +491,7 @@ gtk_activate_action_init (GtkActivateAction *self)
* Gets the activate action. This is an action that calls gtk_widget_activate()
* on the given widget upon activation.
*
* Returns: (transfer none): The activate action
* Returns: (transfer none) (type GtkActivateAction): The activate action
*/
GtkShortcutAction *
gtk_activate_action_get (void)
@ -566,7 +566,7 @@ gtk_mnemonic_action_init (GtkMnemonicAction *self)
* Gets the mnemonic action. This is an action that calls
* gtk_widget_mnemonic_activate() on the given widget upon activation.
*
* Returns: (transfer none): The mnemonic action
* Returns: (transfer none) (type GtkMnemonicAction): The mnemonic action
*/
GtkShortcutAction *
gtk_mnemonic_action_get (void)

View File

@ -740,7 +740,7 @@ gtk_tree_expander_set_child (GtkTreeExpander *self,
* This call is essentially equivalent to calling
* `gtk_tree_list_row_get_item (gtk_tree_expander_get_list_row (@self))`.
*
* Returns: (nullable) (transfer none): The item of the row
* Returns: (nullable) (transfer none) (type GObject): The item of the row
**/
gpointer
gtk_tree_expander_get_item (GtkTreeExpander *self)