From e47375cc640f822407fb8f283e490529ea40ca2b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 12 Jun 2019 16:18:36 +0000 Subject: [PATCH] Merge branch 'wip/dboles/scrolledwindow-annotations' into 'master' ScrolledWindow: Replace deprecated annotations; add (nullable) to set_[hvadjustment]() See merge request GNOME/gtk!868 (cherry picked from commit 28c40a4c3d40ed580ffc82f6b20d78e80982a46e) 45a98d6a ScrolledWindow: Replace deprecated (allow-none) 7575d521 ScrolledWindow: Annotate h|vadjustment as nullable --- gtk/gtkscrolledwindow.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c index 837e85f1fc..95c910f50e 100644 --- a/gtk/gtkscrolledwindow.c +++ b/gtk/gtkscrolledwindow.c @@ -2218,8 +2218,8 @@ gtk_scrolled_window_init (GtkScrolledWindow *scrolled_window) /** * gtk_scrolled_window_new: - * @hadjustment: (allow-none): horizontal adjustment - * @vadjustment: (allow-none): vertical adjustment + * @hadjustment: (nullable): horizontal adjustment + * @vadjustment: (nullable): vertical adjustment * * Creates a new scrolled window. * @@ -2253,7 +2253,7 @@ gtk_scrolled_window_new (GtkAdjustment *hadjustment, /** * gtk_scrolled_window_set_hadjustment: * @scrolled_window: a #GtkScrolledWindow - * @hadjustment: horizontal scroll adjustment + * @hadjustment: (nullable): the #GtkAdjustment to use, or %NULL to create a new one * * Sets the #GtkAdjustment for the horizontal scrollbar. */ @@ -2329,7 +2329,7 @@ gtk_scrolled_window_set_hadjustment (GtkScrolledWindow *scrolled_window, /** * gtk_scrolled_window_set_vadjustment: * @scrolled_window: a #GtkScrolledWindow - * @vadjustment: vertical scroll adjustment + * @vadjustment: (nullable): the #GtkAdjustment to use, or %NULL to create a new one * * Sets the #GtkAdjustment for the vertical scrollbar. */ @@ -2524,9 +2524,9 @@ gtk_scrolled_window_set_policy (GtkScrolledWindow *scrolled_window, /** * gtk_scrolled_window_get_policy: * @scrolled_window: a #GtkScrolledWindow - * @hscrollbar_policy: (out) (allow-none): location to store the policy + * @hscrollbar_policy: (out) (optional): location to store the policy * for the horizontal scrollbar, or %NULL - * @vscrollbar_policy: (out) (allow-none): location to store the policy + * @vscrollbar_policy: (out) (optional): location to store the policy * for the vertical scrollbar, or %NULL * * Retrieves the current policy values for the horizontal and vertical