AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'fix-gtk-stack-get-page-annotation' into 'gtk-4-6'

Browse Source 
Fix introspection annotation for gtk_stack_get_page

See merge request GNOME/gtk!4783
This commit is contained in:
Matthias Clasen 2022-06-02 10:40:49 +00:00
commit 94b47ce47a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkstack.c
View File

@ -1638,9 +1638,9 @@ gtk_stack_remove (GtkStack *stack,
* @stack: a `GtkStack`
* @child: a child of @stack
*
* Returns the `GtkStackPage` object for @child.
* Returns the `GtkStackPage` object for @child or NULL if @child isn't a `GtkStack` child.
*
* Returns: (transfer none): the `GtkStackPage` for @child
* Returns: (transfer none) (nullable): the `GtkStackPage` for @child
*/
GtkStackPage *
gtk_stack_get_page (GtkStack *stack,
@ -2583,7 +2583,7 @@ gtk_stack_measure (GtkWidget *widget,
int min_for_size;
gtk_widget_measure (child, OPPOSITE_ORIENTATION (orientation), -1, &min_for_size, NULL, NULL, NULL);
gtk_widget_measure (child, orientation, MAX (min_for_size, for_size), &child_min, &child_nat, NULL, NULL);
}
else