Merge branch 'ci-custom-layout' into 'master'

Fix annotations for GtkCustomLayout

See merge request GNOME/gtk!1740
This commit is contained in:
Emmanuele Bassi 2020-04-22 19:23:17 +00:00
commit 21fcef7306
2 changed files with 5 additions and 5 deletions

View File

@ -96,12 +96,12 @@ gtk_custom_layout_init (GtkCustomLayout *self)
}
/**
* gtk_custom_layout_new: (constructor) (skip)
* @request_mode: (nullable): a function to retrieve
* gtk_custom_layout_new:
* @request_mode: (nullable) (scope call): a function to retrieve
* the #GtkSizeRequestMode of the widget using the layout; the
* default request mode is %GTK_SIZE_REQUEST_CONSTANT_SIZE
* @measure: (not nullable): a function to measure the widget using the layout manager
* @allocate: (not nullable): a function to allocate the children of the widget using
* @measure: (not nullable) (scope call): a function to measure the widget using the layout manager
* @allocate: (not nullable) (scope call): a function to allocate the children of the widget using
* the layout manager
*
* Creates a new legacy layout manager.

View File

@ -97,7 +97,6 @@ gtk_private_sources = files([
'gtkcssunsetvalue.c',
'gtkcssvalue.c',
'gtkcsswidgetnode.c',
'gtkcustomlayout.c',
'gtkdrop.c',
'gtkfilechooserembed.c',
'gtkfilechooserentry.c',
@ -203,6 +202,7 @@ gtk_public_sources = files([
'gtkconstraint.c',
'gtkcontainer.c',
'gtkcssprovider.c',
'gtkcustomlayout.c',
'gtkdialog.c',
'gtkdragicon.c',
'gtkdragsource.c',