Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip/dboles/scrolledwindow-annotations' into 'master'

Browse Source 
ScrolledWindow: Replace deprecated annotations; add (nullable) to set_[hvadjustment]()

See merge request GNOME/gtk!868
This commit is contained in:
Matthias Clasen
2019-06-12 16:18:36 +00:00
parent 0269d670b5 7575d5216f
commit 28c40a4c3d
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkscrolledwindow.c
View File

@@ -2020,8 +2020,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.
*
@@ -2055,7 +2055,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.
*/
@@ -2129,7 +2129,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.
*/
@@ -2316,9 +2316,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