summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2020-02-05 18:04:42 +0000
committerMatthias Clasen <mclasen@redhat.com>2020-02-05 18:04:42 +0000
commit9746b728cac39b98636d8c97cb1054bc6c55e75b (patch)
tree803bf242a2f07a52f219e546e09606c7dde6a72b /docs
parent0ad791277a7c4dc71b08b845455018b1e6830654 (diff)
parentef7172dc1ee86acb5ed686d16cea6c8bc3cad63a (diff)
downloadgtk+-9746b728cac39b98636d8c97cb1054bc6c55e75b.tar.gz
Merge branch 'public-emojichooser' into 'master'
emojichooser: Make public See merge request GNOME/gtk!1382
Diffstat (limited to 'docs')
-rw-r--r--docs/reference/gtk/gtk4-docs.xml1
-rw-r--r--docs/reference/gtk/gtk4-sections.txt17
-rw-r--r--docs/reference/gtk/gtk4.types.in1
3 files changed, 19 insertions, 0 deletions
diff --git a/docs/reference/gtk/gtk4-docs.xml b/docs/reference/gtk/gtk4-docs.xml
index a85bbd80e4..b2afad8d64 100644
--- a/docs/reference/gtk/gtk4-docs.xml
+++ b/docs/reference/gtk/gtk4-docs.xml
@@ -246,6 +246,7 @@
<xi:include href="xml/gtkfontbutton.xml" />
<xi:include href="xml/gtkfontchooserwidget.xml" />
<xi:include href="xml/gtkfontchooserdialog.xml" />
+ <xi:include href="xml/gtkemojichooser.xml" />
</chapter>
<chapter id="DrawingWidgets">
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index 086f352e4f..c59c2e6692 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -7139,3 +7139,20 @@ GTK_DRAG_ICON_GET_CLASS
<SUBSECTION Private>
gtk_drag_icon_get_type
</SECTION>
+
+<SECTION>
+<FILE>gtkemojichooser</FILE>
+GtkEmojiChooser
+gtk_emoji_chooser_new
+
+<SUBSECTION Standard>
+GTK_TYPE_EMOJI_CHOOSER
+GTK_EMOJI_CHOOSER
+GTK_EMOJI_CHOOSER_CLASS
+GTK_IS_EMOJI_CHOOSER
+GTK_IS_EMOJI_CHOOSER_CLASS
+GTK_EMOJI_CHOOSER_GET_CLASS
+
+<SUBSECTION Private>
+gtk_emoji_chooser_get_type
+</SECTION>
diff --git a/docs/reference/gtk/gtk4.types.in b/docs/reference/gtk/gtk4.types.in
index 60d8712f97..19f4569d5b 100644
--- a/docs/reference/gtk/gtk4.types.in
+++ b/docs/reference/gtk/gtk4.types.in
@@ -62,6 +62,7 @@ gtk_drag_source_get_type
gtk_drawing_area_get_type
gtk_drop_target_get_type
gtk_editable_get_type
+gtk_emoji_chooser_get_type
gtk_entry_buffer_get_type
gtk_entry_completion_get_type
gtk_entry_get_type