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

Merge branch 'ebassi/docs-fixes' into 'master'

Browse Source 
Small documentation fixes

See merge request GNOME/gtk!4158
This commit is contained in:
Emmanuele Bassi 2021-11-16 14:04:50 +00:00
commit 3d77e526d6
7 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/reference/gdk/gdk4.toml.in
View File

@ -3,6 +3,7 @@ version = "@version@"
browse_url = "https://gitlab.gnome.org/GNOME/gtk/"
repository_url = "https://gitlab.gnome.org/GNOME/gtk.git"
website_url = "https://www.gtk.org"
docs_url = "https://docs.gtk.org/gdk4/"
authors = "GTK Development Team"
logo_url = "gtk-logo.svg"
license = "LGPL-2.1-or-later"

1
docs/reference/gsk/gsk4.toml.in
View File

@ -3,6 +3,7 @@ version = "@version@"
browse_url = "https://gitlab.gnome.org/GNOME/gtk/"
repository_url = "https://gitlab.gnome.org/GNOME/gtk.git"
website_url = "https://www.gtk.org"
docs_url = "https://docs.gtk.org/gsk4/"
authors = "GTK Development Team"
logo_url = "gtk-logo.svg"
license = "LGPL-2.1-or-later"

1
docs/reference/gtk/gtk4.toml.in
View File

@ -3,6 +3,7 @@ version = "@version@"
browse_url = "https://gitlab.gnome.org/GNOME/gtk/"
repository_url = "https://gitlab.gnome.org/GNOME/gtk.git"
website_url = "https://www.gtk.org"
docs_url = "https://docs.gtk.org/gtk4/"
authors = "GTK Development Team"
logo_url = "gtk-logo.svg"
license = "LGPL-2.1-or-later"

5
gtk/gtkcellrendereraccel.h
View File

@ -37,10 +37,7 @@ typedef struct _GtkCellRendererAccel GtkCellRendererAccel;
* @GTK_CELL_RENDERER_ACCEL_MODE_GTK: GTK accelerators mode
* @GTK_CELL_RENDERER_ACCEL_MODE_OTHER: Other accelerator mode
*
* Determines if the edited accelerators are GTK accelerators. If
* they are, consumed modifiers are suppressed, only accelerators
* accepted by GTK are allowed, and the accelerators are rendered
* in the same way as they are in menus.
* The available modes for [property@Gtk.CellRendererAccel:accel-mode].
*/
typedef enum
{

17
gtk/gtkeditable.h
View File

@ -146,6 +146,23 @@ void gtk_editable_set_enable_undo (GtkEditable *editable,
/* api for implementations */
/**
* GtkEditableProperties:
* @GTK_EDITABLE_PROP_TEXT: the property id for [property@Gtk.Editable:text]
* @GTK_EDITABLE_PROP_CURSOR_POSITION: the property id for [property@Gtk.Editable:cursor-position]
* @GTK_EDITABLE_PROP_SELECTION_BOUND: the property id for [property@Gtk.Editable:selection-bound]
* @GTK_EDITABLE_PROP_EDITABLE: the property id for [property@Gtk.Editable:editable]
* @GTK_EDITABLE_PROP_WIDTH_CHARS: the property id for [property@Gtk.Editable:width-chars]
* @GTK_EDITABLE_PROP_MAX_WIDTH_CHARS: the property id for [property@Gtk.Editable:max-width-chars]
* @GTK_EDITABLE_PROP_XALIGN: the property id for [property@Gtk.Editable:xalign]
* @GTK_EDITABLE_PROP_ENABLE_UNDO: the property id for [property@Gtk.Editable:enable-undo]
* @GTK_EDITABLE_NUM_PROPERTIES: the number of properties
*
* The identifiers for [iface@Gtk.Editable] properties.
*
* See [func@Gtk.Editable.install_properties] for details on how to
* implement the `GtkEditable` interface.
*/
typedef enum {
GTK_EDITABLE_PROP_TEXT,
GTK_EDITABLE_PROP_CURSOR_POSITION,

4
gtk/gtkenums.h
View File

@ -685,7 +685,7 @@ typedef enum {
* @GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH: Prefer height-for-width geometry management
* @GTK_SIZE_REQUEST_WIDTH_FOR_HEIGHT: Prefer width-for-height geometry management
* @GTK_SIZE_REQUEST_CONSTANT_SIZE: Don’t trade height-for-width or width-for-height
*
*
* Specifies a preference for height-for-width or
* width-for-height geometry management.
*/
@ -1139,7 +1139,7 @@ typedef enum {
* @GTK_SYMBOLIC_COLOR_SUCCESS: Indication color for success
*
* The indexes of colors passed to symbolic color rendering, such as
* [vfunc.GtkSymbolicPaintable.snapshot_symbolic].
* [vfunc@Gtk.SymbolicPaintable.snapshot_symbolic].
*
* More values may be added over time.
*

6
gtk/gtklabel.c
View File

@ -3810,7 +3810,7 @@ gtk_label_set_ellipsize (GtkLabel *self,
* See [method@Gtk.Label.set_ellipsize].
*
* Returns: `PangoEllipsizeMode`
**/
**/
PangoEllipsizeMode
gtk_label_get_ellipsize (GtkLabel *self)
{
@ -4962,8 +4962,8 @@ gtk_label_select_region (GtkLabel *self,
/**
* gtk_label_get_selection_bounds:
* @self: a `GtkLabel`
* @start: (out): return location for start of selection, as a character offset
* @end: (out): return location for end of selection, as a character offset
* @start: (out) (optional): return location for start of selection, as a character offset
* @end: (out) (optional): return location for end of selection, as a character offset
*
* Gets the selected range of characters in the label.
*