diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-12-03 03:43:19 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-12-03 03:43:19 +0000 |
| commit | 6e67d44aa3105bbf6c5f787049d2d6bf8dd740f6 (patch) | |
| tree | 51fd11578fe24391fada0fcf59afcf41935bfe9b /gtk | |
| parent | 3886f0c5309fe82f86e2620949770740c7c5c178 (diff) | |
| parent | ab9e99218f8c5877b52b5eb61822ddb882294e8b (diff) | |
| download | gtk+-6e67d44aa3105bbf6c5f787049d2d6bf8dd740f6.tar.gz | |
Merge branch 'matthiasc/for-master' into 'master'
Matthiasc/for master
Closes #3429
See merge request GNOME/gtk!2912
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkbuildable.h | 4 | ||||
| -rw-r--r-- | gtk/gtkwidget.c | 11 |
2 files changed, 4 insertions, 11 deletions
diff --git a/gtk/gtkbuildable.h b/gtk/gtkbuildable.h index 058845caba..b446b570b9 100644 --- a/gtk/gtkbuildable.h +++ b/gtk/gtkbuildable.h @@ -110,8 +110,8 @@ struct _GtkBuildableParser * @custom_tag_start: Implement this if the buildable needs to parse * content below <child>. To handle an element, the implementation * must fill in the @parser and @user_data and return %TRUE. - * #GtkWidget implements this to parse keyboard accelerators specified - * in <accelerator> elements. + * #GtkWidget implements this to parse accessible attributes specified + * in <accessibility> elements. * Note that @user_data must be freed in @custom_tag_end or @custom_finished. * @custom_tag_end: Called for the end tag of each custom element that is * handled by the buildable (see @custom_tag_start). diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c index f649acfe74..ab9de00cd2 100644 --- a/gtk/gtkwidget.c +++ b/gtk/gtkwidget.c @@ -249,15 +249,8 @@ * # GtkWidget as GtkBuildable * * The GtkWidget implementation of the #GtkBuildable interface supports a - * custom `<accelerator>` element, which has attributes named ”key”, ”modifiers” - * and ”signal” and allows to specify accelerators. - * - * An example of a UI definition fragment specifying an accelerator: - * |[ - * <object class="GtkButton"> - * <accelerator key="q" modifiers="GDK_CONTROL_MASK" signal="clicked"/> - * </object> - * ]| + * custom elements to specify various aspects of widgets that are not + * directly expressed as properties. * * If the parent widget uses a #GtkLayoutManager, #GtkWidget supports a * custom `<layout>` element, used to define layout properties: |