Commit 746a40bb authored by Rico Tzschichholz's avatar Rico Tzschichholz

Merge branch 'ricotz/for-master' into 'master'

Add annotations to improve GIR API

See merge request !2332
parents 1087ff48 d1cab4fb
Pipeline #200705 failed with stages
in 15 minutes and 45 seconds
......@@ -1831,7 +1831,7 @@ gdk_x11_display_has_pending (GdkDisplay *display)
/**
* gdk_x11_display_get_default_group:
* @display: a #GdkDisplay
* @display: (type GdkX11Display): a #GdkDisplay
*
* Returns the default group leader surface for all toplevel surfaces
* on @display. This surface is implicitly created by GDK.
......@@ -2773,7 +2773,7 @@ gdk_x11_display_get_max_request_size (GdkDisplay *display)
/**
* gdk_x11_display_get_screen:
* @display: a #GdkX11Display
* @display: (type GdkX11Display): a #GdkX11Display
*
* Retrieves the #GdkX11Screen of the @display.
*
......@@ -2845,7 +2845,7 @@ gdk_x11_display_get_monitors (GdkDisplay *display)
/**
* gdk_x11_display_get_primary_monitor:
* @self: a #GdkDisplay
* @display: (type GdkX11Display): a #GdkDisplay
*
* Gets the primary monitor for the display.
*
......@@ -2968,7 +2968,7 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
/**
* GdkX11Display::xevent:
* @display: the object on which the signal is emitted
* @display: (type GdkX11Display): the object on which the signal is emitted
* @xevent: a pointer to the XEvent to process
*
* The ::xevent signal is a low level signal that is emitted
......
......@@ -1511,7 +1511,7 @@ gdk_x11_display_make_gl_context_current (GdkDisplay *display,
/**
* gdk_x11_display_get_glx_version:
* @display: a #GdkDisplay
* @display: (type GdkX11Display): a #GdkDisplay
* @major: (out): return location for the GLX major version
* @minor: (out): return location for the GLX minor version
*
......
......@@ -63,7 +63,7 @@ gdk_monitor_has_fullscreen_window (GdkMonitor *monitor)
/**
* gdk_x11_monitor_get_workarea:
* @monitor: a #GdkMonitor
* @monitor: (type GdkX11Monitor): a #GdkMonitor
* @workarea: (out): a #GdkRectangle to be filled with
* the monitor workarea
*
......@@ -114,6 +114,10 @@ gdk_x11_monitor_class_init (GdkX11MonitorClass *class)
{
}
/**
* gdk_x11_monitor_get_output:
* @monitor: (type GdkX11Monitor): a #GdkMonitor
*/
XID
gdk_x11_monitor_get_output (GdkMonitor *monitor)
{
......
......@@ -3270,7 +3270,7 @@ gdk_x11_surface_unfullscreen (GdkSurface *surface)
/**
* gdk_x11_surface_get_group:
* @surface: The #GdkSurface
* @surface: (type GdkX11Surface): The #GdkSurface
*
* Returns the group this surface belongs to.
*
......
......@@ -106,7 +106,7 @@ GDK_AVAILABLE_IN_ALL
GdkX11Screen *gdk_x11_display_get_screen (GdkDisplay *display);
GDK_AVAILABLE_IN_ALL
GdkMonitor * gdk_x11_display_get_primary_monitor (GdkDisplay *self);
GdkMonitor * gdk_x11_display_get_primary_monitor (GdkDisplay *display);
GDK_AVAILABLE_IN_ALL
void gdk_x11_display_grab (GdkDisplay *display);
......
......@@ -3643,7 +3643,7 @@ gsk_text_node_peek_color (GskRenderNode *node)
/**
* gsk_text_node_peek_font:
* @node: The #GskRenderNode
* @node: (type GskTextNode): The #GskRenderNode
*
* Returns the font used by the text @node.
*
......
......@@ -412,7 +412,7 @@ gtk_builder_cscope_init (GtkBuilderCScope *self)
* Calling this function is only necessary if you want to add custom
* callbacks via gtk_builder_cscope_add_callback_symbol().
*
* Returns: (transfer full): a new #GtkBuilderCScope
* Returns: (transfer full) (type GtkBuilderCScope): a new #GtkBuilderCScope
**/
GtkBuilderScope *
gtk_builder_cscope_new (void)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment