AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-09-20 05:50:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'cherry-pick-28c40a4c' into 'gtk-3-24'

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

See merge request GNOME/gtk!933
This commit is contained in:
Christoph Reiter 2019-06-13 07:16:26 +00:00
commit dc17e6ff17
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtkscrolledwindow.c
View File

@ -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