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

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

Browse Source 
Add annotations to improve GIR API

See merge request GNOME/gtk!2332
This commit is contained in:
Rico Tzschichholz 2020-07-31 19:31:40 +00:00
commit 746a40bbfe
7 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdk/x11/gdkdisplay-x11.c
View File

@ -1831,7 +1831,7 @@ gdk_x11_display_has_pending (GdkDisplay *display)
/** /**
* gdk_x11_display_get_default_group: * gdk_x11_display_get_default_group:
* @display: a #GdkDisplay * @display: (type GdkX11Display): a #GdkDisplay
* *
* Returns the default group leader surface for all toplevel surfaces * Returns the default group leader surface for all toplevel surfaces
* on @display. This surface is implicitly created by GDK. * 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: * gdk_x11_display_get_screen:
* @display: a #GdkX11Display * @display: (type GdkX11Display): a #GdkX11Display
* *
* Retrieves the #GdkX11Screen of the @display. * Retrieves the #GdkX11Screen of the @display.
* *
@ -2845,7 +2845,7 @@ gdk_x11_display_get_monitors (GdkDisplay *display)
/** /**
* gdk_x11_display_get_primary_monitor: * gdk_x11_display_get_primary_monitor:
* @self: a #GdkDisplay * @display: (type GdkX11Display): a #GdkDisplay
* *
* Gets the primary monitor for the display. * Gets the primary monitor for the display.
* *
@ -2968,7 +2968,7 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class)
/** /**
* GdkX11Display::xevent: * 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 * @xevent: a pointer to the XEvent to process
* *
* The ::xevent signal is a low level signal that is emitted * The ::xevent signal is a low level signal that is emitted

2
gdk/x11/gdkglcontext-x11.c
View File

@ -1511,7 +1511,7 @@ gdk_x11_display_make_gl_context_current (GdkDisplay *display,
/** /**
* gdk_x11_display_get_glx_version: * gdk_x11_display_get_glx_version:
* @display: a #GdkDisplay * @display: (type GdkX11Display): a #GdkDisplay
* @major: (out): return location for the GLX major version * @major: (out): return location for the GLX major version
* @minor: (out): return location for the GLX minor version * @minor: (out): return location for the GLX minor version
* *

6
gdk/x11/gdkmonitor-x11.c
View File

@ -63,7 +63,7 @@ gdk_monitor_has_fullscreen_window (GdkMonitor *monitor)
/** /**
* gdk_x11_monitor_get_workarea: * gdk_x11_monitor_get_workarea:
* @monitor: a #GdkMonitor * @monitor: (type GdkX11Monitor): a #GdkMonitor
* @workarea: (out): a #GdkRectangle to be filled with * @workarea: (out): a #GdkRectangle to be filled with
* the monitor workarea * 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 XID
gdk_x11_monitor_get_output (GdkMonitor *monitor) gdk_x11_monitor_get_output (GdkMonitor *monitor)
{ {

2
gdk/x11/gdksurface-x11.c
View File

@ -3270,7 +3270,7 @@ gdk_x11_surface_unfullscreen (GdkSurface *surface)
/** /**
* gdk_x11_surface_get_group: * gdk_x11_surface_get_group:
* @surface: The #GdkSurface * @surface: (type GdkX11Surface): The #GdkSurface
* *
* Returns the group this surface belongs to. * Returns the group this surface belongs to.
* *

2
gdk/x11/gdkx11display.h
View File

@ -106,7 +106,7 @@ GDK_AVAILABLE_IN_ALL
GdkX11Screen *gdk_x11_display_get_screen (GdkDisplay *display); GdkX11Screen *gdk_x11_display_get_screen (GdkDisplay *display);
GDK_AVAILABLE_IN_ALL 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 GDK_AVAILABLE_IN_ALL
void gdk_x11_display_grab (GdkDisplay *display); void gdk_x11_display_grab (GdkDisplay *display);

2
gsk/gskrendernodeimpl.c
View File

@ -3643,7 +3643,7 @@ gsk_text_node_peek_color (GskRenderNode *node)
/** /**
* gsk_text_node_peek_font: * gsk_text_node_peek_font:
* @node: The #GskRenderNode * @node: (type GskTextNode): The #GskRenderNode
* *
* Returns the font used by the text @node. * Returns the font used by the text @node.
* *

2
gtk/gtkbuilderscope.c
View File

@ -412,7 +412,7 @@ gtk_builder_cscope_init (GtkBuilderCScope *self)
* Calling this function is only necessary if you want to add custom * Calling this function is only necessary if you want to add custom
* callbacks via gtk_builder_cscope_add_callback_symbol(). * callbacks via gtk_builder_cscope_add_callback_symbol().
* *
* Returns: (transfer full): a new #GtkBuilderCScope * Returns: (transfer full) (type GtkBuilderCScope): a new #GtkBuilderCScope
**/ **/
GtkBuilderScope * GtkBuilderScope *
gtk_builder_cscope_new (void) gtk_builder_cscope_new (void)