commit aa443cb
hovercats
·
2024-05-21 17:50:55 +0000 UTC
parent a80a76e
gtk+3: remove atk patch, as we need atk for webkit anyway
5 files changed,
+2,
-4591
+1,
-9
1@@ -2,15 +2,7 @@
2
3 export DESTDIR="$1"
4
5-# Some packages in community/ requrire that gtk+3 have atk methods.
6-# So if atk is installed, then we don't patch it out of gtk, just fribidi.
7-if pkg-config --exists atk; then
8- patch -p1 < 01-no-fribidi.patch
9-else
10- for p in *.patch; do
11- patch -p1 < "$p"
12- done
13-fi
14+patch -p1 < 0001-remove-fribidi-dependency.patch
15
16 # Disable native language support, disable atk-bridge, don't compile schemas.
17 sed -e '/compile_schemas/s/true/false/' \
+0,
-1
1@@ -1,3 +1,2 @@
2 46777a428699d6e2643a6d4c0929168912b760011706cb95b67807bd777e005fe5
3 76c0117c066c8924cf5fcb59801818c6c2019e75ed69d1324007998a98fbf90989
4-b0765be180e7c013ba55295ae1a954f515452309ce8d9df51608aa8b9c56b7ad99
+1,
-0
1@@ -1,3 +1,4 @@
2+atk
3 cairo
4 fontconfig
5 freetype-harfbuzz
1@@ -1,4580 +0,0 @@
2-From bfff2564b939ff39fd50da0f64fb65566a85243d Mon Sep 17 00:00:00 2001
3-From: hovercats <hovercatswithlasereyes@protonmail.com>
4-Date: Thu, 2 May 2024 18:19:07 +0200
5-Subject: [PATCH 2/2] remove need for atk
6-
7-this removes accessability altogether.
8----
9- gtk/a11y/gtkbooleancellaccessible.h | 1 -
10- gtk/a11y/gtkcellaccessible.h | 4 -
11- gtk/a11y/gtkcontaineraccessibleprivate.h | 2 -
12- gtk/a11y/gtkimagecellaccessible.h | 1 -
13- gtk/a11y/gtkplugaccessible.h | 44 --
14- gtk/a11y/gtkrenderercellaccessible.h | 4 -
15- gtk/a11y/gtktextcellaccessible.h | 1 -
16- gtk/a11y/gtktoplevelaccessible.h | 2 -
17- gtk/a11y/gtkwidgetaccessible.h | 4 -
18- gtk/deprecated/gtkarrow.c | 2 -
19- gtk/deprecated/gtkcolorsel.c | 36 --
20- gtk/deprecated/gtkcolorseldialog.c | 2 -
21- gtk/deprecated/gtkfontsel.c | 45 --
22- gtk/deprecated/gtkhsv.c | 2 -
23- gtk/deprecated/gtktearoffmenuitem.c | 2 -
24- gtk/gtk-autocleanups.h | 1 -
25- gtk/gtk.h | 1 -
26- gtk/gtkaccellabel.c | 2 -
27- gtk/gtkaccessible.c | 185 --------
28- gtk/gtkaccessible.h | 15 -
29- gtk/gtkactionbar.c | 1 -
30- gtk/gtkassistant.c | 71 ----
31- gtk/gtkbox.c | 1 -
32- gtk/gtkbutton.c | 1 -
33- gtk/gtkcalendar.c | 1 -
34- gtk/gtkcellrenderer.c | 37 --
35- gtk/gtkcellrendererpixbuf.c | 4 -
36- gtk/gtkcellrenderertext.c | 2 -
37- gtk/gtkcellrenderertoggle.c | 2 -
38- gtk/gtkcheckbutton.c | 1 -
39- gtk/gtkcheckmenuitem.c | 1 -
40- gtk/gtkcolorchooserwidget.c | 11 -
41- gtk/gtkcolorplane.c | 9 -
42- gtk/gtkcolorscale.c | 12 -
43- gtk/gtkcolorswatch.c | 1 -
44- gtk/gtkcombobox.c | 30 --
45- gtk/gtkcombobox.h | 2 -
46- gtk/gtkcontainer.c | 6 -
47- gtk/gtkdialog.c | 2 -
48- gtk/gtkdrawingarea.c | 2 -
49- gtk/gtkentry.c | 1 -
50- gtk/gtkentrycompletion.c | 18 -
51- gtk/gtkexpander.c | 1 -
52- gtk/gtkfilechooserdialog.c | 2 -
53- gtk/gtkfilechooserwidget.c | 6 -
54- gtk/gtkflowbox.c | 4 -
55- gtk/gtkfontchooserdialog.c | 2 -
56- gtk/gtkfontchooserwidget.c | 2 -
57- gtk/gtkframe.c | 1 -
58- gtk/gtkglarea.c | 2 -
59- gtk/gtkheaderbar.c | 19 -
60- gtk/gtkiconview.c | 39 --
61- gtk/gtkimage.c | 1 -
62- gtk/gtkinfobar.c | 38 --
63- gtk/gtklabel.c | 12 -
64- gtk/gtklevelbar.c | 1 -
65- gtk/gtklinkbutton.c | 1 -
66- gtk/gtklistbox.c | 6 -
67- gtk/gtklockbutton.c | 4 -
68- gtk/gtkmain.c | 15 -
69- gtk/gtkmenu.c | 1 -
70- gtk/gtkmenubar.c | 1 -
71- gtk/gtkmenubutton.c | 1 -
72- gtk/gtkmenuitem.c | 1 -
73- gtk/gtkmenushell.c | 2 -
74- gtk/gtkmessagedialog.c | 11 -
75- gtk/gtkmodelbutton.c | 31 --
76- gtk/gtkmodelmenuitem.c | 10 -
77- gtk/gtknotebook.c | 1 -
78- gtk/gtkpaned.c | 1 -
79- gtk/gtkpango.c | 516 -----------------------
80- gtk/gtkpango.h | 13 -
81- gtk/gtkpathbar.c | 3 -
82- gtk/gtkplug.c | 2 -
83- gtk/gtkpopover.c | 1 -
84- gtk/gtkprogressbar.c | 1 -
85- gtk/gtkradiobutton.c | 1 -
86- gtk/gtkradiomenuitem.c | 2 -
87- gtk/gtkrange.c | 2 -
88- gtk/gtkscale.c | 1 -
89- gtk/gtkscalebutton.c | 1 -
90- gtk/gtkscrollbar.c | 1 -
91- gtk/gtkscrolledwindow.c | 1 -
92- gtk/gtksearchentry.c | 6 -
93- gtk/gtkseparator.c | 1 -
94- gtk/gtkseparatormenuitem.c | 1 -
95- gtk/gtksocket.c | 2 -
96- gtk/gtkspinbutton.c | 1 -
97- gtk/gtkspinner.c | 1 -
98- gtk/gtkstack.c | 5 -
99- gtk/gtkstatusbar.c | 1 -
100- gtk/gtkstylecontext.c | 57 ---
101- gtk/gtkstylecontext.h | 1 -
102- gtk/gtkstylecontextprivate.h | 5 -
103- gtk/gtkswitch.c | 7 -
104- gtk/gtktextbuffer.c | 265 ------------
105- gtk/gtktextbufferprivate.h | 3 -
106- gtk/gtktextview.c | 2 -
107- gtk/gtktogglebutton.c | 1 -
108- gtk/gtktoolbar.c | 2 -
109- gtk/gtktoolbutton.c | 3 -
110- gtk/gtktooltipwindow.c | 1 -
111- gtk/gtktreeselection.c | 2 -
112- gtk/gtktreeview.c | 42 --
113- gtk/gtktreeviewcolumn.c | 6 -
114- gtk/gtkviewport.c | 2 -
115- gtk/gtkvolumebutton.c | 8 -
116- gtk/gtkwidget.c | 469 --------------------
117- gtk/gtkwidget.h | 15 -
118- gtk/gtkwidgetprivate.h | 4 -
119- 110 files changed, 2246 deletions(-)
120-
121-diff --git a/gtk/a11y/gtkbooleancellaccessible.h b/gtk/a11y/gtkbooleancellaccessible.h
122-index ba344e6..6300cfa 100644
123---- a/gtk/a11y/gtkbooleancellaccessible.h
124-+++ b/gtk/a11y/gtkbooleancellaccessible.h
125-@@ -22,7 +22,6 @@
126- #error "Only <gtk/gtk-a11y.h> can be included directly."
127- #endif
128-
129--#include <atk/atk.h>
130- #include <gtk/a11y/gtkrenderercellaccessible.h>
131-
132- G_BEGIN_DECLS
133-diff --git a/gtk/a11y/gtkcellaccessible.h b/gtk/a11y/gtkcellaccessible.h
134-index 1195a38..0a80c5f 100644
135---- a/gtk/a11y/gtkcellaccessible.h
136-+++ b/gtk/a11y/gtkcellaccessible.h
137-@@ -22,7 +22,6 @@
138- #error "Only <gtk/gtk-a11y.h> can be included directly."
139- #endif
140-
141--#include <atk/atk.h>
142- #include <gtk/gtk.h>
143-
144- G_BEGIN_DECLS
145-@@ -40,14 +39,11 @@ typedef struct _GtkCellAccessiblePrivate GtkCellAccessiblePrivate;
146-
147- struct _GtkCellAccessible
148- {
149-- GtkAccessible parent;
150--
151- GtkCellAccessiblePrivate *priv;
152- };
153-
154- struct _GtkCellAccessibleClass
155- {
156-- GtkAccessibleClass parent_class;
157- void (*update_cache) (GtkCellAccessible *cell,
158- gboolean emit_signal);
159- };
160-diff --git a/gtk/a11y/gtkcontaineraccessibleprivate.h b/gtk/a11y/gtkcontaineraccessibleprivate.h
161-index 4d02a73..baf5531 100644
162---- a/gtk/a11y/gtkcontaineraccessibleprivate.h
163-+++ b/gtk/a11y/gtkcontaineraccessibleprivate.h
164-@@ -23,10 +23,8 @@
165- G_BEGIN_DECLS
166-
167- void _gtk_container_accessible_add_child (GtkContainerAccessible *accessible,
168-- AtkObject *child,
169- gint index);
170- void _gtk_container_accessible_remove_child (GtkContainerAccessible *accessible,
171-- AtkObject *child,
172- gint index);
173- void _gtk_container_accessible_add (GtkWidget *parent,
174- GtkWidget *child);
175-diff --git a/gtk/a11y/gtkimagecellaccessible.h b/gtk/a11y/gtkimagecellaccessible.h
176-index 5ab1c22..bd0ee82 100644
177---- a/gtk/a11y/gtkimagecellaccessible.h
178-+++ b/gtk/a11y/gtkimagecellaccessible.h
179-@@ -22,7 +22,6 @@
180- #error "Only <gtk/gtk-a11y.h> can be included directly."
181- #endif
182-
183--#include <atk/atk.h>
184- #include <gtk/a11y/gtkrenderercellaccessible.h>
185-
186- G_BEGIN_DECLS
187-diff --git a/gtk/a11y/gtkplugaccessible.h b/gtk/a11y/gtkplugaccessible.h
188-index 5be8fe4..b9840af 100644
189---- a/gtk/a11y/gtkplugaccessible.h
190-+++ b/gtk/a11y/gtkplugaccessible.h
191-@@ -24,48 +24,4 @@
192-
193- #include <gtk/a11y/gtkwindowaccessible.h>
194-
195--#if ATK_CHECK_VERSION(2,35,1)
196--
197--#define GTK_HAVE_ATK_PLUG_SET_CHILD
198--
199--G_BEGIN_DECLS
200--
201--#define GTK_TYPE_PLUG_ACCESSIBLE (gtk_plug_accessible_get_type ())
202--#define GTK_PLUG_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_PLUG_ACCESSIBLE, GtkPlugAccessible))
203--#define GTK_PLUG_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_PLUG_ACCESSIBLE, GtkPlugAccessibleClass))
204--#define GTK_IS_PLUG_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_PLUG_ACCESSIBLE))
205--#define GTK_IS_PLUG_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_PLUG_ACCESSIBLE))
206--#define GTK_PLUG_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_PLUG_ACCESSIBLE, GtkPlugAccessibleClass))
207--
208--typedef struct _GtkPlugAccessible GtkPlugAccessible;
209--typedef struct _GtkPlugAccessibleClass GtkPlugAccessibleClass;
210--typedef struct _GtkPlugAccessiblePrivate GtkPlugAccessiblePrivate;
211--
212--/**
213-- * GtkPlugAccessible:
214-- *
215-- * Since: 3.24.30
216-- */
217--struct _GtkPlugAccessible
218--{
219-- GtkWindowAccessible parent;
220--
221-- GtkPlugAccessiblePrivate *priv;
222--};
223--
224--struct _GtkPlugAccessibleClass
225--{
226-- GtkWindowAccessibleClass parent_class;
227--};
228--
229--GDK_AVAILABLE_IN_ALL
230--GType gtk_plug_accessible_get_type (void);
231--
232--GDK_AVAILABLE_IN_ALL
233--gchar *gtk_plug_accessible_get_id (GtkPlugAccessible *plug);
234--
235--G_END_DECLS
236--
237--#endif /* ATK_CHECK_VERSION(2,35,1) */
238--
239- #endif /* __GTK_PLUG_ACCESSIBLE_H__ */
240-diff --git a/gtk/a11y/gtkrenderercellaccessible.h b/gtk/a11y/gtkrenderercellaccessible.h
241-index ac39d89..2b97029 100644
242---- a/gtk/a11y/gtkrenderercellaccessible.h
243-+++ b/gtk/a11y/gtkrenderercellaccessible.h
244-@@ -22,7 +22,6 @@
245- #error "Only <gtk/gtk-a11y.h> can be included directly."
246- #endif
247-
248--#include <atk/atk.h>
249- #include <gtk/a11y/gtkcellaccessible.h>
250-
251- G_BEGIN_DECLS
252-@@ -53,9 +52,6 @@ struct _GtkRendererCellAccessibleClass
253- GDK_AVAILABLE_IN_ALL
254- GType gtk_renderer_cell_accessible_get_type (void);
255-
256--GDK_AVAILABLE_IN_ALL
257--AtkObject *gtk_renderer_cell_accessible_new (GtkCellRenderer * renderer);
258--
259- G_END_DECLS
260-
261- #endif /* __GTK_RENDERER_CELL_ACCESSIBLE_H__ */
262-diff --git a/gtk/a11y/gtktextcellaccessible.h b/gtk/a11y/gtktextcellaccessible.h
263-index 16a63b7..069fd42 100644
264---- a/gtk/a11y/gtktextcellaccessible.h
265-+++ b/gtk/a11y/gtktextcellaccessible.h
266-@@ -22,7 +22,6 @@
267- #error "Only <gtk/gtk-a11y.h> can be included directly."
268- #endif
269-
270--#include <atk/atk.h>
271- #include <gtk/a11y/gtkrenderercellaccessible.h>
272-
273- G_BEGIN_DECLS
274-diff --git a/gtk/a11y/gtktoplevelaccessible.h b/gtk/a11y/gtktoplevelaccessible.h
275-index 9c782b8..59d5372 100644
276---- a/gtk/a11y/gtktoplevelaccessible.h
277-+++ b/gtk/a11y/gtktoplevelaccessible.h
278-@@ -22,8 +22,6 @@
279- #error "Only <gtk/gtk-a11y.h> can be included directly."
280- #endif
281-
282--#include <atk/atk.h>
283--
284- G_BEGIN_DECLS
285-
286- #define GTK_TYPE_TOPLEVEL_ACCESSIBLE (gtk_toplevel_accessible_get_type ())
287-diff --git a/gtk/a11y/gtkwidgetaccessible.h b/gtk/a11y/gtkwidgetaccessible.h
288-index 37fd45b..a623081 100644
289---- a/gtk/a11y/gtkwidgetaccessible.h
290-+++ b/gtk/a11y/gtkwidgetaccessible.h
291-@@ -39,15 +39,11 @@ typedef struct _GtkWidgetAccessiblePrivate GtkWidgetAccessiblePrivate;
292-
293- struct _GtkWidgetAccessible
294- {
295-- GtkAccessible parent;
296--
297- GtkWidgetAccessiblePrivate *priv;
298- };
299-
300- struct _GtkWidgetAccessibleClass
301- {
302-- GtkAccessibleClass parent_class;
303--
304- /*
305- * Signal handler for notify signal on GTK widget
306- */
307-diff --git a/gtk/deprecated/gtkarrow.c b/gtk/deprecated/gtkarrow.c
308-index 3312ffc..e22f52c 100644
309---- a/gtk/deprecated/gtkarrow.c
310-+++ b/gtk/deprecated/gtkarrow.c
311-@@ -139,8 +139,6 @@ gtk_arrow_class_init (GtkArrowClass *class)
312- P_("Amount of space used up by arrow"),
313- 0.0, 1.0, 0.7,
314- GTK_PARAM_READABLE));
315--
316-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ARROW_ACCESSIBLE);
317- }
318-
319- static void
320-diff --git a/gtk/deprecated/gtkcolorsel.c b/gtk/deprecated/gtkcolorsel.c
321-index 8152983..af1e9db 100644
322---- a/gtk/deprecated/gtkcolorsel.c
323-+++ b/gtk/deprecated/gtkcolorsel.c
324-@@ -206,10 +206,6 @@ static void default_noscreen_change_palette_func (const GdkColor *colo
325- static void default_change_palette_func (GdkScreen *screen,
326- const GdkColor *colors,
327- gint n_colors);
328--static void make_control_relations (AtkObject *atk_obj,
329-- GtkWidget *widget);
330--static void make_all_relations (AtkObject *atk_obj,
331-- GtkColorSelectionPrivate *priv);
332-
333- static void hsv_changed (GtkWidget *hsv,
334- gpointer data);
335-@@ -398,7 +394,6 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
336- GtkWidget *picker_image;
337- gint i, j;
338- GtkColorSelectionPrivate *priv;
339-- AtkObject *atk_obj;
340- GList *focus_chain = NULL;
341-
342- gtk_orientable_set_orientation (GTK_ORIENTABLE (colorsel),
343-@@ -572,14 +567,6 @@ gtk_color_selection_init (GtkColorSelection *colorsel)
344- gtk_widget_hide (priv->palette_frame);
345- }
346-
347-- atk_obj = gtk_widget_get_accessible (priv->triangle_colorsel);
348-- if (GTK_IS_ACCESSIBLE (atk_obj))
349-- {
350-- atk_object_set_name (atk_obj, _("Color Wheel"));
351-- atk_object_set_role (gtk_widget_get_accessible (GTK_WIDGET (colorsel)), ATK_ROLE_COLOR_CHOOSER);
352-- make_all_relations (atk_obj, priv);
353-- }
354--
355- gtk_widget_pop_composite_child ();
356- }
357-
358-@@ -3057,26 +3044,3 @@ gtk_color_selection_set_change_palette_with_screen_hook (GtkColorSelectionChange
359-
360- return old;
361- }
362--
363--static void
364--make_control_relations (AtkObject *atk_obj,
365-- GtkWidget *widget)
366--{
367-- AtkObject *obj;
368--
369-- obj = gtk_widget_get_accessible (widget);
370-- atk_object_add_relationship (atk_obj, ATK_RELATION_CONTROLLED_BY, obj);
371-- atk_object_add_relationship (obj, ATK_RELATION_CONTROLLER_FOR, atk_obj);
372--}
373--
374--static void
375--make_all_relations (AtkObject *atk_obj,
376-- GtkColorSelectionPrivate *priv)
377--{
378-- make_control_relations (atk_obj, priv->hue_spinbutton);
379-- make_control_relations (atk_obj, priv->sat_spinbutton);
380-- make_control_relations (atk_obj, priv->val_spinbutton);
381-- make_control_relations (atk_obj, priv->red_spinbutton);
382-- make_control_relations (atk_obj, priv->green_spinbutton);
383-- make_control_relations (atk_obj, priv->blue_spinbutton);
384--}
385-diff --git a/gtk/deprecated/gtkcolorseldialog.c b/gtk/deprecated/gtkcolorseldialog.c
386-index 7ff28ec..19daf9d 100644
387---- a/gtk/deprecated/gtkcolorseldialog.c
388-+++ b/gtk/deprecated/gtkcolorseldialog.c
389-@@ -158,8 +158,6 @@ gtk_color_selection_dialog_class_init (GtkColorSelectionDialogClass *klass)
390- P_("The help button of the dialog."),
391- GTK_TYPE_WIDGET,
392- G_PARAM_READABLE));
393--
394-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_COLOR_CHOOSER);
395- }
396-
397- static void
398-diff --git a/gtk/deprecated/gtkfontsel.c b/gtk/deprecated/gtkfontsel.c
399-index 7812e75..67e3a8e 100644
400---- a/gtk/deprecated/gtkfontsel.c
401-+++ b/gtk/deprecated/gtkfontsel.c
402-@@ -35,8 +35,6 @@
403- #include <glib/gprintf.h>
404- #include <string.h>
405-
406--#include <atk/atk.h>
407--
408- #include "gtkbutton.h"
409- #include "gtkcellrenderertext.h"
410- #include "gtkentry.h"
411-@@ -335,7 +333,6 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
412- GtkListStore *model;
413- GtkTreeViewColumn *column;
414- GList *focus_chain = NULL;
415-- AtkObject *atk_obj;
416-
417- fontsel->priv = gtk_font_selection_get_instance_private (fontsel);
418- priv = fontsel->priv;
419-@@ -528,46 +525,6 @@ gtk_font_selection_init (GtkFontSelection *fontsel)
420-
421- g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->size_list)), "changed",
422- G_CALLBACK (gtk_font_selection_select_size), fontsel);
423-- atk_obj = gtk_widget_get_accessible (priv->size_list);
424-- if (GTK_IS_ACCESSIBLE (atk_obj))
425-- {
426-- /* Accessibility support is enabled.
427-- * Make the label ATK_RELATON_LABEL_FOR for the size list as well.
428-- */
429-- AtkObject *atk_label;
430-- AtkRelationSet *relation_set;
431-- AtkRelation *relation;
432-- AtkObject *obj_array[1];
433--
434-- atk_label = gtk_widget_get_accessible (label);
435-- relation_set = atk_object_ref_relation_set (atk_obj);
436-- relation = atk_relation_set_get_relation_by_type (relation_set, ATK_RELATION_LABELLED_BY);
437-- if (relation)
438-- {
439-- atk_relation_add_target (relation, atk_label);
440-- }
441-- else
442-- {
443-- obj_array[0] = atk_label;
444-- relation = atk_relation_new (obj_array, 1, ATK_RELATION_LABELLED_BY);
445-- atk_relation_set_add (relation_set, relation);
446-- }
447-- g_object_unref (relation_set);
448--
449-- relation_set = atk_object_ref_relation_set (atk_label);
450-- relation = atk_relation_set_get_relation_by_type (relation_set, ATK_RELATION_LABEL_FOR);
451-- if (relation)
452-- {
453-- atk_relation_add_target (relation, atk_obj);
454-- }
455-- else
456-- {
457-- obj_array[0] = atk_obj;
458-- relation = atk_relation_new (obj_array, 1, ATK_RELATION_LABEL_FOR);
459-- atk_relation_set_add (relation_set, relation);
460-- }
461-- g_object_unref (relation_set);
462-- }
463-
464- vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
465- gtk_widget_show (vbox);
466-@@ -1651,8 +1608,6 @@ static void
467- gtk_font_selection_dialog_class_init (GtkFontSelectionDialogClass *klass)
468- {
469- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
470--
471-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_FONT_CHOOSER);
472- }
473-
474- static void
475-diff --git a/gtk/deprecated/gtkhsv.c b/gtk/deprecated/gtkhsv.c
476-index 6e30d5e..f76969f 100644
477---- a/gtk/deprecated/gtkhsv.c
478-+++ b/gtk/deprecated/gtkhsv.c
479-@@ -160,8 +160,6 @@ gtk_hsv_class_init (GtkHSVClass *class)
480- widget_class->focus = gtk_hsv_focus;
481- widget_class->grab_broken_event = gtk_hsv_grab_broken;
482-
483-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_COLOR_CHOOSER);
484--
485- hsv_class->move = gtk_hsv_move;
486-
487- hsv_signals[CHANGED] =
488-diff --git a/gtk/deprecated/gtktearoffmenuitem.c b/gtk/deprecated/gtktearoffmenuitem.c
489-index 87fdb80..2cbced9 100644
490---- a/gtk/deprecated/gtktearoffmenuitem.c
491-+++ b/gtk/deprecated/gtktearoffmenuitem.c
492-@@ -110,8 +110,6 @@ gtk_tearoff_menu_item_class_init (GtkTearoffMenuItemClass *klass)
493- widget_class->get_preferred_height = gtk_tearoff_menu_item_get_preferred_height;
494- widget_class->parent_set = gtk_tearoff_menu_item_parent_set;
495-
496-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_TEAR_OFF_MENU_ITEM);
497--
498- menu_item_class->activate = gtk_tearoff_menu_item_activate;
499- }
500-
501-diff --git a/gtk/gtk-autocleanups.h b/gtk/gtk-autocleanups.h
502-index 5c942ce..70f2d5f 100644
503---- a/gtk/gtk-autocleanups.h
504-+++ b/gtk/gtk-autocleanups.h
505-@@ -21,7 +21,6 @@
506-
507- #ifndef __GI_SCANNER__
508-
509--G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAccessible, g_object_unref)
510- G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkActionBar, g_object_unref)
511- G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkActionable, g_object_unref)
512- G_DEFINE_AUTOPTR_CLEANUP_FUNC(GtkAdjustment, g_object_unref)
513-diff --git a/gtk/gtk.h b/gtk/gtk.h
514-index c08454c..5d48f88 100644
515---- a/gtk/gtk.h
516-+++ b/gtk/gtk.h
517-@@ -32,7 +32,6 @@
518- #include <gtk/gtkaccelgroup.h>
519- #include <gtk/gtkaccellabel.h>
520- #include <gtk/gtkaccelmap.h>
521--#include <gtk/gtkaccessible.h>
522- #include <gtk/gtkactionable.h>
523- #include <gtk/gtkactionbar.h>
524- #include <gtk/gtkadjustment.h>
525-diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
526-index 75b27a8..f734783 100644
527---- a/gtk/gtkaccellabel.c
528-+++ b/gtk/gtkaccellabel.c
529-@@ -167,8 +167,6 @@ gtk_accel_label_class_init (GtkAccelLabelClass *class)
530- widget_class->get_preferred_width = gtk_accel_label_get_preferred_width;
531- widget_class->destroy = gtk_accel_label_destroy;
532-
533-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_ACCEL_LABEL);
534--
535- class->signal_quote1 = g_strdup ("<:");
536- class->signal_quote2 = g_strdup (":>");
537-
538-diff --git a/gtk/gtkaccessible.c b/gtk/gtkaccessible.c
539-index 9efbb0c..e16fb88 100644
540---- a/gtk/gtkaccessible.c
541-+++ b/gtk/gtkaccessible.c
542-@@ -50,175 +50,6 @@ enum {
543- PROP_WIDGET
544- };
545-
546--static void gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible);
547--
548--G_DEFINE_TYPE_WITH_PRIVATE (GtkAccessible, gtk_accessible, ATK_TYPE_OBJECT)
549--
550--static void
551--gtk_accessible_set_property (GObject *object,
552-- guint prop_id,
553-- const GValue *value,
554-- GParamSpec *pspec)
555--{
556-- GtkAccessible *accessible = GTK_ACCESSIBLE (object);
557--
558-- switch (prop_id)
559-- {
560-- case PROP_WIDGET:
561-- gtk_accessible_set_widget (accessible, g_value_get_object (value));
562-- break;
563-- default:
564-- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
565-- break;
566-- }
567--}
568--
569--static void
570--gtk_accessible_get_property (GObject *object,
571-- guint prop_id,
572-- GValue *value,
573-- GParamSpec *pspec)
574--{
575-- GtkAccessible *accessible = GTK_ACCESSIBLE (object);
576-- GtkAccessiblePrivate *priv = accessible->priv;
577--
578-- switch (prop_id)
579-- {
580-- case PROP_WIDGET:
581-- g_value_set_object (value, priv->widget);
582-- break;
583-- default:
584-- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
585-- break;
586-- }
587--}
588--
589--static void
590--gtk_accessible_init (GtkAccessible *accessible)
591--{
592-- accessible->priv = gtk_accessible_get_instance_private (accessible);
593--}
594--
595--static AtkStateSet *
596--gtk_accessible_ref_state_set (AtkObject *object)
597--{
598-- GtkAccessible *accessible = GTK_ACCESSIBLE (object);
599-- AtkStateSet *state_set;
600--
601-- state_set = ATK_OBJECT_CLASS (gtk_accessible_parent_class)->ref_state_set (object);
602--
603-- if (accessible->priv->widget == NULL)
604-- atk_state_set_add_state (state_set, ATK_STATE_DEFUNCT);
605--
606-- return state_set;
607--}
608--
609--static void
610--gtk_accessible_real_widget_set (GtkAccessible *accessible)
611--{
612-- atk_object_notify_state_change (ATK_OBJECT (accessible), ATK_STATE_DEFUNCT, FALSE);
613--}
614--
615--static void
616--gtk_accessible_real_widget_unset (GtkAccessible *accessible)
617--{
618-- atk_object_notify_state_change (ATK_OBJECT (accessible), ATK_STATE_DEFUNCT, TRUE);
619--}
620--
621--static void
622--gtk_accessible_dispose (GObject *object)
623--{
624-- GtkAccessible *accessible = GTK_ACCESSIBLE (object);
625--
626-- gtk_accessible_set_widget (accessible, NULL);
627--
628-- G_OBJECT_CLASS (gtk_accessible_parent_class)->dispose (object);
629--}
630--
631--static void
632--gtk_accessible_class_init (GtkAccessibleClass *klass)
633--{
634-- GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
635-- AtkObjectClass *atkobject_class = ATK_OBJECT_CLASS (klass);
636--
637-- klass->connect_widget_destroyed = gtk_accessible_real_connect_widget_destroyed;
638-- klass->widget_set = gtk_accessible_real_widget_set;
639-- klass->widget_unset = gtk_accessible_real_widget_unset;
640--
641-- atkobject_class->ref_state_set = gtk_accessible_ref_state_set;
642-- gobject_class->get_property = gtk_accessible_get_property;
643-- gobject_class->set_property = gtk_accessible_set_property;
644-- gobject_class->dispose = gtk_accessible_dispose;
645--
646-- g_object_class_install_property (gobject_class,
647-- PROP_WIDGET,
648-- g_param_spec_object ("widget",
649-- P_("Widget"),
650-- P_("The widget referenced by this accessible."),
651-- GTK_TYPE_WIDGET,
652-- G_PARAM_READWRITE));
653--}
654--
655--/**
656-- * gtk_accessible_set_widget:
657-- * @accessible: a #GtkAccessible
658-- * @widget: (allow-none): a #GtkWidget or %NULL to unset
659-- *
660-- * Sets the #GtkWidget corresponding to the #GtkAccessible.
661-- *
662-- * @accessible will not hold a reference to @widget.
663-- * It is the caller’s responsibility to ensure that when @widget
664-- * is destroyed, the widget is unset by calling this function
665-- * again with @widget set to %NULL.
666-- *
667-- * Since: 2.22
668-- */
669--void
670--gtk_accessible_set_widget (GtkAccessible *accessible,
671-- GtkWidget *widget)
672--{
673-- GtkAccessiblePrivate *priv;
674-- GtkAccessibleClass *klass;
675--
676-- g_return_if_fail (GTK_IS_ACCESSIBLE (accessible));
677--
678-- priv = accessible->priv;
679-- klass = GTK_ACCESSIBLE_GET_CLASS (accessible);
680--
681-- if (priv->widget == widget)
682-- return;
683--
684-- if (priv->widget)
685-- klass->widget_unset (accessible);
686--
687-- priv->widget = widget;
688--
689-- if (widget)
690-- klass->widget_set (accessible);
691--
692-- g_object_notify (G_OBJECT (accessible), "widget");
693--}
694--
695--/**
696-- * gtk_accessible_get_widget:
697-- * @accessible: a #GtkAccessible
698-- *
699-- * Gets the #GtkWidget corresponding to the #GtkAccessible.
700-- * The returned widget does not have a reference added, so
701-- * you do not need to unref it.
702-- *
703-- * Returns: (nullable) (transfer none): pointer to the #GtkWidget
704-- * corresponding to the #GtkAccessible, or %NULL.
705-- *
706-- * Since: 2.22
707-- */
708--GtkWidget*
709--gtk_accessible_get_widget (GtkAccessible *accessible)
710--{
711-- g_return_val_if_fail (GTK_IS_ACCESSIBLE (accessible), NULL);
712--
713-- return accessible->priv->widget;
714--}
715-
716- /**
717- * gtk_accessible_connect_widget_destroyed:
718-@@ -242,19 +73,3 @@ gtk_accessible_connect_widget_destroyed (GtkAccessible *accessible)
719- class->connect_widget_destroyed (accessible);
720- }
721-
722--static void
723--gtk_accessible_widget_destroyed (GtkWidget *widget,
724-- GtkAccessible *accessible)
725--{
726-- gtk_accessible_set_widget (accessible, NULL);
727--}
728--
729--static void
730--gtk_accessible_real_connect_widget_destroyed (GtkAccessible *accessible)
731--{
732-- GtkAccessiblePrivate *priv = accessible->priv;
733--
734-- if (priv->widget)
735-- g_signal_connect (priv->widget, "destroy",
736-- G_CALLBACK (gtk_accessible_widget_destroyed), accessible);
737--}
738-diff --git a/gtk/gtkaccessible.h b/gtk/gtkaccessible.h
739-index 9c2229b..85a198d 100644
740---- a/gtk/gtkaccessible.h
741-+++ b/gtk/gtkaccessible.h
742-@@ -22,34 +22,22 @@
743- #error "Only <gtk/gtk.h> can be included directly."
744- #endif
745-
746--#include <atk/atk.h>
747- #include <gtk/gtkwidget.h>
748-
749- G_BEGIN_DECLS
750-
751--#define GTK_TYPE_ACCESSIBLE (gtk_accessible_get_type ())
752--#define GTK_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessible))
753--#define GTK_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_ACCESSIBLE, GtkAccessibleClass))
754--#define GTK_IS_ACCESSIBLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_ACCESSIBLE))
755--#define GTK_IS_ACCESSIBLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_ACCESSIBLE))
756--#define GTK_ACCESSIBLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_ACCESSIBLE, GtkAccessibleClass))
757--
758- typedef struct _GtkAccessible GtkAccessible;
759- typedef struct _GtkAccessiblePrivate GtkAccessiblePrivate;
760- typedef struct _GtkAccessibleClass GtkAccessibleClass;
761-
762- struct _GtkAccessible
763- {
764-- AtkObject parent;
765--
766- /*< private >*/
767- GtkAccessiblePrivate *priv;
768- };
769-
770- struct _GtkAccessibleClass
771- {
772-- AtkObjectClass parent_class;
773--
774- void (*connect_widget_destroyed) (GtkAccessible *accessible);
775-
776- void (*widget_set) (GtkAccessible *accessible);
777-@@ -59,9 +47,6 @@ struct _GtkAccessibleClass
778- void (*_gtk_reserved4) (void);
779- };
780-
781--GDK_AVAILABLE_IN_ALL
782--GType gtk_accessible_get_type (void) G_GNUC_CONST;
783--
784- GDK_AVAILABLE_IN_ALL
785- void gtk_accessible_set_widget (GtkAccessible *accessible,
786- GtkWidget *widget);
787-diff --git a/gtk/gtkactionbar.c b/gtk/gtkactionbar.c
788-index effd494..ea86299 100644
789---- a/gtk/gtkactionbar.c
790-+++ b/gtk/gtkactionbar.c
791-@@ -351,7 +351,6 @@ gtk_action_bar_class_init (GtkActionBarClass *klass)
792- gtk_widget_class_bind_template_child_private (widget_class, GtkActionBar, box);
793- gtk_widget_class_bind_template_child_private (widget_class, GtkActionBar, revealer);
794-
795-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_PANEL);
796- gtk_widget_class_set_css_name (widget_class, "actionbar");
797- }
798-
799-diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
800-index bad21b3..4a09a7e 100644
801---- a/gtk/gtkassistant.c
802-+++ b/gtk/gtkassistant.c
803-@@ -58,8 +58,6 @@
804-
805- #include "config.h"
806-
807--#include <atk/atk.h>
808--
809- #include "gtkassistant.h"
810-
811- #include "gtkbutton.h"
812-@@ -405,8 +403,6 @@ gtk_assistant_class_init (GtkAssistantClass *class)
813- widget_class->unmap = gtk_assistant_unmap;
814- widget_class->delete_event = gtk_assistant_delete_event;
815-
816-- gtk_widget_class_set_accessible_type (widget_class, _gtk_assistant_accessible_get_type ());
817--
818- container_class->add = gtk_assistant_add;
819- container_class->remove = gtk_assistant_remove;
820- container_class->set_child_property = gtk_assistant_set_child_property;
821-@@ -2534,76 +2530,9 @@ gtk_assistant_commit (GtkAssistant *assistant)
822- typedef GtkWindowAccessible GtkAssistantAccessible;
823- typedef GtkWindowAccessibleClass GtkAssistantAccessibleClass;
824-
825--G_DEFINE_TYPE (GtkAssistantAccessible, _gtk_assistant_accessible, GTK_TYPE_WINDOW_ACCESSIBLE);
826--
827--static gint
828--gtk_assistant_accessible_get_n_children (AtkObject *accessible)
829--{
830-- GtkWidget *widget;
831--
832-- widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
833-- if (widget == NULL)
834-- return 0;
835--
836-- return g_list_length (GTK_ASSISTANT (widget)->priv->pages) + 2;
837--}
838--
839--static AtkObject *
840--gtk_assistant_accessible_ref_child (AtkObject *accessible,
841-- gint index)
842--{
843-- GtkAssistant *assistant;
844-- GtkAssistantPrivate *priv;
845-- GtkWidget *widget, *child;
846-- gint n_pages;
847-- AtkObject *obj;
848-- const gchar *title;
849--
850-- widget = gtk_accessible_get_widget (GTK_ACCESSIBLE (accessible));
851-- if (widget == NULL)
852-- return NULL;
853--
854-- assistant = GTK_ASSISTANT (widget);
855-- priv = assistant->priv;
856-- n_pages = g_list_length (priv->pages);
857--
858-- if (index < 0)
859-- return NULL;
860-- else if (index < n_pages)
861-- {
862-- GtkAssistantPage *page = g_list_nth_data (priv->pages, index);
863--
864-- child = page->page;
865-- title = gtk_assistant_get_page_title (assistant, child);
866-- }
867-- else if (index == n_pages)
868-- {
869-- child = priv->action_area;
870-- title = NULL;
871-- }
872-- else if (index == n_pages + 1)
873-- {
874-- child = priv->headerbar;
875-- title = NULL;
876-- }
877-- else
878-- return NULL;
879--
880-- obj = gtk_widget_get_accessible (child);
881--
882-- if (title)
883-- atk_object_set_name (obj, title);
884--
885-- return g_object_ref (obj);
886--}
887--
888- static void
889- _gtk_assistant_accessible_class_init (GtkAssistantAccessibleClass *klass)
890- {
891-- AtkObjectClass *atk_class = ATK_OBJECT_CLASS (klass);
892--
893-- atk_class->get_n_children = gtk_assistant_accessible_get_n_children;
894-- atk_class->ref_child = gtk_assistant_accessible_ref_child;
895- }
896-
897- static void
898-diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
899-index c372f9c..161bb54 100644
900---- a/gtk/gtkbox.c
901-+++ b/gtk/gtkbox.c
902-@@ -370,7 +370,6 @@ gtk_box_class_init (GtkBoxClass *class)
903-
904- gtk_container_class_install_child_properties (container_class, LAST_CHILD_PROP, child_props);
905-
906-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_FILLER);
907- gtk_widget_class_set_css_name (widget_class, "box");
908- }
909-
910-diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
911-index 26b7ffb..c9744a8 100644
912---- a/gtk/gtkbutton.c
913-+++ b/gtk/gtkbutton.c
914-@@ -630,7 +630,6 @@ gtk_button_class_init (GtkButtonClass *klass)
915- 2,
916- GTK_PARAM_READABLE | G_PARAM_DEPRECATED));
917-
918-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_BUTTON_ACCESSIBLE);
919- gtk_widget_class_set_css_name (widget_class, "button");
920- }
921-
922-diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
923-index 5f1a5d5..2c2e141 100644
924---- a/gtk/gtkcalendar.c
925-+++ b/gtk/gtkcalendar.c
926-@@ -680,7 +680,6 @@ gtk_calendar_class_init (GtkCalendarClass *class)
927- NULL,
928- G_TYPE_NONE, 0);
929-
930-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_CALENDAR);
931- gtk_widget_class_set_css_name (widget_class, "calendar");
932- }
933-
934-diff --git a/gtk/gtkcellrenderer.c b/gtk/gtkcellrenderer.c
935-index d10cd09..c3e68d3 100644
936---- a/gtk/gtkcellrenderer.c
937-+++ b/gtk/gtkcellrenderer.c
938-@@ -443,8 +443,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
939-
940- if (GtkCellRenderer_private_offset != 0)
941- g_type_class_adjust_private_offset (class, &GtkCellRenderer_private_offset);
942--
943-- gtk_cell_renderer_class_set_accessible_type (class, GTK_TYPE_RENDERER_CELL_ACCESSIBLE);
944- }
945-
946- static void
947-@@ -1850,38 +1848,3 @@ gtk_cell_renderer_get_state (GtkCellRenderer *cell,
948- return state;
949- }
950-
951--/**
952-- * gtk_cell_renderer_class_set_accessible_type:
953-- * @renderer_class: class to set the accessible type for
954-- * @type: The object type that implements the accessible for @widget_class.
955-- * The type must be a subtype of #GtkRendererCellAccessible
956-- *
957-- * Sets the type to be used for creating accessibles for cells rendered by
958-- * cell renderers of @renderer_class. Note that multiple accessibles will
959-- * be created.
960-- *
961-- * This function should only be called from class init functions of cell
962-- * renderers.
963-- **/
964--void
965--gtk_cell_renderer_class_set_accessible_type (GtkCellRendererClass *renderer_class,
966-- GType type)
967--{
968-- GtkCellRendererClassPrivate *priv;
969--
970-- g_return_if_fail (GTK_IS_CELL_RENDERER_CLASS (renderer_class));
971-- g_return_if_fail (g_type_is_a (type, GTK_TYPE_RENDERER_CELL_ACCESSIBLE));
972--
973-- priv = renderer_class->priv;
974--
975-- priv->accessible_type = type;
976--}
977--
978--GType
979--_gtk_cell_renderer_get_accessible_type (GtkCellRenderer *renderer)
980--{
981-- g_return_val_if_fail (GTK_IS_CELL_RENDERER (renderer), GTK_TYPE_RENDERER_CELL_ACCESSIBLE);
982--
983-- return GTK_CELL_RENDERER_GET_CLASS (renderer)->priv->accessible_type;
984--}
985--
986-diff --git a/gtk/gtkcellrendererpixbuf.c b/gtk/gtkcellrendererpixbuf.c
987-index e24f956..f4c9baf 100644
988---- a/gtk/gtkcellrendererpixbuf.c
989-+++ b/gtk/gtkcellrendererpixbuf.c
990-@@ -282,10 +282,6 @@ gtk_cell_renderer_pixbuf_class_init (GtkCellRendererPixbufClass *class)
991- P_("The GIcon being displayed"),
992- G_TYPE_ICON,
993- GTK_PARAM_READWRITE));
994--
995--
996--
997-- gtk_cell_renderer_class_set_accessible_type (cell_class, GTK_TYPE_IMAGE_CELL_ACCESSIBLE);
998- }
999-
1000- static void
1001-diff --git a/gtk/gtkcellrenderertext.c b/gtk/gtkcellrenderertext.c
1002-index 32eb155..aed7c6d 100644
1003---- a/gtk/gtkcellrenderertext.c
1004-+++ b/gtk/gtkcellrenderertext.c
1005-@@ -692,8 +692,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
1006- g_signal_set_va_marshaller (text_cell_renderer_signals [EDITED],
1007- G_OBJECT_CLASS_TYPE (object_class),
1008- _gtk_marshal_VOID__STRING_STRINGv);
1009--
1010-- gtk_cell_renderer_class_set_accessible_type (cell_class, GTK_TYPE_TEXT_CELL_ACCESSIBLE);
1011- }
1012-
1013- static void
1014-diff --git a/gtk/gtkcellrenderertoggle.c b/gtk/gtkcellrenderertoggle.c
1015-index ea5aebf..ca75f9d 100644
1016---- a/gtk/gtkcellrenderertoggle.c
1017-+++ b/gtk/gtkcellrenderertoggle.c
1018-@@ -196,8 +196,6 @@ gtk_cell_renderer_toggle_class_init (GtkCellRendererToggleClass *class)
1019- NULL,
1020- G_TYPE_NONE, 1,
1021- G_TYPE_STRING);
1022--
1023-- gtk_cell_renderer_class_set_accessible_type (cell_class, GTK_TYPE_BOOLEAN_CELL_ACCESSIBLE);
1024- }
1025-
1026- static void
1027-diff --git a/gtk/gtkcheckbutton.c b/gtk/gtkcheckbutton.c
1028-index a274524..2a89fb3 100644
1029---- a/gtk/gtkcheckbutton.c
1030-+++ b/gtk/gtkcheckbutton.c
1031-@@ -253,7 +253,6 @@ gtk_check_button_class_init (GtkCheckButtonClass *class)
1032- INDICATOR_SPACING,
1033- GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
1034-
1035-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_CHECK_BOX);
1036- gtk_widget_class_set_css_name (widget_class, "checkbutton");
1037- }
1038-
1039-diff --git a/gtk/gtkcheckmenuitem.c b/gtk/gtkcheckmenuitem.c
1040-index b3b32d2..ef71fb5 100644
1041---- a/gtk/gtkcheckmenuitem.c
1042-+++ b/gtk/gtkcheckmenuitem.c
1043-@@ -271,7 +271,6 @@ gtk_check_menu_item_class_init (GtkCheckMenuItemClass *klass)
1044- NULL,
1045- G_TYPE_NONE, 0);
1046-
1047-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_CHECK_MENU_ITEM_ACCESSIBLE);
1048- gtk_widget_class_set_css_name (widget_class, "menuitem");
1049- }
1050-
1051-diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c
1052-index 9fca31d..1aea899 100644
1053---- a/gtk/gtkcolorchooserwidget.c
1054-+++ b/gtk/gtkcolorchooserwidget.c
1055-@@ -344,7 +344,6 @@ add_palette (GtkColorChooserWidget *cc,
1056- {
1057- GtkWidget *grid;
1058- GtkWidget *p;
1059-- AtkObject *atk_obj;
1060- gint line, pos;
1061- gint i;
1062- gint left, right;
1063-@@ -373,11 +372,8 @@ add_palette (GtkColorChooserWidget *cc,
1064- for (i = 0; i < n_colors; i++)
1065- {
1066- p = gtk_color_swatch_new ();
1067-- atk_obj = gtk_widget_get_accessible (p);
1068- if (names)
1069- {
1070-- atk_object_set_name (atk_obj,
1071-- g_dpgettext2 (GETTEXT_PACKAGE, "Color name", names[i]));
1072- }
1073- else
1074- {
1075-@@ -385,7 +381,6 @@ add_palette (GtkColorChooserWidget *cc,
1076-
1077- name = accessible_color_name (&colors[i]);
1078- text = g_strdup_printf (_("Color: %s"), name);
1079-- atk_object_set_name (atk_obj, text);
1080- g_free (text);
1081- g_free (name);
1082- }
1083-@@ -513,7 +508,6 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc)
1084- GVariant *variant;
1085- GVariantIter iter;
1086- gboolean selected;
1087-- AtkObject *atk_obj;
1088- gchar *text, *name;
1089-
1090- cc->priv = gtk_color_chooser_widget_get_instance_private (cc);
1091-@@ -537,9 +531,6 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc)
1092-
1093- cc->priv->button = button = gtk_color_swatch_new ();
1094- gtk_widget_set_name (button, "add-color-button");
1095-- atk_obj = gtk_widget_get_accessible (button);
1096-- atk_object_set_name (atk_obj, _("Custom color"));
1097-- atk_object_set_description (atk_obj, _("Create a custom color"));
1098- connect_button_signals (button, cc);
1099- gtk_color_swatch_set_icon (GTK_COLOR_SWATCH (button), "list-add-symbolic");
1100- gtk_color_swatch_set_selectable (GTK_COLOR_SWATCH (button), FALSE);
1101-@@ -556,10 +547,8 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc)
1102- p = gtk_color_swatch_new ();
1103- gtk_color_swatch_set_rgba (GTK_COLOR_SWATCH (p), &color);
1104- gtk_color_swatch_set_can_drop (GTK_COLOR_SWATCH (p), TRUE);
1105-- atk_obj = gtk_widget_get_accessible (p);
1106- name = accessible_color_name (&color);
1107- text = g_strdup_printf (_("Custom color %d: %s"), i, name);
1108-- atk_object_set_name (atk_obj, text);
1109- g_free (text);
1110- g_free (name);
1111- connect_custom_signals (p, cc);
1112-diff --git a/gtk/gtkcolorplane.c b/gtk/gtkcolorplane.c
1113-index aa964bb..8217b9a 100644
1114---- a/gtk/gtkcolorplane.c
1115-+++ b/gtk/gtkcolorplane.c
1116-@@ -392,8 +392,6 @@ plane_drag_gesture_end (GtkGestureDrag *gesture,
1117- static void
1118- gtk_color_plane_init (GtkColorPlane *plane)
1119- {
1120-- AtkObject *atk_obj;
1121--
1122- plane->priv = gtk_color_plane_get_instance_private (plane);
1123-
1124- gtk_widget_set_can_focus (GTK_WIDGET (plane), TRUE);
1125-@@ -403,13 +401,6 @@ gtk_color_plane_init (GtkColorPlane *plane)
1126- | GDK_BUTTON_RELEASE_MASK
1127- | GDK_POINTER_MOTION_MASK);
1128-
1129-- atk_obj = gtk_widget_get_accessible (GTK_WIDGET (plane));
1130-- if (GTK_IS_ACCESSIBLE (atk_obj))
1131-- {
1132-- atk_object_set_name (atk_obj, _("Color Plane"));
1133-- atk_object_set_role (atk_obj, ATK_ROLE_COLOR_CHOOSER);
1134-- }
1135--
1136- plane->priv->drag_gesture = gtk_gesture_drag_new (GTK_WIDGET (plane));
1137- g_signal_connect (plane->priv->drag_gesture, "drag-begin",
1138- G_CALLBACK (plane_drag_gesture_begin), plane);
1139-diff --git a/gtk/gtkcolorscale.c b/gtk/gtkcolorscale.c
1140-index be1123d..47fad0d 100644
1141---- a/gtk/gtkcolorscale.c
1142-+++ b/gtk/gtkcolorscale.c
1143-@@ -200,19 +200,7 @@ static void
1144- scale_set_type (GtkColorScale *scale,
1145- GtkColorScaleType type)
1146- {
1147-- AtkObject *atk_obj;
1148--
1149- scale->priv->type = type;
1150--
1151-- atk_obj = gtk_widget_get_accessible (GTK_WIDGET (scale));
1152-- if (GTK_IS_ACCESSIBLE (atk_obj))
1153-- {
1154-- if (type == GTK_COLOR_SCALE_HUE)
1155-- atk_object_set_name (atk_obj, C_("Color channel", "Hue"));
1156-- else if (type == GTK_COLOR_SCALE_ALPHA)
1157-- atk_object_set_name (atk_obj, C_("Color channel", "Alpha"));
1158-- atk_object_set_role (atk_obj, ATK_ROLE_COLOR_CHOOSER);
1159-- }
1160- }
1161-
1162- static void
1163-diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
1164-index 106a19b..a5e9bb7 100644
1165---- a/gtk/gtkcolorswatch.c
1166-+++ b/gtk/gtkcolorswatch.c
1167-@@ -725,7 +725,6 @@ gtk_color_swatch_class_init (GtkColorSwatchClass *class)
1168- g_param_spec_boolean ("has-menu", P_("Has Menu"), P_("Whether the swatch should offer customization"),
1169- TRUE, GTK_PARAM_READWRITE));
1170-
1171-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_COLOR_SWATCH_ACCESSIBLE);
1172- gtk_widget_class_set_css_name (widget_class, "colorswatch");
1173- }
1174-
1175-diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
1176-index ef4996c..8c93248 100644
1177---- a/gtk/gtkcombobox.c
1178-+++ b/gtk/gtkcombobox.c
1179-@@ -1255,7 +1255,6 @@ gtk_combo_box_class_init (GtkComboBoxClass *klass)
1180- gtk_widget_class_bind_template_child_internal_private (widget_class, GtkComboBox, arrow);
1181- gtk_widget_class_bind_template_callback (widget_class, gtk_combo_box_button_toggled);
1182-
1183-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_COMBO_BOX_ACCESSIBLE);
1184- gtk_widget_class_set_css_name (widget_class, "combobox");
1185- }
1186-
1187-@@ -4640,35 +4639,6 @@ gtk_combo_box_get_popup_fixed_width (GtkComboBox *combo_box)
1188- }
1189-
1190-
1191--/**
1192-- * gtk_combo_box_get_popup_accessible:
1193-- * @combo_box: a #GtkComboBox
1194-- *
1195-- * Gets the accessible object corresponding to the combo box’s popup.
1196-- *
1197-- * This function is mostly intended for use by accessibility technologies;
1198-- * applications should have little use for it.
1199-- *
1200-- * Returns: (transfer none): the accessible object corresponding
1201-- * to the combo box’s popup.
1202-- *
1203-- * Since: 2.6
1204-- */
1205--AtkObject *
1206--gtk_combo_box_get_popup_accessible (GtkComboBox *combo_box)
1207--{
1208-- GtkComboBoxPrivate *priv;
1209--
1210-- g_return_val_if_fail (GTK_IS_COMBO_BOX (combo_box), NULL);
1211--
1212-- priv = combo_box->priv;
1213--
1214-- if (priv->popup_widget)
1215-- return gtk_widget_get_accessible (priv->popup_widget);
1216--
1217-- return NULL;
1218--}
1219--
1220- /**
1221- * gtk_combo_box_get_row_separator_func: (skip)
1222- * @combo_box: a #GtkComboBox
1223-diff --git a/gtk/gtkcombobox.h b/gtk/gtkcombobox.h
1224-index c886983..6835e9f 100644
1225---- a/gtk/gtkcombobox.h
1226-+++ b/gtk/gtkcombobox.h
1227-@@ -181,8 +181,6 @@ void gtk_combo_box_popup_for_device (GtkComboBox *combo_box,
1228- GdkDevice *device);
1229- GDK_AVAILABLE_IN_ALL
1230- void gtk_combo_box_popdown (GtkComboBox *combo_box);
1231--GDK_AVAILABLE_IN_ALL
1232--AtkObject * gtk_combo_box_get_popup_accessible (GtkComboBox *combo_box);
1233-
1234- GDK_AVAILABLE_IN_ALL
1235- gint gtk_combo_box_get_id_column (GtkComboBox *combo_box);
1236-diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
1237-index 435a233..c69f265 100644
1238---- a/gtk/gtkcontainer.c
1239-+++ b/gtk/gtkcontainer.c
1240-@@ -591,8 +591,6 @@ gtk_container_class_init (GtkContainerClass *class)
1241-
1242- if (GtkContainer_private_offset != 0)
1243- g_type_class_adjust_private_offset (class, &GtkContainer_private_offset);
1244--
1245-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_CONTAINER_ACCESSIBLE);
1246- }
1247-
1248- static void
1249-@@ -1875,8 +1873,6 @@ gtk_container_add (GtkContainer *container,
1250- }
1251-
1252- g_signal_emit (container, container_signals[ADD], 0, widget);
1253--
1254-- _gtk_container_accessible_add (GTK_WIDGET (container), widget);
1255- }
1256-
1257- /**
1258-@@ -1906,8 +1902,6 @@ gtk_container_remove (GtkContainer *container,
1259-
1260- g_signal_emit (container, container_signals[REMOVE], 0, widget);
1261-
1262-- _gtk_container_accessible_remove (GTK_WIDGET (container), widget);
1263--
1264- g_object_unref (widget);
1265- g_object_unref (container);
1266- }
1267-diff --git a/gtk/gtkdialog.c b/gtk/gtkdialog.c
1268-index 0e58ac4..dd87df4 100644
1269---- a/gtk/gtkdialog.c
1270-+++ b/gtk/gtkdialog.c
1271-@@ -533,8 +533,6 @@ gtk_dialog_class_init (GtkDialogClass *class)
1272- widget_class->map = gtk_dialog_map;
1273- widget_class->style_updated = gtk_dialog_style_updated;
1274-
1275-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_DIALOG);
1276--
1277- class->close = gtk_dialog_close;
1278-
1279- /**
1280-diff --git a/gtk/gtkdrawingarea.c b/gtk/gtkdrawingarea.c
1281-index 261bf34..7a5b6e3 100644
1282---- a/gtk/gtkdrawingarea.c
1283-+++ b/gtk/gtkdrawingarea.c
1284-@@ -135,8 +135,6 @@ gtk_drawing_area_class_init (GtkDrawingAreaClass *class)
1285- widget_class->realize = gtk_drawing_area_realize;
1286- widget_class->size_allocate = gtk_drawing_area_size_allocate;
1287- widget_class->style_updated = gtk_drawing_area_style_updated;
1288--
1289-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_DRAWING_AREA);
1290- }
1291-
1292- static void
1293-diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
1294-index 4078855..7dd9f1a 100644
1295---- a/gtk/gtkentry.c
1296-+++ b/gtk/gtkentry.c
1297-@@ -2125,7 +2125,6 @@ gtk_entry_class_init (GtkEntryClass *class)
1298- gtk_binding_entry_add_signal (binding_set, GDK_KEY_semicolon, GDK_CONTROL_MASK,
1299- "insert-emoji", 0);
1300-
1301-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ENTRY_ACCESSIBLE);
1302- gtk_widget_class_set_css_name (widget_class, "entry");
1303- }
1304-
1305-diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
1306-index ea159fe..0c04e53 100644
1307---- a/gtk/gtkentrycompletion.c
1308-+++ b/gtk/gtkentrycompletion.c
1309-@@ -2634,30 +2634,12 @@ static void
1310- set_accessible_relation (GtkWidget *window,
1311- GtkWidget *entry)
1312- {
1313-- AtkObject *window_accessible;
1314-- AtkObject *entry_accessible;
1315--
1316-- window_accessible = gtk_widget_get_accessible (window);
1317-- entry_accessible = gtk_widget_get_accessible (entry);
1318--
1319-- atk_object_add_relationship (window_accessible,
1320-- ATK_RELATION_POPUP_FOR,
1321-- entry_accessible);
1322- }
1323-
1324- static void
1325- unset_accessible_relation (GtkWidget *window,
1326- GtkWidget *entry)
1327- {
1328-- AtkObject *window_accessible;
1329-- AtkObject *entry_accessible;
1330--
1331-- window_accessible = gtk_widget_get_accessible (window);
1332-- entry_accessible = gtk_widget_get_accessible (entry);
1333--
1334-- atk_object_remove_relationship (window_accessible,
1335-- ATK_RELATION_POPUP_FOR,
1336-- entry_accessible);
1337- }
1338-
1339- static void
1340-diff --git a/gtk/gtkexpander.c b/gtk/gtkexpander.c
1341-index 8cfbdb3..78f30d9 100644
1342---- a/gtk/gtkexpander.c
1343-+++ b/gtk/gtkexpander.c
1344-@@ -427,7 +427,6 @@ gtk_expander_class_init (GtkExpanderClass *klass)
1345- NULL,
1346- G_TYPE_NONE, 0);
1347-
1348-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_EXPANDER_ACCESSIBLE);
1349- gtk_widget_class_set_css_name (widget_class, "expander");
1350- }
1351-
1352-diff --git a/gtk/gtkfilechooserdialog.c b/gtk/gtkfilechooserdialog.c
1353-index db1d8f6..e577f8e 100644
1354---- a/gtk/gtkfilechooserdialog.c
1355-+++ b/gtk/gtkfilechooserdialog.c
1356-@@ -265,8 +265,6 @@ gtk_file_chooser_dialog_class_init (GtkFileChooserDialogClass *class)
1357- widget_class->unmap = gtk_file_chooser_dialog_unmap;
1358- widget_class->size_allocate = gtk_file_chooser_dialog_size_allocate;
1359-
1360-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_FILE_CHOOSER);
1361--
1362- _gtk_file_chooser_install_properties (gobject_class);
1363-
1364- /* Bind class to template
1365-diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
1366-index ab531f7..46acc87 100644
1367---- a/gtk/gtkfilechooserwidget.c
1368-+++ b/gtk/gtkfilechooserwidget.c
1369-@@ -8758,7 +8758,6 @@ gtk_file_chooser_widget_class_init (GtkFileChooserWidgetClass *class)
1370- gtk_widget_class_bind_template_callback (widget_class, rename_file_rename_clicked);
1371- gtk_widget_class_bind_template_callback (widget_class, rename_file_end);
1372-
1373-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_FILE_CHOOSER_WIDGET_ACCESSIBLE);
1374- gtk_widget_class_set_css_name (widget_class, "filechooser");
1375- }
1376-
1377-@@ -8767,7 +8766,6 @@ post_process_ui (GtkFileChooserWidget *impl)
1378- {
1379- GtkTreeSelection *selection;
1380- GtkCellRenderer *cell;
1381-- AtkObject *atk_obj;
1382- GList *cells;
1383- GFile *file;
1384-
1385-@@ -8824,10 +8822,6 @@ post_process_ui (GtkFileChooserWidget *impl)
1386- */
1387- set_icon_cell_renderer_fixed_size (impl);
1388-
1389-- atk_obj = gtk_widget_get_accessible (impl->priv->browse_new_folder_button);
1390-- if (GTK_IS_ACCESSIBLE (atk_obj))
1391-- atk_object_set_name (atk_obj, _("Create Folder"));
1392--
1393- gtk_popover_set_default_widget (GTK_POPOVER (impl->priv->new_folder_popover), impl->priv->new_folder_create_button);
1394- gtk_popover_set_default_widget (GTK_POPOVER (impl->priv->rename_file_popover), impl->priv->rename_file_rename_button);
1395- gtk_popover_set_relative_to (GTK_POPOVER (impl->priv->rename_file_popover), impl->priv->browse_files_tree_view);
1396-diff --git a/gtk/gtkflowbox.c b/gtk/gtkflowbox.c
1397-index cd7bd83..9abf11f 100644
1398---- a/gtk/gtkflowbox.c
1399-+++ b/gtk/gtkflowbox.c
1400-@@ -635,7 +635,6 @@ gtk_flow_box_child_class_init (GtkFlowBoxChildClass *class)
1401- G_TYPE_NONE, 0);
1402- widget_class->activate_signal = child_signals[CHILD_ACTIVATE];
1403-
1404-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_LIST_ITEM);
1405- gtk_widget_class_set_css_name (widget_class, "flowboxchild");
1406- }
1407-
1408-@@ -1025,7 +1024,6 @@ gtk_flow_box_update_cursor (GtkFlowBox *box,
1409- BOX_PRIV (box)->cursor_child = child;
1410- gtk_widget_grab_focus (GTK_WIDGET (child));
1411- gtk_widget_queue_draw (GTK_WIDGET (child));
1412-- _gtk_flow_box_accessible_update_cursor (GTK_WIDGET (box), GTK_WIDGET (child));
1413- }
1414-
1415- static void
1416-@@ -3645,7 +3643,6 @@ gtk_flow_box_move_cursor (GtkFlowBox *box,
1417- static void
1418- gtk_flow_box_selected_children_changed (GtkFlowBox *box)
1419- {
1420-- _gtk_flow_box_accessible_selection_changed (GTK_WIDGET (box));
1421- }
1422-
1423- /* GObject implementation {{{2 */
1424-@@ -4100,7 +4097,6 @@ gtk_flow_box_class_init (GtkFlowBoxClass *class)
1425- gtk_binding_entry_add_signal (binding_set, GDK_KEY_a, GDK_CONTROL_MASK | GDK_SHIFT_MASK,
1426- "unselect-all", 0);
1427-
1428-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_FLOW_BOX_ACCESSIBLE);
1429- gtk_widget_class_set_css_name (widget_class, "flowbox");
1430- }
1431-
1432-diff --git a/gtk/gtkfontchooserdialog.c b/gtk/gtkfontchooserdialog.c
1433-index 723412f..9b2b349 100644
1434---- a/gtk/gtkfontchooserdialog.c
1435-+++ b/gtk/gtkfontchooserdialog.c
1436-@@ -22,8 +22,6 @@
1437- #include <glib/gprintf.h>
1438- #include <string.h>
1439-
1440--#include <atk/atk.h>
1441--
1442- #include "gtkfontchooserdialog.h"
1443- #include "gtkfontchooser.h"
1444- #include "gtkfontchooserwidget.h"
1445-diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c
1446-index 50f3b2f..a610e3e 100644
1447---- a/gtk/gtkfontchooserwidget.c
1448-+++ b/gtk/gtkfontchooserwidget.c
1449-@@ -21,8 +21,6 @@
1450- #include <glib/gprintf.h>
1451- #include <string.h>
1452-
1453--#include <atk/atk.h>
1454--
1455- #include "gtkfontchooserwidget.h"
1456- #include "gtkfontchooserwidgetprivate.h"
1457-
1458-diff --git a/gtk/gtkframe.c b/gtk/gtkframe.c
1459-index 8ae7054..7ddcd45 100644
1460---- a/gtk/gtkframe.c
1461-+++ b/gtk/gtkframe.c
1462-@@ -282,7 +282,6 @@ gtk_frame_class_init (GtkFrameClass *class)
1463-
1464- class->compute_child_allocation = gtk_frame_real_compute_child_allocation;
1465-
1466-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_FRAME_ACCESSIBLE);
1467- gtk_widget_class_set_css_name (widget_class, "frame");
1468- }
1469-
1470-diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c
1471-index 802303e..145e5ad 100644
1472---- a/gtk/gtkglarea.c
1473-+++ b/gtk/gtkglarea.c
1474-@@ -766,8 +766,6 @@ gtk_gl_area_class_init (GtkGLAreaClass *klass)
1475- widget_class->size_allocate = gtk_gl_area_size_allocate;
1476- widget_class->draw = gtk_gl_area_draw;
1477-
1478-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_DRAWING_AREA);
1479--
1480- /**
1481- * GtkGLArea:context:
1482- *
1483-diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
1484-index 0ef94e3..5c32fc6 100644
1485---- a/gtk/gtkheaderbar.c
1486-+++ b/gtk/gtkheaderbar.c
1487-@@ -351,7 +351,6 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
1488- {
1489- GtkWidget *button = NULL;
1490- GtkWidget *image = NULL;
1491-- AtkObject *accessible;
1492-
1493- if (strcmp (t[j], "icon") == 0 &&
1494- is_sovereign_window)
1495-@@ -386,10 +385,6 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
1496- gtk_widget_set_can_focus (button, FALSE);
1497- gtk_widget_show_all (button);
1498-
1499-- accessible = gtk_widget_get_accessible (button);
1500-- if (GTK_IS_ACCESSIBLE (accessible))
1501-- atk_object_set_name (accessible, _("Application menu"));
1502--
1503- priv->titlebar_icon = image;
1504- if (!_gtk_header_bar_update_window_icon (bar, window))
1505- gtk_image_set_from_icon_name (GTK_IMAGE (priv->titlebar_icon),
1506-@@ -409,10 +404,6 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
1507- gtk_widget_show_all (button);
1508- g_signal_connect_swapped (button, "clicked",
1509- G_CALLBACK (gtk_window_iconify), window);
1510--
1511-- accessible = gtk_widget_get_accessible (button);
1512-- if (GTK_IS_ACCESSIBLE (accessible))
1513-- atk_object_set_name (accessible, _("Minimize"));
1514- }
1515- else if (strcmp (t[j], "maximize") == 0 &&
1516- gtk_window_get_resizable (window) &&
1517-@@ -433,10 +424,6 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
1518- gtk_widget_show_all (button);
1519- g_signal_connect_swapped (button, "clicked",
1520- G_CALLBACK (_gtk_window_toggle_maximized), window);
1521--
1522-- accessible = gtk_widget_get_accessible (button);
1523-- if (GTK_IS_ACCESSIBLE (accessible))
1524-- atk_object_set_name (accessible, maximized ? _("Restore") : _("Maximize"));
1525- }
1526- else if (strcmp (t[j], "close") == 0 &&
1527- gtk_window_get_deletable (window))
1528-@@ -452,10 +439,6 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
1529- gtk_widget_show_all (button);
1530- g_signal_connect_swapped (button, "clicked",
1531- G_CALLBACK (gtk_window_close), window);
1532--
1533-- accessible = gtk_widget_get_accessible (button);
1534-- if (GTK_IS_ACCESSIBLE (accessible))
1535-- atk_object_set_name (accessible, _("Close"));
1536- }
1537-
1538- if (button)
1539-@@ -2118,8 +2101,6 @@ gtk_header_bar_class_init (GtkHeaderBarClass *class)
1540-
1541- g_object_class_install_properties (object_class, LAST_PROP, header_bar_props);
1542-
1543-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_HEADER_BAR_ACCESSIBLE);
1544-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_PANEL);
1545- gtk_widget_class_set_css_name (widget_class, "headerbar");
1546- }
1547-
1548-diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c
1549-index 735695e..2fdb814 100644
1550---- a/gtk/gtkiconview.c
1551-+++ b/gtk/gtkiconview.c
1552-@@ -965,7 +965,6 @@ gtk_icon_view_class_init (GtkIconViewClass *klass)
1553- gtk_icon_view_add_move_binding (binding_set, GDK_KEY_KP_Left, 0,
1554- GTK_MOVEMENT_VISUAL_POSITIONS, -1);
1555-
1556-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_ICON_VIEW_ACCESSIBLE);
1557- gtk_widget_class_set_css_name (widget_class, "iconview");
1558- }
1559-
1560-@@ -2125,19 +2124,6 @@ static void
1561- gtk_icon_view_item_selected_changed (GtkIconView *icon_view,
1562- GtkIconViewItem *item)
1563- {
1564-- AtkObject *obj;
1565-- AtkObject *item_obj;
1566--
1567-- obj = gtk_widget_get_accessible (GTK_WIDGET (icon_view));
1568-- if (obj != NULL)
1569-- {
1570-- item_obj = atk_object_ref_accessible_child (obj, item->index);
1571-- if (item_obj != NULL)
1572-- {
1573-- atk_object_notify_state_change (item_obj, ATK_STATE_SELECTED, item->selected);
1574-- g_object_unref (item_obj);
1575-- }
1576-- }
1577- }
1578-
1579- static void
1580-@@ -2939,8 +2925,6 @@ gtk_icon_view_adjustment_changed (GtkAdjustment *adjustment,
1581-
1582- if (icon_view->priv->doing_rubberband)
1583- gtk_icon_view_update_rubberband (GTK_WIDGET (icon_view));
1584--
1585-- _gtk_icon_view_accessible_adjustment_changed (icon_view);
1586- }
1587- }
1588-
1589-@@ -3238,10 +3222,6 @@ _gtk_icon_view_set_cursor_item (GtkIconView *icon_view,
1590- GtkIconViewItem *item,
1591- GtkCellRenderer *cursor_cell)
1592- {
1593-- AtkObject *obj;
1594-- AtkObject *item_obj;
1595-- AtkObject *cursor_item_obj;
1596--
1597- /* When hitting this path from keynav, the focus cell is
1598- * already set, we dont need to notify the atk object
1599- * but we still need to queue the draw here (in the case
1600-@@ -3253,17 +3233,10 @@ _gtk_icon_view_set_cursor_item (GtkIconView *icon_view,
1601- (cursor_cell == NULL || cursor_cell == gtk_cell_area_get_focus_cell (icon_view->priv->cell_area)))
1602- return;
1603-
1604-- obj = gtk_widget_get_accessible (GTK_WIDGET (icon_view));
1605- if (icon_view->priv->cursor_item != NULL)
1606- {
1607- gtk_icon_view_queue_draw_item (icon_view, icon_view->priv->cursor_item);
1608-- if (obj != NULL)
1609-- {
1610-- cursor_item_obj = atk_object_ref_accessible_child (obj, icon_view->priv->cursor_item->index);
1611-- if (cursor_item_obj != NULL)
1612-- atk_object_notify_state_change (cursor_item_obj, ATK_STATE_FOCUSED, FALSE);
1613- }
1614-- }
1615- icon_view->priv->cursor_item = item;
1616-
1617- if (cursor_cell)
1618-@@ -3274,18 +3247,6 @@ _gtk_icon_view_set_cursor_item (GtkIconView *icon_view,
1619- if (!gtk_cell_area_get_focus_cell (icon_view->priv->cell_area))
1620- gtk_cell_area_focus (icon_view->priv->cell_area, GTK_DIR_TAB_FORWARD);
1621- }
1622--
1623-- /* Notify that accessible focus object has changed */
1624-- item_obj = atk_object_ref_accessible_child (obj, item->index);
1625--
1626-- if (item_obj != NULL)
1627-- {
1628-- G_GNUC_BEGIN_IGNORE_DEPRECATIONS;
1629-- atk_focus_tracker_notify (item_obj);
1630-- G_GNUC_END_IGNORE_DEPRECATIONS;
1631-- atk_object_notify_state_change (item_obj, ATK_STATE_FOCUSED, TRUE);
1632-- g_object_unref (item_obj);
1633-- }
1634- }
1635-
1636-
1637-diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c
1638-index 5d6e715..df60ede 100644
1639---- a/gtk/gtkimage.c
1640-+++ b/gtk/gtkimage.c
1641-@@ -402,7 +402,6 @@ gtk_image_class_init (GtkImageClass *class)
1642-
1643- g_object_class_install_properties (gobject_class, NUM_PROPERTIES, image_props);
1644-
1645-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_IMAGE_ACCESSIBLE);
1646- gtk_widget_class_set_css_name (widget_class, "image");
1647- }
1648-
1649-diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
1650-index 8eb89ff..6ee5bc1 100644
1651---- a/gtk/gtkinfobar.c
1652-+++ b/gtk/gtkinfobar.c
1653-@@ -1276,7 +1276,6 @@ gtk_info_bar_set_message_type (GtkInfoBar *info_bar,
1654- if (priv->message_type != message_type)
1655- {
1656- GtkStyleContext *context;
1657-- AtkObject *atk_obj;
1658- const char *type_class[] = {
1659- GTK_STYLE_CLASS_INFO,
1660- GTK_STYLE_CLASS_WARNING,
1661-@@ -1294,43 +1293,6 @@ gtk_info_bar_set_message_type (GtkInfoBar *info_bar,
1662-
1663- gtk_widget_queue_draw (GTK_WIDGET (info_bar));
1664-
1665-- atk_obj = gtk_widget_get_accessible (GTK_WIDGET (info_bar));
1666-- if (GTK_IS_ACCESSIBLE (atk_obj))
1667-- {
1668-- const char *name = NULL;
1669--
1670-- atk_object_set_role (atk_obj, ATK_ROLE_INFO_BAR);
1671--
1672-- switch (message_type)
1673-- {
1674-- case GTK_MESSAGE_INFO:
1675-- name = _("Information");
1676-- break;
1677--
1678-- case GTK_MESSAGE_QUESTION:
1679-- name = _("Question");
1680-- break;
1681--
1682-- case GTK_MESSAGE_WARNING:
1683-- name = _("Warning");
1684-- break;
1685--
1686-- case GTK_MESSAGE_ERROR:
1687-- name = _("Error");
1688-- break;
1689--
1690-- case GTK_MESSAGE_OTHER:
1691-- break;
1692--
1693-- default:
1694-- g_warning ("Unknown GtkMessageType %u", message_type);
1695-- break;
1696-- }
1697--
1698-- if (name)
1699-- atk_object_set_name (atk_obj, name);
1700-- }
1701--
1702- if (type_class[priv->message_type])
1703- gtk_style_context_add_class (context, type_class[priv->message_type]);
1704-
1705-diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
1706-index 8ba764c..b011d7b 100644
1707---- a/gtk/gtklabel.c
1708-+++ b/gtk/gtklabel.c
1709-@@ -1194,8 +1194,6 @@ gtk_label_class_init (GtkLabelClass *class)
1710- gtk_binding_entry_add_signal (binding_set, GDK_KEY_KP_Enter, 0,
1711- "activate-current-link", 0);
1712-
1713-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_LABEL_ACCESSIBLE);
1714--
1715- gtk_widget_class_set_css_name (widget_class, "label");
1716-
1717- quark_shortcuts_connected = g_quark_from_static_string ("gtk-label-shortcuts-connected");
1718-@@ -2146,12 +2144,9 @@ gtk_label_set_text_internal (GtkLabel *label,
1719- return;
1720- }
1721-
1722-- _gtk_label_accessible_text_deleted (label);
1723- g_free (priv->text);
1724- priv->text = str;
1725-
1726-- _gtk_label_accessible_text_inserted (label);
1727--
1728- gtk_label_select_region_index (label, 0, 0);
1729- }
1730-
1731-@@ -2680,7 +2675,6 @@ gtk_label_set_markup_internal (GtkLabel *label,
1732- {
1733- gtk_label_ensure_select_info (label);
1734- priv->select_info->links = g_list_reverse (links);
1735-- _gtk_label_accessible_update_links (label);
1736- gtk_label_ensure_has_tooltip (label);
1737- }
1738-
1739-@@ -4818,7 +4812,6 @@ gtk_label_grab_focus (GtkWidget *widget)
1740- {
1741- priv->select_info->selection_anchor = link->start;
1742- priv->select_info->selection_end = link->start;
1743-- _gtk_label_accessible_focus_link_changed (label);
1744- break;
1745- }
1746- }
1747-@@ -4851,7 +4844,6 @@ gtk_label_focus (GtkWidget *widget,
1748- {
1749- info->selection_anchor = focus_link->start;
1750- info->selection_end = focus_link->start;
1751-- _gtk_label_accessible_focus_link_changed (label);
1752- }
1753- }
1754- }
1755-@@ -4882,7 +4874,6 @@ gtk_label_focus (GtkWidget *widget,
1756- if (!range_is_in_ellipsis (label, link->start, link->end))
1757- {
1758- gtk_label_select_region_index (label, link->start, link->start);
1759-- _gtk_label_accessible_focus_link_changed (label);
1760- return TRUE;
1761- }
1762- }
1763-@@ -4897,7 +4888,6 @@ gtk_label_focus (GtkWidget *widget,
1764- if (!range_is_in_ellipsis (label, link->start, link->end))
1765- {
1766- gtk_label_select_region_index (label, link->start, link->start);
1767-- _gtk_label_accessible_focus_link_changed (label);
1768- return TRUE;
1769- }
1770- }
1771-@@ -4951,7 +4941,6 @@ gtk_label_focus (GtkWidget *widget,
1772- focus_link = l->data;
1773- info->selection_anchor = focus_link->start;
1774- info->selection_end = focus_link->start;
1775-- _gtk_label_accessible_focus_link_changed (label);
1776- gtk_widget_queue_draw (widget);
1777-
1778- return TRUE;
1779-@@ -6733,7 +6722,6 @@ gtk_label_clear_links (GtkLabel *label)
1780- priv->select_info->links = NULL;
1781- priv->select_info->active_link = NULL;
1782-
1783-- _gtk_label_accessible_update_links (label);
1784- }
1785-
1786- static gboolean
1787-diff --git a/gtk/gtklevelbar.c b/gtk/gtklevelbar.c
1788-index 6e3ac12..296eb28 100644
1789---- a/gtk/gtklevelbar.c
1790-+++ b/gtk/gtklevelbar.c
1791-@@ -1136,7 +1136,6 @@ gtk_level_bar_class_init (GtkLevelBarClass *klass)
1792-
1793- g_object_class_install_properties (oclass, LAST_PROPERTY, properties);
1794-
1795-- gtk_widget_class_set_accessible_type (wclass, GTK_TYPE_LEVEL_BAR_ACCESSIBLE);
1796- gtk_widget_class_set_css_name (wclass, "levelbar");
1797- }
1798-
1799-diff --git a/gtk/gtklinkbutton.c b/gtk/gtklinkbutton.c
1800-index 103348a..3476b79 100644
1801---- a/gtk/gtklinkbutton.c
1802-+++ b/gtk/gtklinkbutton.c
1803-@@ -209,7 +209,6 @@ gtk_link_button_class_init (GtkLinkButtonClass *klass)
1804- _gtk_marshal_BOOLEAN__VOID,
1805- G_TYPE_BOOLEAN, 0);
1806-
1807-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_LINK_BUTTON_ACCESSIBLE);
1808- gtk_widget_class_set_css_name (widget_class, "button");
1809- }
1810-
1811-diff --git a/gtk/gtklistbox.c b/gtk/gtklistbox.c
1812-index efc3434..11b0b98 100644
1813---- a/gtk/gtklistbox.c
1814-+++ b/gtk/gtklistbox.c
1815-@@ -447,8 +447,6 @@ gtk_list_box_class_init (GtkListBoxClass *klass)
1816- GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
1817- GtkBindingSet *binding_set;
1818-
1819-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_LIST_BOX_ACCESSIBLE);
1820--
1821- object_class->get_property = gtk_list_box_get_property;
1822- object_class->set_property = gtk_list_box_set_property;
1823- object_class->finalize = gtk_list_box_finalize;
1824-@@ -903,7 +901,6 @@ gtk_list_box_unselect_all (GtkListBox *box)
1825- static void
1826- gtk_list_box_selected_rows_changed (GtkListBox *box)
1827- {
1828-- _gtk_list_box_accessible_selection_changed (box);
1829- }
1830-
1831- /**
1832-@@ -1559,7 +1556,6 @@ gtk_list_box_update_cursor (GtkListBox *box,
1833- if (grab_focus)
1834- gtk_widget_grab_focus (GTK_WIDGET (row));
1835- gtk_widget_queue_draw (GTK_WIDGET (row));
1836-- _gtk_list_box_accessible_update_cursor (box, row);
1837- }
1838-
1839- static GtkListBox *
1840-@@ -3866,8 +3862,6 @@ gtk_list_box_row_class_init (GtkListBoxRowClass *klass)
1841- GObjectClass *object_class = G_OBJECT_CLASS (klass);
1842- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
1843-
1844-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_LIST_BOX_ROW_ACCESSIBLE);
1845--
1846- object_class->get_property = gtk_list_box_row_get_property;
1847- object_class->set_property = gtk_list_box_row_set_property;
1848- object_class->finalize = gtk_list_box_row_finalize;
1849-diff --git a/gtk/gtklockbutton.c b/gtk/gtklockbutton.c
1850-index 6750f6e..4086e67 100644
1851---- a/gtk/gtklockbutton.c
1852-+++ b/gtk/gtklockbutton.c
1853-@@ -189,12 +189,10 @@ gtk_lock_button_set_property (GObject *object,
1854-
1855- case PROP_TEXT_LOCK:
1856- gtk_label_set_text (GTK_LABEL (priv->label_lock), g_value_get_string (value));
1857-- _gtk_lock_button_accessible_name_changed (button);
1858- break;
1859-
1860- case PROP_TEXT_UNLOCK:
1861- gtk_label_set_text (GTK_LABEL (priv->label_unlock), g_value_get_string (value));
1862-- _gtk_lock_button_accessible_name_changed (button);
1863- break;
1864-
1865- case PROP_TOOLTIP_LOCK:
1866-@@ -322,7 +320,6 @@ gtk_lock_button_class_init (GtkLockButtonClass *klass)
1867- gtk_widget_class_bind_template_child_private (widget_class, GtkLockButton, label_unlock);
1868- gtk_widget_class_bind_template_child_private (widget_class, GtkLockButton, stack);
1869-
1870-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_LOCK_BUTTON_ACCESSIBLE);
1871- gtk_widget_class_set_css_name (widget_class, "button");
1872- }
1873-
1874-@@ -387,7 +384,6 @@ update_state (GtkLockButton *button)
1875- gtk_image_set_from_gicon (GTK_IMAGE (priv->image), icon, GTK_ICON_SIZE_MENU);
1876- gtk_stack_set_visible_child (GTK_STACK (priv->stack),
1877- allowed ? priv->label_lock : priv->label_unlock);
1878-- _gtk_lock_button_accessible_name_changed (button);
1879- gtk_widget_set_tooltip_markup (GTK_WIDGET (button), tooltip);
1880- gtk_widget_set_sensitive (GTK_WIDGET (button), sensitive);
1881- gtk_widget_set_visible (GTK_WIDGET (button), visible);
1882-diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
1883-index ae64e18..d82fbf3 100644
1884---- a/gtk/gtkmain.c
1885-+++ b/gtk/gtkmain.c
1886-@@ -131,8 +131,6 @@
1887- #include "gtkwindowprivate.h"
1888- #include "gtkwindowgroup.h"
1889-
1890--#include "a11y/gtkaccessibility.h"
1891--
1892- /* Private type definitions
1893- */
1894- typedef struct _GtkKeySnooperData GtkKeySnooperData;
1895-@@ -712,7 +710,6 @@ gettext_initialization (void)
1896- static void
1897- default_display_notify_cb (GdkDisplayManager *dm)
1898- {
1899-- _gtk_accessibility_init ();
1900- debug_flags[0].display = gdk_display_get_default ();
1901- }
1902-
1903-@@ -2435,18 +2432,6 @@ gtk_invoke_key_snoopers (GtkWidget *grab_widget,
1904- GSList *slist;
1905- gint return_val = FALSE;
1906-
1907-- return_val = _gtk_accessibility_key_snooper (grab_widget, (GdkEventKey *) event);
1908--
1909-- slist = key_snoopers;
1910-- while (slist && !return_val)
1911-- {
1912-- GtkKeySnooperData *data;
1913--
1914-- data = slist->data;
1915-- slist = slist->next;
1916-- return_val = (*data->func) (grab_widget, (GdkEventKey*) event, data->func_data);
1917-- }
1918--
1919- return return_val;
1920- }
1921-
1922-diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
1923-index 18bef69..c039a03 100644
1924---- a/gtk/gtkmenu.c
1925-+++ b/gtk/gtkmenu.c
1926-@@ -1090,7 +1090,6 @@ gtk_menu_class_init (GtkMenuClass *class)
1927- GTK_TYPE_SCROLL_TYPE,
1928- GTK_SCROLL_PAGE_DOWN);
1929-
1930-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_MENU_ACCESSIBLE);
1931- gtk_widget_class_set_css_name (widget_class, "menu");
1932- }
1933-
1934-diff --git a/gtk/gtkmenubar.c b/gtk/gtkmenubar.c
1935-index fcf687b..ba80892 100644
1936---- a/gtk/gtkmenubar.c
1937-+++ b/gtk/gtkmenubar.c
1938-@@ -275,7 +275,6 @@ gtk_menu_bar_class_init (GtkMenuBarClass *class)
1939- GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
1940-
1941- gtk_container_class_handle_border_width (container_class);
1942-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_MENU_BAR);
1943- gtk_widget_class_set_css_name (widget_class, "menubar");
1944- }
1945-
1946-diff --git a/gtk/gtkmenubutton.c b/gtk/gtkmenubutton.c
1947-index 56b687f..2bd7956 100644
1948---- a/gtk/gtkmenubutton.c
1949-+++ b/gtk/gtkmenubutton.c
1950-@@ -568,7 +568,6 @@ gtk_menu_button_class_init (GtkMenuButtonClass *klass)
1951-
1952- g_object_class_install_properties (gobject_class, LAST_PROP, menu_button_props);
1953-
1954-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_MENU_BUTTON_ACCESSIBLE);
1955- gtk_widget_class_set_css_name (widget_class, "button");
1956- }
1957-
1958-diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
1959-index 2fee8ee..f1d21c6 100644
1960---- a/gtk/gtkmenuitem.c
1961-+++ b/gtk/gtkmenuitem.c
1962-@@ -919,7 +919,6 @@ gtk_menu_item_class_init (GtkMenuItemClass *klass)
1963- 0, G_MAXINT, 12,
1964- GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
1965-
1966-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_MENU_ITEM_ACCESSIBLE);
1967- gtk_widget_class_set_css_name (widget_class, "menuitem");
1968-
1969- gtk_container_class_handle_border_width (container_class);
1970-diff --git a/gtk/gtkmenushell.c b/gtk/gtkmenushell.c
1971-index 515492c..5ea8925 100644
1972---- a/gtk/gtkmenushell.c
1973-+++ b/gtk/gtkmenushell.c
1974-@@ -420,8 +420,6 @@ gtk_menu_shell_class_init (GtkMenuShellClass *klass)
1975- P_("A boolean that determines whether the menu grabs the keyboard focus"),
1976- TRUE,
1977- GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
1978--
1979-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_MENU_SHELL_ACCESSIBLE);
1980- }
1981-
1982- static GType
1983-diff --git a/gtk/gtkmessagedialog.c b/gtk/gtkmessagedialog.c
1984-index e70c820..82d22ec 100644
1985---- a/gtk/gtkmessagedialog.c
1986-+++ b/gtk/gtkmessagedialog.c
1987-@@ -163,8 +163,6 @@ gtk_message_dialog_class_init (GtkMessageDialogClass *class)
1988-
1989- widget_class->style_updated = gtk_message_dialog_style_updated;
1990-
1991-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_ALERT);
1992--
1993- gobject_class->constructed = gtk_message_dialog_constructed;
1994- gobject_class->set_property = gtk_message_dialog_set_property;
1995- gobject_class->get_property = gtk_message_dialog_get_property;
1996-@@ -372,7 +370,6 @@ setup_type (GtkMessageDialog *dialog,
1997- {
1998- GtkMessageDialogPrivate *priv = dialog->priv;
1999- const gchar *name = NULL;
2000-- AtkObject *atk_obj;
2001-
2002- if (priv->message_type == type)
2003- return;
2004-@@ -405,14 +402,6 @@ setup_type (GtkMessageDialog *dialog,
2005- break;
2006- }
2007-
2008-- atk_obj = gtk_widget_get_accessible (GTK_WIDGET (dialog));
2009-- if (GTK_IS_ACCESSIBLE (atk_obj))
2010-- {
2011-- atk_object_set_role (atk_obj, ATK_ROLE_ALERT);
2012-- if (name)
2013-- atk_object_set_name (atk_obj, name);
2014-- }
2015--
2016- g_object_notify (G_OBJECT (dialog), "message-type");
2017- }
2018-
2019-diff --git a/gtk/gtkmodelbutton.c b/gtk/gtkmodelbutton.c
2020-index 4653cff..e0b5c12 100644
2021---- a/gtk/gtkmodelbutton.c
2022-+++ b/gtk/gtkmodelbutton.c
2023-@@ -247,15 +247,6 @@ gtk_model_button_update_state (GtkModelButton *button)
2024- gtk_css_gadget_set_state (button->gadget, state);
2025-
2026- gtk_css_gadget_set_state (button->indicator_gadget, indicator_state);
2027--
2028-- if (button->role == GTK_BUTTON_ROLE_CHECK ||
2029-- button->role == GTK_BUTTON_ROLE_RADIO)
2030-- {
2031-- AtkObject *object = _gtk_widget_peek_accessible (GTK_WIDGET (button));
2032-- if (object)
2033-- atk_object_notify_state_change (object, ATK_STATE_CHECKED,
2034-- (indicator_state & GTK_STATE_FLAG_CHECKED));
2035-- }
2036- }
2037-
2038- static void
2039-@@ -310,17 +301,13 @@ gtk_model_button_direction_changed (GtkWidget *widget,
2040- static void
2041- update_node_name (GtkModelButton *button)
2042- {
2043-- AtkObject *accessible;
2044-- AtkRole a11y_role;
2045- const gchar *indicator_name;
2046- gboolean indicator_visible;
2047- GtkCssNode *indicator_node;
2048-
2049-- accessible = gtk_widget_get_accessible (GTK_WIDGET (button));
2050- switch (button->role)
2051- {
2052- case GTK_BUTTON_ROLE_NORMAL:
2053-- a11y_role = ATK_ROLE_PUSH_BUTTON;
2054- if (button->menu_name)
2055- {
2056- indicator_name = I_("arrow");
2057-@@ -334,13 +321,11 @@ update_node_name (GtkModelButton *button)
2058- break;
2059-
2060- case GTK_BUTTON_ROLE_CHECK:
2061-- a11y_role = ATK_ROLE_CHECK_BOX;
2062- indicator_name = I_("check");
2063- indicator_visible = TRUE;
2064- break;
2065-
2066- case GTK_BUTTON_ROLE_RADIO:
2067-- a11y_role = ATK_ROLE_RADIO_BUTTON;
2068- indicator_name = I_("radio");
2069- indicator_visible = TRUE;
2070- break;
2071-@@ -352,8 +337,6 @@ update_node_name (GtkModelButton *button)
2072- if (button->iconic)
2073- indicator_visible = FALSE;
2074-
2075-- atk_object_set_role (accessible, a11y_role);
2076--
2077- indicator_node = gtk_css_gadget_get_node (button->indicator_gadget);
2078- gtk_css_node_set_name (indicator_node, indicator_name);
2079- gtk_css_node_set_visible (indicator_node, indicator_visible);
2080-@@ -1099,18 +1082,6 @@ gtk_model_button_finalize (GObject *object)
2081- G_OBJECT_CLASS (gtk_model_button_parent_class)->finalize (object);
2082- }
2083-
2084--static AtkObject *
2085--gtk_model_button_get_accessible (GtkWidget *widget)
2086--{
2087-- AtkObject *object;
2088--
2089-- object = GTK_WIDGET_CLASS (gtk_model_button_parent_class)->get_accessible (widget);
2090--
2091-- gtk_model_button_update_state (GTK_MODEL_BUTTON (widget));
2092--
2093-- return object;
2094--}
2095--
2096- static void
2097- gtk_model_button_class_init (GtkModelButtonClass *class)
2098- {
2099-@@ -1132,7 +1103,6 @@ gtk_model_button_class_init (GtkModelButtonClass *class)
2100- widget_class->destroy = gtk_model_button_destroy;
2101- widget_class->state_flags_changed = gtk_model_button_state_flags_changed;
2102- widget_class->direction_changed = gtk_model_button_direction_changed;
2103-- widget_class->get_accessible = gtk_model_button_get_accessible;
2104-
2105- button_class->clicked = gtk_model_button_clicked;
2106-
2107-@@ -1276,7 +1246,6 @@ gtk_model_button_class_init (GtkModelButtonClass *class)
2108- G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS);
2109- g_object_class_install_properties (object_class, LAST_PROPERTY, properties);
2110-
2111-- gtk_widget_class_set_accessible_role (GTK_WIDGET_CLASS (class), ATK_ROLE_PUSH_BUTTON);
2112- gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), "modelbutton");
2113- }
2114-
2115-diff --git a/gtk/gtkmodelmenuitem.c b/gtk/gtkmodelmenuitem.c
2116-index 103f053..c0ac121 100644
2117---- a/gtk/gtkmodelmenuitem.c
2118-+++ b/gtk/gtkmodelmenuitem.c
2119-@@ -94,35 +94,27 @@ static void
2120- gtk_model_menu_item_set_action_role (GtkModelMenuItem *item,
2121- GtkMenuTrackerItemRole role)
2122- {
2123-- AtkObject *accessible;
2124-- AtkRole a11y_role;
2125--
2126- if (role == item->role)
2127- return;
2128-
2129- gtk_check_menu_item_set_draw_as_radio (GTK_CHECK_MENU_ITEM (item), role == GTK_MENU_TRACKER_ITEM_ROLE_RADIO);
2130- gtk_model_menu_item_set_has_indicator (item, role != GTK_MENU_TRACKER_ITEM_ROLE_NORMAL);
2131-
2132-- accessible = gtk_widget_get_accessible (GTK_WIDGET (item));
2133- switch (role)
2134- {
2135- case GTK_MENU_TRACKER_ITEM_ROLE_NORMAL:
2136-- a11y_role = ATK_ROLE_MENU_ITEM;
2137- break;
2138-
2139- case GTK_MENU_TRACKER_ITEM_ROLE_CHECK:
2140-- a11y_role = ATK_ROLE_CHECK_MENU_ITEM;
2141- break;
2142-
2143- case GTK_MENU_TRACKER_ITEM_ROLE_RADIO:
2144-- a11y_role = ATK_ROLE_RADIO_MENU_ITEM;
2145- break;
2146-
2147- default:
2148- g_assert_not_reached ();
2149- }
2150-
2151-- atk_object_set_role (accessible, a11y_role);
2152- g_object_notify (G_OBJECT (item), "action-role");
2153- }
2154-
2155-@@ -499,8 +491,6 @@ gtk_model_menu_item_class_init (GtkModelMenuItemClass *class)
2156- g_object_class_install_property (object_class, PROP_ACCEL,
2157- g_param_spec_string ("accel", "accel", "accel", NULL,
2158- G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS | G_PARAM_EXPLICIT_NOTIFY));
2159--
2160-- gtk_widget_class_set_accessible_role (GTK_WIDGET_CLASS (class), ATK_ROLE_MENU_ITEM);
2161- }
2162-
2163- GtkWidget *
2164-diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
2165-index f51570e..8a1c642 100644
2166---- a/gtk/gtknotebook.c
2167-+++ b/gtk/gtknotebook.c
2168-@@ -1282,7 +1282,6 @@ gtk_notebook_class_init (GtkNotebookClass *class)
2169-
2170- gtk_container_class_handle_border_width (container_class);
2171-
2172-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_NOTEBOOK_ACCESSIBLE);
2173- gtk_widget_class_set_css_name (widget_class, "notebook");
2174- }
2175-
2176-diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c
2177-index 4d44a07..306ed97 100644
2178---- a/gtk/gtkpaned.c
2179-+++ b/gtk/gtkpaned.c
2180-@@ -692,7 +692,6 @@ gtk_paned_class_init (GtkPanedClass *class)
2181- add_move_binding (binding_set, GDK_KEY_End, 0, GTK_SCROLL_END);
2182- add_move_binding (binding_set, GDK_KEY_KP_End, 0, GTK_SCROLL_END);
2183-
2184-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_PANED_ACCESSIBLE);
2185- gtk_widget_class_set_css_name (widget_class, "paned");
2186- }
2187-
2188-diff --git a/gtk/gtkpango.c b/gtk/gtkpango.c
2189-index a76ad57..8745a6b 100644
2190---- a/gtk/gtkpango.c
2191-+++ b/gtk/gtkpango.c
2192-@@ -233,300 +233,6 @@ _gtk_pango_fill_layout (cairo_t *cr,
2193- cairo_move_to (cr, current_x, current_y);
2194- }
2195-
2196--static AtkAttributeSet *
2197--add_attribute (AtkAttributeSet *attributes,
2198-- AtkTextAttribute attr,
2199-- const gchar *value)
2200--{
2201-- AtkAttribute *at;
2202--
2203-- at = g_new (AtkAttribute, 1);
2204-- at->name = g_strdup (atk_text_attribute_get_name (attr));
2205-- at->value = g_strdup (value);
2206--
2207-- return g_slist_prepend (attributes, at);
2208--}
2209--
2210--/*
2211-- * _gtk_pango_get_default_attributes:
2212-- * @attributes: a #AtkAttributeSet to add the attributes to
2213-- * @layout: the #PangoLayout from which to get attributes
2214-- *
2215-- * Adds the default text attributes from @layout to @attributes,
2216-- * after translating them from Pango attributes to ATK attributes.
2217-- *
2218-- * This is a convenience function that can be used to implement
2219-- * support for the #AtkText interface in widgets using Pango
2220-- * layouts.
2221-- *
2222-- * Returns: the modified @attributes
2223-- */
2224--AtkAttributeSet*
2225--_gtk_pango_get_default_attributes (AtkAttributeSet *attributes,
2226-- PangoLayout *layout)
2227--{
2228-- PangoContext *context;
2229-- gint i;
2230-- PangoWrapMode mode;
2231--
2232-- context = pango_layout_get_context (layout);
2233-- if (context)
2234-- {
2235-- PangoLanguage *language;
2236-- PangoFontDescription *font;
2237--
2238-- language = pango_context_get_language (context);
2239-- if (language)
2240-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_LANGUAGE,
2241-- pango_language_to_string (language));
2242--
2243-- font = pango_context_get_font_description (context);
2244-- if (font)
2245-- {
2246-- gchar buf[60];
2247-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_STYLE,
2248-- atk_text_attribute_get_value (ATK_TEXT_ATTR_STYLE,
2249-- pango_font_description_get_style (font)));
2250-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_VARIANT,
2251-- atk_text_attribute_get_value (ATK_TEXT_ATTR_VARIANT,
2252-- pango_font_description_get_variant (font)));
2253-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_STRETCH,
2254-- atk_text_attribute_get_value (ATK_TEXT_ATTR_STRETCH,
2255-- pango_font_description_get_stretch (font)));
2256-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_FAMILY_NAME,
2257-- pango_font_description_get_family (font));
2258-- g_snprintf (buf, 60, "%d", pango_font_description_get_weight (font));
2259-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_WEIGHT, buf);
2260-- g_snprintf (buf, 60, "%i", pango_font_description_get_size (font) / PANGO_SCALE);
2261-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_SIZE, buf);
2262-- }
2263-- }
2264-- if (pango_layout_get_justify (layout))
2265-- {
2266-- i = 3;
2267-- }
2268-- else
2269-- {
2270-- PangoAlignment align;
2271--
2272-- align = pango_layout_get_alignment (layout);
2273-- if (align == PANGO_ALIGN_LEFT)
2274-- i = 0;
2275-- else if (align == PANGO_ALIGN_CENTER)
2276-- i = 2;
2277-- else /* PANGO_ALIGN_RIGHT */
2278-- i = 1;
2279-- }
2280-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_JUSTIFICATION,
2281-- atk_text_attribute_get_value (ATK_TEXT_ATTR_JUSTIFICATION, i));
2282-- mode = pango_layout_get_wrap (layout);
2283-- if (mode == PANGO_WRAP_WORD)
2284-- i = 2;
2285-- else /* PANGO_WRAP_CHAR */
2286-- i = 1;
2287-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_WRAP_MODE,
2288-- atk_text_attribute_get_value (ATK_TEXT_ATTR_WRAP_MODE, i));
2289--
2290-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_STRIKETHROUGH,
2291-- atk_text_attribute_get_value (ATK_TEXT_ATTR_STRIKETHROUGH, 0));
2292-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_UNDERLINE,
2293-- atk_text_attribute_get_value (ATK_TEXT_ATTR_UNDERLINE, 0));
2294-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_RISE, "0");
2295-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_SCALE, "1");
2296-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_BG_FULL_HEIGHT, "0");
2297-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_PIXELS_INSIDE_WRAP, "0");
2298-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_PIXELS_BELOW_LINES, "0");
2299-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_PIXELS_ABOVE_LINES, "0");
2300-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_EDITABLE,
2301-- atk_text_attribute_get_value (ATK_TEXT_ATTR_EDITABLE, 0));
2302-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_INVISIBLE,
2303-- atk_text_attribute_get_value (ATK_TEXT_ATTR_INVISIBLE, 0));
2304-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_INDENT, "0");
2305-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_RIGHT_MARGIN, "0");
2306-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_LEFT_MARGIN, "0");
2307--
2308-- return attributes;
2309--}
2310--
2311--/*
2312-- * _gtk_pango_get_run_attributes:
2313-- * @attributes: a #AtkAttributeSet to add attributes to
2314-- * @layout: the #PangoLayout to get the attributes from
2315-- * @offset: the offset at which the attributes are wanted
2316-- * @start_offset: return location for the starting offset
2317-- * of the current run
2318-- * @end_offset: return location for the ending offset of the
2319-- * current run
2320-- *
2321-- * Finds the “run” around index (i.e. the maximal range of characters
2322-- * where the set of applicable attributes remains constant) and
2323-- * returns the starting and ending offsets for it.
2324-- *
2325-- * The attributes for the run are added to @attributes, after
2326-- * translating them from Pango attributes to ATK attributes.
2327-- *
2328-- * This is a convenience function that can be used to implement
2329-- * support for the #AtkText interface in widgets using Pango
2330-- * layouts.
2331-- *
2332-- * Returns: the modified #AtkAttributeSet
2333-- */
2334--AtkAttributeSet *
2335--_gtk_pango_get_run_attributes (AtkAttributeSet *attributes,
2336-- PangoLayout *layout,
2337-- gint offset,
2338-- gint *start_offset,
2339-- gint *end_offset)
2340--{
2341-- PangoAttrIterator *iter;
2342-- PangoAttrList *attr;
2343-- PangoAttrString *pango_string;
2344-- PangoAttrInt *pango_int;
2345-- PangoAttrColor *pango_color;
2346-- PangoAttrLanguage *pango_lang;
2347-- PangoAttrFloat *pango_float;
2348-- gint index, start_index, end_index;
2349-- gboolean is_next;
2350-- glong len;
2351-- const gchar *text;
2352-- gchar *value;
2353--
2354-- text = pango_layout_get_text (layout);
2355-- len = g_utf8_strlen (text, -1);
2356--
2357-- /* Grab the attributes of the PangoLayout, if any */
2358-- attr = pango_layout_get_attributes (layout);
2359--
2360-- if (attr == NULL)
2361-- {
2362-- *start_offset = 0;
2363-- *end_offset = len;
2364-- return attributes;
2365-- }
2366--
2367-- iter = pango_attr_list_get_iterator (attr);
2368-- /* Get invariant range offsets */
2369-- /* If offset out of range, set offset in range */
2370-- if (offset > len)
2371-- offset = len;
2372-- else if (offset < 0)
2373-- offset = 0;
2374--
2375-- index = g_utf8_offset_to_pointer (text, offset) - text;
2376-- pango_attr_iterator_range (iter, &start_index, &end_index);
2377-- is_next = TRUE;
2378-- while (is_next)
2379-- {
2380-- if (index >= start_index && index < end_index)
2381-- {
2382-- *start_offset = g_utf8_pointer_to_offset (text, text + start_index);
2383-- if (end_index == G_MAXINT) /* Last iterator */
2384-- end_index = len;
2385--
2386-- *end_offset = g_utf8_pointer_to_offset (text, text + end_index);
2387-- break;
2388-- }
2389-- is_next = pango_attr_iterator_next (iter);
2390-- pango_attr_iterator_range (iter, &start_index, &end_index);
2391-- }
2392--
2393-- /* Get attributes */
2394-- pango_string = (PangoAttrString*) pango_attr_iterator_get (iter, PANGO_ATTR_FAMILY);
2395-- if (pango_string != NULL)
2396-- {
2397-- value = g_strdup_printf ("%s", pango_string->value);
2398-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_FAMILY_NAME, value);
2399-- g_free (value);
2400-- }
2401-- pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter, PANGO_ATTR_STYLE);
2402-- if (pango_int != NULL)
2403-- {
2404-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_STYLE,
2405-- atk_text_attribute_get_value (ATK_TEXT_ATTR_STYLE, pango_int->value));
2406-- }
2407-- pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter, PANGO_ATTR_WEIGHT);
2408-- if (pango_int != NULL)
2409-- {
2410-- value = g_strdup_printf ("%i", pango_int->value);
2411-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_WEIGHT, value);
2412-- g_free (value);
2413-- }
2414-- pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter, PANGO_ATTR_VARIANT);
2415-- if (pango_int != NULL)
2416-- {
2417-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_VARIANT,
2418-- atk_text_attribute_get_value (ATK_TEXT_ATTR_VARIANT, pango_int->value));
2419-- }
2420-- pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter, PANGO_ATTR_STRETCH);
2421-- if (pango_int != NULL)
2422-- {
2423-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_STRETCH,
2424-- atk_text_attribute_get_value (ATK_TEXT_ATTR_STRETCH, pango_int->value));
2425-- }
2426-- pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter, PANGO_ATTR_SIZE);
2427-- if (pango_int != NULL)
2428-- {
2429-- value = g_strdup_printf ("%i", pango_int->value / PANGO_SCALE);
2430-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_SIZE, value);
2431-- g_free (value);
2432-- }
2433-- pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter, PANGO_ATTR_UNDERLINE);
2434-- if (pango_int != NULL)
2435-- {
2436-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_UNDERLINE,
2437-- atk_text_attribute_get_value (ATK_TEXT_ATTR_UNDERLINE, pango_int->value));
2438-- }
2439-- pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter, PANGO_ATTR_STRIKETHROUGH);
2440-- if (pango_int != NULL)
2441-- {
2442-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_STRIKETHROUGH,
2443-- atk_text_attribute_get_value (ATK_TEXT_ATTR_STRIKETHROUGH, pango_int->value));
2444-- }
2445-- pango_int = (PangoAttrInt*) pango_attr_iterator_get (iter, PANGO_ATTR_RISE);
2446-- if (pango_int != NULL)
2447-- {
2448-- value = g_strdup_printf ("%i", pango_int->value);
2449-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_RISE, value);
2450-- g_free (value);
2451-- }
2452-- pango_lang = (PangoAttrLanguage*) pango_attr_iterator_get (iter, PANGO_ATTR_LANGUAGE);
2453-- if (pango_lang != NULL)
2454-- {
2455-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_LANGUAGE,
2456-- pango_language_to_string (pango_lang->value));
2457-- }
2458-- pango_float = (PangoAttrFloat*) pango_attr_iterator_get (iter, PANGO_ATTR_SCALE);
2459-- if (pango_float != NULL)
2460-- {
2461-- value = g_strdup_printf ("%g", pango_float->value);
2462-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_SCALE, value);
2463-- g_free (value);
2464-- }
2465-- pango_color = (PangoAttrColor*) pango_attr_iterator_get (iter, PANGO_ATTR_FOREGROUND);
2466-- if (pango_color != NULL)
2467-- {
2468-- value = g_strdup_printf ("%u,%u,%u",
2469-- pango_color->color.red,
2470-- pango_color->color.green,
2471-- pango_color->color.blue);
2472-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_FG_COLOR, value);
2473-- g_free (value);
2474-- }
2475-- pango_color = (PangoAttrColor*) pango_attr_iterator_get (iter, PANGO_ATTR_BACKGROUND);
2476-- if (pango_color != NULL)
2477-- {
2478-- value = g_strdup_printf ("%u,%u,%u",
2479-- pango_color->color.red,
2480-- pango_color->color.green,
2481-- pango_color->color.blue);
2482-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_BG_COLOR, value);
2483-- g_free (value);
2484-- }
2485-- pango_attr_iterator_destroy (iter);
2486--
2487-- return attributes;
2488--}
2489--
2490- /*
2491- * _gtk_pango_move_chars:
2492- * @layout: a #PangoLayout
2493-@@ -793,7 +499,6 @@ _gtk_pango_is_inside_sentence (PangoLayout *layout,
2494-
2495- static void
2496- pango_layout_get_line_before (PangoLayout *layout,
2497-- AtkTextBoundary boundary_type,
2498- gint offset,
2499- gint *start_offset,
2500- gint *end_offset)
2501-@@ -818,23 +523,7 @@ pango_layout_get_line_before (PangoLayout *layout,
2502- /* Found line for offset */
2503- if (prev_line)
2504- {
2505-- switch (boundary_type)
2506-- {
2507-- case ATK_TEXT_BOUNDARY_LINE_START:
2508-- end_index = start_index;
2509-- start_index = prev_line->start_index;
2510-- break;
2511-- case ATK_TEXT_BOUNDARY_LINE_END:
2512-- if (prev_prev_line)
2513-- start_index = prev_prev_line->start_index + prev_prev_line->length;
2514-- else
2515-- start_index = 0;
2516-- end_index = prev_line->start_index + prev_line->length;
2517-- break;
2518-- default:
2519-- g_assert_not_reached();
2520- }
2521-- }
2522- else
2523- start_index = end_index = 0;
2524-
2525-@@ -860,7 +549,6 @@ pango_layout_get_line_before (PangoLayout *layout,
2526-
2527- static void
2528- pango_layout_get_line_at (PangoLayout *layout,
2529-- AtkTextBoundary boundary_type,
2530- gint offset,
2531- gint *start_offset,
2532- gint *end_offset)
2533-@@ -882,21 +570,6 @@ pango_layout_get_line_at (PangoLayout *layout,
2534-
2535- if (index >= start_index && index <= end_index)
2536- {
2537-- /* Found line for offset */
2538-- switch (boundary_type)
2539-- {
2540-- case ATK_TEXT_BOUNDARY_LINE_START:
2541-- if (pango_layout_iter_next_line (iter))
2542-- end_index = pango_layout_iter_get_line (iter)->start_index;
2543-- break;
2544-- case ATK_TEXT_BOUNDARY_LINE_END:
2545-- if (prev_line)
2546-- start_index = prev_line->start_index + prev_line->length;
2547-- break;
2548-- default:
2549-- g_assert_not_reached();
2550-- }
2551--
2552- found = TRUE;
2553- break;
2554- }
2555-@@ -918,7 +591,6 @@ pango_layout_get_line_at (PangoLayout *layout,
2556-
2557- static void
2558- pango_layout_get_line_after (PangoLayout *layout,
2559-- AtkTextBoundary boundary_type,
2560- gint offset,
2561- gint *start_offset,
2562- gint *end_offset)
2563-@@ -944,23 +616,7 @@ pango_layout_get_line_after (PangoLayout *layout,
2564- if (pango_layout_iter_next_line (iter))
2565- {
2566- line = pango_layout_iter_get_line (iter);
2567-- switch (boundary_type)
2568-- {
2569-- case ATK_TEXT_BOUNDARY_LINE_START:
2570-- start_index = line->start_index;
2571-- if (pango_layout_iter_next_line (iter))
2572-- end_index = pango_layout_iter_get_line (iter)->start_index;
2573-- else
2574-- end_index = start_index + line->length;
2575-- break;
2576-- case ATK_TEXT_BOUNDARY_LINE_END:
2577-- start_index = end_index;
2578-- end_index = line->start_index + line->length;
2579-- break;
2580-- default:
2581-- g_assert_not_reached();
2582- }
2583-- }
2584- else
2585- start_index = end_index;
2586-
2587-@@ -986,23 +642,17 @@ pango_layout_get_line_after (PangoLayout *layout,
2588- /*
2589- * _gtk_pango_get_text_before:
2590- * @layout: a #PangoLayout
2591-- * @boundary_type: a #AtkTextBoundary
2592- * @offset: a character offset in @layout
2593- * @start_offset: return location for the start of the returned text
2594- * @end_offset: return location for the end of the return text
2595- *
2596- * Gets a slice of the text from @layout before @offset.
2597- *
2598-- * The @boundary_type determines the size of the returned slice of
2599-- * text. For the exact semantics of this function, see
2600-- * atk_text_get_text_before_offset().
2601-- *
2602- * Returns: a newly allocated string containing a slice of text
2603- * from layout. Free with g_free().
2604- */
2605- gchar *
2606- _gtk_pango_get_text_before (PangoLayout *layout,
2607-- AtkTextBoundary boundary_type,
2608- gint offset,
2609- gint *start_offset,
2610- gint *end_offset)
2611-@@ -1026,56 +676,6 @@ _gtk_pango_get_text_before (PangoLayout *layout,
2612- start = offset;
2613- end = start;
2614-
2615-- switch (boundary_type)
2616-- {
2617-- case ATK_TEXT_BOUNDARY_CHAR:
2618-- start = _gtk_pango_move_chars (layout, start, -1);
2619-- break;
2620--
2621-- case ATK_TEXT_BOUNDARY_WORD_START:
2622-- if (!attrs[start].is_word_start)
2623-- start = _gtk_pango_move_words (layout, start, -1);
2624-- end = start;
2625-- start = _gtk_pango_move_words (layout, start, -1);
2626-- break;
2627--
2628-- case ATK_TEXT_BOUNDARY_WORD_END:
2629-- if (_gtk_pango_is_inside_word (layout, start) &&
2630-- !attrs[start].is_word_start)
2631-- start = _gtk_pango_move_words (layout, start, -1);
2632-- while (!attrs[start].is_word_end && start > 0)
2633-- start = _gtk_pango_move_chars (layout, start, -1);
2634-- end = start;
2635-- start = _gtk_pango_move_words (layout, start, -1);
2636-- while (!attrs[start].is_word_end && start > 0)
2637-- start = _gtk_pango_move_chars (layout, start, -1);
2638-- break;
2639--
2640-- case ATK_TEXT_BOUNDARY_SENTENCE_START:
2641-- if (!attrs[start].is_sentence_start)
2642-- start = _gtk_pango_move_sentences (layout, start, -1);
2643-- end = start;
2644-- start = _gtk_pango_move_sentences (layout, start, -1);
2645-- break;
2646--
2647-- case ATK_TEXT_BOUNDARY_SENTENCE_END:
2648-- if (_gtk_pango_is_inside_sentence (layout, start) &&
2649-- !attrs[start].is_sentence_start)
2650-- start = _gtk_pango_move_sentences (layout, start, -1);
2651-- while (!attrs[start].is_sentence_end && start > 0)
2652-- start = _gtk_pango_move_chars (layout, start, -1);
2653-- end = start;
2654-- start = _gtk_pango_move_sentences (layout, start, -1);
2655-- while (!attrs[start].is_sentence_end && start > 0)
2656-- start = _gtk_pango_move_chars (layout, start, -1);
2657-- break;
2658--
2659-- case ATK_TEXT_BOUNDARY_LINE_START:
2660-- case ATK_TEXT_BOUNDARY_LINE_END:
2661-- pango_layout_get_line_before (layout, boundary_type, offset, &start, &end);
2662-- break;
2663-- }
2664--
2665- *start_offset = start;
2666- *end_offset = end;
2667-
2668-@@ -1087,23 +687,17 @@ _gtk_pango_get_text_before (PangoLayout *layout,
2669- /*
2670- * _gtk_pango_get_text_after:
2671- * @layout: a #PangoLayout
2672-- * @boundary_type: a #AtkTextBoundary
2673- * @offset: a character offset in @layout
2674- * @start_offset: return location for the start of the returned text
2675- * @end_offset: return location for the end of the return text
2676- *
2677- * Gets a slice of the text from @layout after @offset.
2678- *
2679-- * The @boundary_type determines the size of the returned slice of
2680-- * text. For the exact semantics of this function, see
2681-- * atk_text_get_text_after_offset().
2682-- *
2683- * Returns: a newly allocated string containing a slice of text
2684- * from layout. Free with g_free().
2685- */
2686- gchar *
2687- _gtk_pango_get_text_after (PangoLayout *layout,
2688-- AtkTextBoundary boundary_type,
2689- gint offset,
2690- gint *start_offset,
2691- gint *end_offset)
2692-@@ -1127,62 +721,6 @@ _gtk_pango_get_text_after (PangoLayout *layout,
2693- start = offset;
2694- end = start;
2695-
2696-- switch (boundary_type)
2697-- {
2698-- case ATK_TEXT_BOUNDARY_CHAR:
2699-- start = _gtk_pango_move_chars (layout, start, 1);
2700-- end = start;
2701-- end = _gtk_pango_move_chars (layout, end, 1);
2702-- break;
2703--
2704-- case ATK_TEXT_BOUNDARY_WORD_START:
2705-- if (_gtk_pango_is_inside_word (layout, end))
2706-- end = _gtk_pango_move_words (layout, end, 1);
2707-- while (!attrs[end].is_word_start && end < n_attrs - 1)
2708-- end = _gtk_pango_move_chars (layout, end, 1);
2709-- start = end;
2710-- if (end < n_attrs - 1)
2711-- {
2712-- end = _gtk_pango_move_words (layout, end, 1);
2713-- while (!attrs[end].is_word_start && end < n_attrs - 1)
2714-- end = _gtk_pango_move_chars (layout, end, 1);
2715-- }
2716-- break;
2717--
2718-- case ATK_TEXT_BOUNDARY_WORD_END:
2719-- end = _gtk_pango_move_words (layout, end, 1);
2720-- start = end;
2721-- if (end < n_attrs - 1)
2722-- end = _gtk_pango_move_words (layout, end, 1);
2723-- break;
2724--
2725-- case ATK_TEXT_BOUNDARY_SENTENCE_START:
2726-- if (_gtk_pango_is_inside_sentence (layout, end))
2727-- end = _gtk_pango_move_sentences (layout, end, 1);
2728-- while (!attrs[end].is_sentence_start && end < n_attrs - 1)
2729-- end = _gtk_pango_move_chars (layout, end, 1);
2730-- start = end;
2731-- if (end < n_attrs - 1)
2732-- {
2733-- end = _gtk_pango_move_sentences (layout, end, 1);
2734-- while (!attrs[end].is_sentence_start && end < n_attrs - 1)
2735-- end = _gtk_pango_move_chars (layout, end, 1);
2736-- }
2737-- break;
2738--
2739-- case ATK_TEXT_BOUNDARY_SENTENCE_END:
2740-- end = _gtk_pango_move_sentences (layout, end, 1);
2741-- start = end;
2742-- if (end < n_attrs - 1)
2743-- end = _gtk_pango_move_sentences (layout, end, 1);
2744-- break;
2745--
2746-- case ATK_TEXT_BOUNDARY_LINE_START:
2747-- case ATK_TEXT_BOUNDARY_LINE_END:
2748-- pango_layout_get_line_after (layout, boundary_type, offset, &start, &end);
2749-- break;
2750-- }
2751--
2752- *start_offset = start;
2753- *end_offset = end;
2754-
2755-@@ -1194,23 +732,17 @@ _gtk_pango_get_text_after (PangoLayout *layout,
2756- /*
2757- * _gtk_pango_get_text_at:
2758- * @layout: a #PangoLayout
2759-- * @boundary_type: a #AtkTextBoundary
2760- * @offset: a character offset in @layout
2761- * @start_offset: return location for the start of the returned text
2762- * @end_offset: return location for the end of the return text
2763- *
2764- * Gets a slice of the text from @layout at @offset.
2765- *
2766-- * The @boundary_type determines the size of the returned slice of
2767-- * text. For the exact semantics of this function, see
2768-- * atk_text_get_text_after_offset().
2769-- *
2770- * Returns: a newly allocated string containing a slice of text
2771- * from layout. Free with g_free().
2772- */
2773- gchar *
2774- _gtk_pango_get_text_at (PangoLayout *layout,
2775-- AtkTextBoundary boundary_type,
2776- gint offset,
2777- gint *start_offset,
2778- gint *end_offset)
2779-@@ -1234,54 +766,6 @@ _gtk_pango_get_text_at (PangoLayout *layout,
2780- start = offset;
2781- end = start;
2782-
2783-- switch (boundary_type)
2784-- {
2785-- case ATK_TEXT_BOUNDARY_CHAR:
2786-- end = _gtk_pango_move_chars (layout, end, 1);
2787-- break;
2788--
2789-- case ATK_TEXT_BOUNDARY_WORD_START:
2790-- if (!attrs[start].is_word_start)
2791-- start = _gtk_pango_move_words (layout, start, -1);
2792-- if (_gtk_pango_is_inside_word (layout, end))
2793-- end = _gtk_pango_move_words (layout, end, 1);
2794-- while (!attrs[end].is_word_start && end < n_attrs - 1)
2795-- end = _gtk_pango_move_chars (layout, end, 1);
2796-- break;
2797--
2798-- case ATK_TEXT_BOUNDARY_WORD_END:
2799-- if (_gtk_pango_is_inside_word (layout, start) &&
2800-- !attrs[start].is_word_start)
2801-- start = _gtk_pango_move_words (layout, start, -1);
2802-- while (!attrs[start].is_word_end && start > 0)
2803-- start = _gtk_pango_move_chars (layout, start, -1);
2804-- end = _gtk_pango_move_words (layout, end, 1);
2805-- break;
2806--
2807-- case ATK_TEXT_BOUNDARY_SENTENCE_START:
2808-- if (!attrs[start].is_sentence_start)
2809-- start = _gtk_pango_move_sentences (layout, start, -1);
2810-- if (_gtk_pango_is_inside_sentence (layout, end))
2811-- end = _gtk_pango_move_sentences (layout, end, 1);
2812-- while (!attrs[end].is_sentence_start && end < n_attrs - 1)
2813-- end = _gtk_pango_move_chars (layout, end, 1);
2814-- break;
2815--
2816-- case ATK_TEXT_BOUNDARY_SENTENCE_END:
2817-- if (_gtk_pango_is_inside_sentence (layout, start) &&
2818-- !attrs[start].is_sentence_start)
2819-- start = _gtk_pango_move_sentences (layout, start, -1);
2820-- while (!attrs[start].is_sentence_end && start > 0)
2821-- start = _gtk_pango_move_chars (layout, start, -1);
2822-- end = _gtk_pango_move_sentences (layout, end, 1);
2823-- break;
2824--
2825-- case ATK_TEXT_BOUNDARY_LINE_START:
2826-- case ATK_TEXT_BOUNDARY_LINE_END:
2827-- pango_layout_get_line_at (layout, boundary_type, offset, &start, &end);
2828-- break;
2829-- }
2830--
2831- *start_offset = start;
2832- *end_offset = end;
2833-
2834-diff --git a/gtk/gtkpango.h b/gtk/gtkpango.h
2835-index 388e364..b085159 100644
2836---- a/gtk/gtkpango.h
2837-+++ b/gtk/gtkpango.h
2838-@@ -27,7 +27,6 @@
2839-
2840-
2841- #include <pango/pangocairo.h>
2842--#include <atk/atk.h>
2843-
2844- G_BEGIN_DECLS
2845-
2846-@@ -35,15 +34,6 @@ void _gtk_pango_fill_layout (cairo_t *cr,
2847- PangoLayout *layout);
2848-
2849-
2850--AtkAttributeSet *_gtk_pango_get_default_attributes (AtkAttributeSet *attributes,
2851-- PangoLayout *layout);
2852--
2853--AtkAttributeSet *_gtk_pango_get_run_attributes (AtkAttributeSet *attributes,
2854-- PangoLayout *layout,
2855-- gint offset,
2856-- gint *start_offset,
2857-- gint *end_offset);
2858--
2859- gint _gtk_pango_move_chars (PangoLayout *layout,
2860- gint offset,
2861- gint count);
2862-@@ -64,17 +54,14 @@ gboolean _gtk_pango_is_inside_sentence (PangoLayout *layout,
2863-
2864-
2865- gchar *_gtk_pango_get_text_before (PangoLayout *layout,
2866-- AtkTextBoundary boundary_type,
2867- gint offset,
2868- gint *start_offset,
2869- gint *end_offset);
2870- gchar *_gtk_pango_get_text_at (PangoLayout *layout,
2871-- AtkTextBoundary boundary_type,
2872- gint offset,
2873- gint *start_offset,
2874- gint *end_offset);
2875- gchar *_gtk_pango_get_text_after (PangoLayout *layout,
2876-- AtkTextBoundary boundary_type,
2877- gint offset,
2878- gint *start_offset,
2879- gint *end_offset);
2880-diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
2881-index 60d70ad..fff37bc 100644
2882---- a/gtk/gtkpathbar.c
2883-+++ b/gtk/gtkpathbar.c
2884-@@ -1550,7 +1550,6 @@ make_directory_button (GtkPathBar *path_bar,
2885- gboolean current_dir,
2886- gboolean file_is_hidden)
2887- {
2888-- AtkObject *atk_obj;
2889- GtkWidget *child = NULL;
2890- ButtonData *button_data;
2891-
2892-@@ -1559,7 +1558,6 @@ make_directory_button (GtkPathBar *path_bar,
2893- button_data = g_new0 (ButtonData, 1);
2894- button_data->type = find_button_type (path_bar, file, root_file);
2895- button_data->button = gtk_toggle_button_new ();
2896-- atk_obj = gtk_widget_get_accessible (button_data->button);
2897- gtk_widget_set_focus_on_click (button_data->button, FALSE);
2898- gtk_widget_add_events (button_data->button, GDK_SCROLL_MASK);
2899-
2900-@@ -1569,7 +1567,6 @@ make_directory_button (GtkPathBar *path_bar,
2901- button_data->image = gtk_image_new ();
2902- child = button_data->image;
2903- button_data->label = NULL;
2904-- atk_object_set_name (atk_obj, _("File System Root"));
2905- break;
2906- case HOME_BUTTON:
2907- case DESKTOP_BUTTON:
2908-diff --git a/gtk/gtkplug.c b/gtk/gtkplug.c
2909-index 6361b60..8eec0d4 100644
2910---- a/gtk/gtkplug.c
2911-+++ b/gtk/gtkplug.c
2912-@@ -178,8 +178,6 @@ gtk_plug_class_init (GtkPlugClass *class)
2913- widget_class->unmap = gtk_plug_unmap;
2914- widget_class->focus = gtk_plug_focus;
2915-
2916-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_PANEL);
2917--
2918- container_class->check_resize = gtk_plug_check_resize;
2919-
2920- window_class->set_focus = gtk_plug_set_focus;
2921-diff --git a/gtk/gtkpopover.c b/gtk/gtkpopover.c
2922-index b812e0e..d405358 100644
2923---- a/gtk/gtkpopover.c
2924-+++ b/gtk/gtkpopover.c
2925-@@ -1836,7 +1836,6 @@ gtk_popover_class_init (GtkPopoverClass *klass)
2926- G_TYPE_NONE, 0);
2927-
2928- quark_widget_popovers = g_quark_from_static_string ("gtk-quark-widget-popovers");
2929-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_POPOVER_ACCESSIBLE);
2930- gtk_widget_class_set_css_name (widget_class, "popover");
2931- }
2932-
2933-diff --git a/gtk/gtkprogressbar.c b/gtk/gtkprogressbar.c
2934-index 4cb8437..b6a8f9e 100644
2935---- a/gtk/gtkprogressbar.c
2936-+++ b/gtk/gtkprogressbar.c
2937-@@ -427,7 +427,6 @@ gtk_progress_bar_class_init (GtkProgressBarClass *class)
2938- 1, G_MAXINT, MIN_VERTICAL_BAR_HEIGHT,
2939- G_PARAM_READWRITE|G_PARAM_DEPRECATED));
2940-
2941-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_PROGRESS_BAR_ACCESSIBLE);
2942- gtk_widget_class_set_css_name (widget_class, "progressbar");
2943- }
2944-
2945-diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
2946-index 9b7aafd..85c5ced 100644
2947---- a/gtk/gtkradiobutton.c
2948-+++ b/gtk/gtkradiobutton.c
2949-@@ -216,7 +216,6 @@ gtk_radio_button_class_init (GtkRadioButtonClass *class)
2950- NULL,
2951- G_TYPE_NONE, 0);
2952-
2953-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_RADIO_BUTTON_ACCESSIBLE);
2954- gtk_widget_class_set_css_name (widget_class, "radiobutton");
2955- }
2956-
2957-diff --git a/gtk/gtkradiomenuitem.c b/gtk/gtkradiomenuitem.c
2958-index 8e66f85..a2e0fc0 100644
2959---- a/gtk/gtkradiomenuitem.c
2960-+++ b/gtk/gtkradiomenuitem.c
2961-@@ -407,8 +407,6 @@ gtk_radio_menu_item_class_init (GtkRadioMenuItemClass *klass)
2962-
2963- widget_class->destroy = gtk_radio_menu_item_destroy;
2964-
2965-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_RADIO_MENU_ITEM_ACCESSIBLE);
2966--
2967- menu_item_class->activate = gtk_radio_menu_item_activate;
2968-
2969- /**
2970-diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
2971-index f53e084..7b3408f 100644
2972---- a/gtk/gtkrange.c
2973-+++ b/gtk/gtkrange.c
2974-@@ -657,8 +657,6 @@ gtk_range_class_init (GtkRangeClass *class)
2975- P_("Arrow scaling with regard to scroll button size"),
2976- 0.0, 1.0, 0.5,
2977- GTK_PARAM_READABLE|G_PARAM_DEPRECATED));
2978--
2979-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_RANGE_ACCESSIBLE);
2980- }
2981-
2982- static void
2983-diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
2984-index bee30ee..6d97b3d 100644
2985---- a/gtk/gtkscale.c
2986-+++ b/gtk/gtkscale.c
2987-@@ -944,7 +944,6 @@ gtk_scale_class_init (GtkScaleClass *class)
2988- add_slider_binding (binding_set, GDK_KEY_KP_End, 0,
2989- GTK_SCROLL_END);
2990-
2991-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SCALE_ACCESSIBLE);
2992- gtk_widget_class_set_css_name (widget_class, "scale");
2993- }
2994-
2995-diff --git a/gtk/gtkscalebutton.c b/gtk/gtkscalebutton.c
2996-index 82829b1..5377159 100644
2997---- a/gtk/gtkscalebutton.c
2998-+++ b/gtk/gtkscalebutton.c
2999-@@ -343,7 +343,6 @@ gtk_scale_button_class_init (GtkScaleButtonClass *klass)
3000- gtk_widget_class_bind_template_callback (widget_class, cb_scale_value_changed);
3001- gtk_widget_class_bind_template_callback (widget_class, cb_popup_mapped);
3002-
3003-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SCALE_BUTTON_ACCESSIBLE);
3004- gtk_widget_class_set_css_name (widget_class, "button");
3005- }
3006-
3007-diff --git a/gtk/gtkscrollbar.c b/gtk/gtkscrollbar.c
3008-index ca21d75..f63b6fa 100644
3009---- a/gtk/gtkscrollbar.c
3010-+++ b/gtk/gtkscrollbar.c
3011-@@ -145,7 +145,6 @@ gtk_scrollbar_class_init (GtkScrollbarClass *class)
3012- FALSE,
3013- GTK_PARAM_READABLE));
3014-
3015-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_SCROLL_BAR);
3016- gtk_widget_class_set_css_name (widget_class, "scrollbar");
3017- }
3018-
3019-diff --git a/gtk/gtkscrolledwindow.c b/gtk/gtkscrolledwindow.c
3020-index f4c09d0..0675256 100644
3021---- a/gtk/gtkscrolledwindow.c
3022-+++ b/gtk/gtkscrolledwindow.c
3023-@@ -896,7 +896,6 @@ gtk_scrolled_window_class_init (GtkScrolledWindowClass *class)
3024- add_tab_bindings (binding_set, GDK_CONTROL_MASK, GTK_DIR_TAB_FORWARD);
3025- add_tab_bindings (binding_set, GDK_CONTROL_MASK | GDK_SHIFT_MASK, GTK_DIR_TAB_BACKWARD);
3026-
3027-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SCROLLED_WINDOW_ACCESSIBLE);
3028- gtk_widget_class_set_css_name (widget_class, "scrolledwindow");
3029- }
3030-
3031-diff --git a/gtk/gtksearchentry.c b/gtk/gtksearchentry.c
3032-index a1243f3..4e3996e 100644
3033---- a/gtk/gtksearchentry.c
3034-+++ b/gtk/gtksearchentry.c
3035-@@ -358,18 +358,12 @@ gtk_search_entry_changed (GtkEditable *editable)
3036- static void
3037- gtk_search_entry_init (GtkSearchEntry *entry)
3038- {
3039-- AtkObject *atk_obj;
3040--
3041- g_object_set (entry,
3042- "primary-icon-name", "edit-find-symbolic",
3043- "primary-icon-activatable", FALSE,
3044- "primary-icon-sensitive", FALSE,
3045- NULL);
3046-
3047-- atk_obj = gtk_widget_get_accessible (GTK_WIDGET (entry));
3048-- if (GTK_IS_ACCESSIBLE (atk_obj))
3049-- atk_object_set_name (atk_obj, _("Search"));
3050--
3051- gtk_style_context_add_class (gtk_widget_get_style_context (GTK_WIDGET (entry)), "search");
3052- }
3053-
3054-diff --git a/gtk/gtkseparator.c b/gtk/gtkseparator.c
3055-index f76fb36..b9bee8e 100644
3056---- a/gtk/gtkseparator.c
3057-+++ b/gtk/gtkseparator.c
3058-@@ -211,7 +211,6 @@ gtk_separator_class_init (GtkSeparatorClass *class)
3059-
3060- g_object_class_override_property (object_class, PROP_ORIENTATION, "orientation");
3061-
3062-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_SEPARATOR);
3063- gtk_widget_class_set_css_name (widget_class, "separator");
3064- }
3065-
3066-diff --git a/gtk/gtkseparatormenuitem.c b/gtk/gtkseparatormenuitem.c
3067-index 1073deb..75d5ee9 100644
3068---- a/gtk/gtkseparatormenuitem.c
3069-+++ b/gtk/gtkseparatormenuitem.c
3070-@@ -58,7 +58,6 @@ gtk_separator_menu_item_class_init (GtkSeparatorMenuItemClass *class)
3071-
3072- GTK_MENU_ITEM_CLASS (class)->get_label = gtk_separator_menu_item_get_label;
3073-
3074-- gtk_widget_class_set_accessible_role (GTK_WIDGET_CLASS (class), ATK_ROLE_SEPARATOR);
3075- gtk_widget_class_set_css_name (GTK_WIDGET_CLASS (class), "separator");
3076- }
3077-
3078-diff --git a/gtk/gtksocket.c b/gtk/gtksocket.c
3079-index ffdaf8b..18b3d55 100644
3080---- a/gtk/gtksocket.c
3081-+++ b/gtk/gtksocket.c
3082-@@ -271,7 +271,6 @@ gtk_socket_class_init (GtkSocketClass *class)
3083- G_TYPE_BOOLEAN, 0);
3084-
3085-
3086-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SOCKET_ACCESSIBLE);
3087- }
3088-
3089- static void
3090-@@ -1432,7 +1431,6 @@ _gtk_socket_accessible_embed (GtkWidget *socket, GdkWindow *window)
3091- return;
3092- }
3093-
3094-- gtk_socket_accessible_embed (GTK_SOCKET_ACCESSIBLE (gtk_widget_get_accessible (socket)), (gchar*) data);
3095- XFree (data);
3096-
3097- return;
3098-diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
3099-index 8e65d8a..b936763 100644
3100---- a/gtk/gtkspinbutton.c
3101-+++ b/gtk/gtkspinbutton.c
3102-@@ -592,7 +592,6 @@ gtk_spin_button_class_init (GtkSpinButtonClass *class)
3103- add_spin_binding (binding_set, GDK_KEY_Page_Up, GDK_CONTROL_MASK, GTK_SCROLL_END);
3104- add_spin_binding (binding_set, GDK_KEY_Page_Down, GDK_CONTROL_MASK, GTK_SCROLL_START);
3105-
3106-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SPIN_BUTTON_ACCESSIBLE);
3107- gtk_widget_class_set_css_name (widget_class, "spinbutton");
3108- }
3109-
3110-diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
3111-index 06020b3..a45a073 100644
3112---- a/gtk/gtkspinner.c
3113-+++ b/gtk/gtkspinner.c
3114-@@ -223,7 +223,6 @@ gtk_spinner_class_init (GtkSpinnerClass *klass)
3115- FALSE,
3116- GTK_PARAM_READWRITE|G_PARAM_EXPLICIT_NOTIFY));
3117-
3118-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SPINNER_ACCESSIBLE);
3119- gtk_widget_class_set_css_name (widget_class, "spinner");
3120- }
3121-
3122-diff --git a/gtk/gtkstack.c b/gtk/gtkstack.c
3123-index 51a3a73..338b2f0 100644
3124---- a/gtk/gtkstack.c
3125-+++ b/gtk/gtkstack.c
3126-@@ -559,7 +559,6 @@ gtk_stack_class_init (GtkStackClass *klass)
3127-
3128- gtk_container_class_install_child_properties (container_class, LAST_CHILD_PROP, stack_child_props);
3129-
3130-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_STACK_ACCESSIBLE);
3131- gtk_widget_class_set_css_name (widget_class, "stack");
3132- }
3133-
3134-@@ -1119,10 +1118,6 @@ set_visible_child (GtkStack *stack,
3135- }
3136- }
3137-
3138-- gtk_stack_accessible_update_visible_child (stack,
3139-- priv->visible_child ? priv->visible_child->widget : NULL,
3140-- child_info ? child_info->widget : NULL);
3141--
3142- priv->visible_child = child_info;
3143-
3144- if (child_info)
3145-diff --git a/gtk/gtkstatusbar.c b/gtk/gtkstatusbar.c
3146-index 8d34f64..3eed895 100644
3147---- a/gtk/gtkstatusbar.c
3148-+++ b/gtk/gtkstatusbar.c
3149-@@ -187,7 +187,6 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
3150- gtk_widget_class_bind_template_child_private (widget_class, GtkStatusbar, frame);
3151- gtk_widget_class_bind_template_child_private (widget_class, GtkStatusbar, label);
3152-
3153-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_STATUSBAR_ACCESSIBLE);
3154- gtk_widget_class_set_css_name (widget_class, "statusbar");
3155- }
3156-
3157-diff --git a/gtk/gtkstylecontext.c b/gtk/gtkstylecontext.c
3158-index 11625d1..3a03046 100644
3159---- a/gtk/gtkstylecontext.c
3160-+++ b/gtk/gtkstylecontext.c
3161-@@ -3102,63 +3102,6 @@ _gtk_style_context_get_pango_attributes (GtkStyleContext *context)
3162- return gtk_css_style_get_pango_attributes (gtk_style_context_lookup_style (context));
3163- }
3164-
3165--static AtkAttributeSet *
3166--add_attribute (AtkAttributeSet *attributes,
3167-- AtkTextAttribute attr,
3168-- const gchar *value)
3169--{
3170-- AtkAttribute *at;
3171--
3172-- at = g_new (AtkAttribute, 1);
3173-- at->name = g_strdup (atk_text_attribute_get_name (attr));
3174-- at->value = g_strdup (value);
3175--
3176-- return g_slist_prepend (attributes, at);
3177--}
3178--
3179--/*
3180-- * _gtk_style_context_get_attributes:
3181-- * @attributes: a #AtkAttributeSet to add attributes to
3182-- * @context: the #GtkStyleContext to get attributes from
3183-- * @flags: the state to use with @context
3184-- *
3185-- * Adds the foreground and background color from @context to
3186-- * @attributes, after translating them to ATK attributes.
3187-- *
3188-- * This is a convenience function that can be used in
3189-- * implementing the #AtkText interface in widgets.
3190-- *
3191-- * Returns: the modified #AtkAttributeSet
3192-- */
3193--AtkAttributeSet *
3194--_gtk_style_context_get_attributes (AtkAttributeSet *attributes,
3195-- GtkStyleContext *context,
3196-- GtkStateFlags flags)
3197--{
3198-- GdkRGBA color;
3199-- gchar *value;
3200--
3201--G_GNUC_BEGIN_IGNORE_DEPRECATIONS
3202-- gtk_style_context_get_background_color (context, flags, &color);
3203--G_GNUC_END_IGNORE_DEPRECATIONS
3204-- value = g_strdup_printf ("%u,%u,%u",
3205-- (guint) ceil (color.red * 65536 - color.red),
3206-- (guint) ceil (color.green * 65536 - color.green),
3207-- (guint) ceil (color.blue * 65536 - color.blue));
3208-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_BG_COLOR, value);
3209-- g_free (value);
3210--
3211-- gtk_style_context_get_color (context, flags, &color);
3212-- value = g_strdup_printf ("%u,%u,%u",
3213-- (guint) ceil (color.red * 65536 - color.red),
3214-- (guint) ceil (color.green * 65536 - color.green),
3215-- (guint) ceil (color.blue * 65536 - color.blue));
3216-- attributes = add_attribute (attributes, ATK_TEXT_ATTR_FG_COLOR, value);
3217-- g_free (value);
3218--
3219-- return attributes;
3220--}
3221--
3222- cairo_pattern_t *
3223- gtk_gradient_resolve_for_context (GtkGradient *gradient,
3224- GtkStyleContext *context)
3225-diff --git a/gtk/gtkstylecontext.h b/gtk/gtkstylecontext.h
3226-index 9f8551f..42693ba 100644
3227---- a/gtk/gtkstylecontext.h
3228-+++ b/gtk/gtkstylecontext.h
3229-@@ -26,7 +26,6 @@
3230- #include <gtk/gtkcsssection.h>
3231- #include <gtk/gtkstyleprovider.h>
3232- #include <gtk/gtktypes.h>
3233--#include <atk/atk.h>
3234-
3235- G_BEGIN_DECLS
3236-
3237-diff --git a/gtk/gtkstylecontextprivate.h b/gtk/gtkstylecontextprivate.h
3238-index 421e526..f527267 100644
3239---- a/gtk/gtkstylecontextprivate.h
3240-+++ b/gtk/gtkstylecontextprivate.h
3241-@@ -72,11 +72,6 @@ void _gtk_style_context_get_icon_extents (GtkStyleContext
3242-
3243- PangoAttrList *_gtk_style_context_get_pango_attributes (GtkStyleContext *context);
3244-
3245--/* Accessibility support */
3246--AtkAttributeSet *_gtk_style_context_get_attributes (AtkAttributeSet *attributes,
3247-- GtkStyleContext *context,
3248-- GtkStateFlags flags);
3249--
3250- G_END_DECLS
3251-
3252- #endif /* __GTK_STYLE_CONTEXT_PRIVATE_H__ */
3253-diff --git a/gtk/gtkswitch.c b/gtk/gtkswitch.c
3254-index 8a4aa72..a21ad59 100644
3255---- a/gtk/gtkswitch.c
3256-+++ b/gtk/gtkswitch.c
3257-@@ -1008,9 +1008,6 @@ gtk_switch_class_init (GtkSwitchClass *klass)
3258- g_object_class_override_property (gobject_class, PROP_ACTION_NAME, "action-name");
3259- g_object_class_override_property (gobject_class, PROP_ACTION_TARGET, "action-target");
3260-
3261-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_SWITCH_ACCESSIBLE);
3262-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_TOGGLE_BUTTON);
3263--
3264- gtk_widget_class_set_css_name (widget_class, "switch");
3265- }
3266-
3267-@@ -1120,7 +1117,6 @@ gtk_switch_set_active (GtkSwitch *sw,
3268-
3269- if (priv->is_active != is_active)
3270- {
3271-- AtkObject *accessible;
3272- gboolean handled;
3273-
3274- priv->is_active = is_active;
3275-@@ -1134,9 +1130,6 @@ gtk_switch_set_active (GtkSwitch *sw,
3276-
3277- g_object_notify_by_pspec (G_OBJECT (sw), switch_props[PROP_ACTIVE]);
3278-
3279-- accessible = gtk_widget_get_accessible (GTK_WIDGET (sw));
3280-- atk_object_notify_state_change (accessible, ATK_STATE_CHECKED, priv->is_active);
3281--
3282- gtk_widget_queue_allocate (GTK_WIDGET (sw));
3283- }
3284- }
3285-diff --git a/gtk/gtktextbuffer.c b/gtk/gtktextbuffer.c
3286-index f5f17f5..90208e2 100644
3287---- a/gtk/gtktextbuffer.c
3288-+++ b/gtk/gtktextbuffer.c
3289-@@ -4478,7 +4478,6 @@ _gtk_text_buffer_spew (GtkTextBuffer *buffer)
3290-
3291- void
3292- _gtk_text_buffer_get_text_before (GtkTextBuffer *buffer,
3293-- AtkTextBoundary boundary_type,
3294- GtkTextIter *position,
3295- GtkTextIter *start,
3296- GtkTextIter *end)
3297-@@ -4487,103 +4486,10 @@ _gtk_text_buffer_get_text_before (GtkTextBuffer *buffer,
3298-
3299- *start = *position;
3300- *end = *start;
3301--
3302-- switch (boundary_type)
3303-- {
3304-- case ATK_TEXT_BOUNDARY_CHAR:
3305-- gtk_text_iter_backward_char (start);
3306-- break;
3307--
3308-- case ATK_TEXT_BOUNDARY_WORD_START:
3309-- if (!gtk_text_iter_starts_word (start))
3310-- gtk_text_iter_backward_word_start (start);
3311-- *end = *start;
3312-- gtk_text_iter_backward_word_start (start);
3313-- break;
3314--
3315-- case ATK_TEXT_BOUNDARY_WORD_END:
3316-- if (gtk_text_iter_inside_word (start) &&
3317-- !gtk_text_iter_starts_word (start))
3318-- gtk_text_iter_backward_word_start (start);
3319-- while (!gtk_text_iter_ends_word (start))
3320-- {
3321-- if (!gtk_text_iter_backward_char (start))
3322-- break;
3323-- }
3324-- *end = *start;
3325-- gtk_text_iter_backward_word_start (start);
3326-- while (!gtk_text_iter_ends_word (start))
3327-- {
3328-- if (!gtk_text_iter_backward_char (start))
3329-- break;
3330-- }
3331-- break;
3332--
3333-- case ATK_TEXT_BOUNDARY_SENTENCE_START:
3334-- if (!gtk_text_iter_starts_sentence (start))
3335-- gtk_text_iter_backward_sentence_start (start);
3336-- *end = *start;
3337-- gtk_text_iter_backward_sentence_start (start);
3338-- break;
3339--
3340-- case ATK_TEXT_BOUNDARY_SENTENCE_END:
3341-- if (gtk_text_iter_inside_sentence (start) &&
3342-- !gtk_text_iter_starts_sentence (start))
3343-- gtk_text_iter_backward_sentence_start (start);
3344-- while (!gtk_text_iter_ends_sentence (start))
3345-- {
3346-- if (!gtk_text_iter_backward_char (start))
3347-- break;
3348-- }
3349-- *end = *start;
3350-- gtk_text_iter_backward_sentence_start (start);
3351-- while (!gtk_text_iter_ends_sentence (start))
3352-- {
3353-- if (!gtk_text_iter_backward_char (start))
3354-- break;
3355-- }
3356-- break;
3357--
3358-- case ATK_TEXT_BOUNDARY_LINE_START:
3359-- line_number = gtk_text_iter_get_line (start);
3360-- if (line_number == 0)
3361-- {
3362-- gtk_text_buffer_get_iter_at_offset (buffer, start, 0);
3363-- }
3364-- else
3365-- {
3366-- gtk_text_iter_backward_line (start);
3367-- gtk_text_iter_forward_line (start);
3368-- }
3369-- *end = *start;
3370-- gtk_text_iter_backward_line (start);
3371-- break;
3372--
3373-- case ATK_TEXT_BOUNDARY_LINE_END:
3374-- line_number = gtk_text_iter_get_line (start);
3375-- if (line_number == 0)
3376-- {
3377-- gtk_text_buffer_get_iter_at_offset (buffer, start, 0);
3378-- *end = *start;
3379-- }
3380-- else
3381-- {
3382-- gtk_text_iter_backward_line (start);
3383-- *end = *start;
3384-- while (!gtk_text_iter_ends_line (start))
3385-- {
3386-- if (!gtk_text_iter_backward_char (start))
3387-- break;
3388-- }
3389-- gtk_text_iter_forward_to_line_end (end);
3390-- }
3391-- break;
3392-- }
3393- }
3394-
3395- void
3396- _gtk_text_buffer_get_text_at (GtkTextBuffer *buffer,
3397-- AtkTextBoundary boundary_type,
3398- GtkTextIter *position,
3399- GtkTextIter *start,
3400- GtkTextIter *end)
3401-@@ -4592,187 +4498,16 @@ _gtk_text_buffer_get_text_at (GtkTextBuffer *buffer,
3402-
3403- *start = *position;
3404- *end = *start;
3405--
3406-- switch (boundary_type)
3407-- {
3408-- case ATK_TEXT_BOUNDARY_CHAR:
3409-- gtk_text_iter_forward_char (end);
3410-- break;
3411--
3412-- case ATK_TEXT_BOUNDARY_WORD_START:
3413-- if (!gtk_text_iter_starts_word (start))
3414-- gtk_text_iter_backward_word_start (start);
3415-- if (gtk_text_iter_inside_word (end))
3416-- gtk_text_iter_forward_word_end (end);
3417-- while (!gtk_text_iter_starts_word (end))
3418-- {
3419-- if (!gtk_text_iter_forward_char (end))
3420-- break;
3421-- }
3422-- break;
3423--
3424-- case ATK_TEXT_BOUNDARY_WORD_END:
3425-- if (gtk_text_iter_inside_word (start) &&
3426-- !gtk_text_iter_starts_word (start))
3427-- gtk_text_iter_backward_word_start (start);
3428-- while (!gtk_text_iter_ends_word (start))
3429-- {
3430-- if (!gtk_text_iter_backward_char (start))
3431-- break;
3432-- }
3433-- gtk_text_iter_forward_word_end (end);
3434-- break;
3435--
3436-- case ATK_TEXT_BOUNDARY_SENTENCE_START:
3437-- if (!gtk_text_iter_starts_sentence (start))
3438-- gtk_text_iter_backward_sentence_start (start);
3439-- if (gtk_text_iter_inside_sentence (end))
3440-- gtk_text_iter_forward_sentence_end (end);
3441-- while (!gtk_text_iter_starts_sentence (end))
3442-- {
3443-- if (!gtk_text_iter_forward_char (end))
3444-- break;
3445-- }
3446-- break;
3447--
3448-- case ATK_TEXT_BOUNDARY_SENTENCE_END:
3449-- if (gtk_text_iter_inside_sentence (start) &&
3450-- !gtk_text_iter_starts_sentence (start))
3451-- gtk_text_iter_backward_sentence_start (start);
3452-- while (!gtk_text_iter_ends_sentence (start))
3453-- {
3454-- if (!gtk_text_iter_backward_char (start))
3455-- break;
3456-- }
3457-- gtk_text_iter_forward_sentence_end (end);
3458-- break;
3459--
3460-- case ATK_TEXT_BOUNDARY_LINE_START:
3461-- line_number = gtk_text_iter_get_line (start);
3462-- if (line_number == 0)
3463-- {
3464-- gtk_text_buffer_get_iter_at_offset (buffer, start, 0);
3465-- }
3466-- else
3467-- {
3468-- gtk_text_iter_backward_line (start);
3469-- gtk_text_iter_forward_line (start);
3470-- }
3471-- gtk_text_iter_forward_line (end);
3472-- break;
3473--
3474-- case ATK_TEXT_BOUNDARY_LINE_END:
3475-- line_number = gtk_text_iter_get_line (start);
3476-- if (line_number == 0)
3477-- {
3478-- gtk_text_buffer_get_iter_at_offset (buffer, start, 0);
3479-- }
3480-- else
3481-- {
3482-- gtk_text_iter_backward_line (start);
3483-- gtk_text_iter_forward_line (start);
3484-- }
3485-- while (!gtk_text_iter_ends_line (start))
3486-- {
3487-- if (!gtk_text_iter_backward_char (start))
3488-- break;
3489-- }
3490-- gtk_text_iter_forward_to_line_end (end);
3491-- break;
3492-- }
3493- }
3494-
3495- void
3496- _gtk_text_buffer_get_text_after (GtkTextBuffer *buffer,
3497-- AtkTextBoundary boundary_type,
3498- GtkTextIter *position,
3499- GtkTextIter *start,
3500- GtkTextIter *end)
3501- {
3502- *start = *position;
3503- *end = *start;
3504--
3505-- switch (boundary_type)
3506-- {
3507-- case ATK_TEXT_BOUNDARY_CHAR:
3508-- gtk_text_iter_forward_char (start);
3509-- gtk_text_iter_forward_chars (end, 2);
3510-- break;
3511--
3512-- case ATK_TEXT_BOUNDARY_WORD_START:
3513-- if (gtk_text_iter_inside_word (end))
3514-- gtk_text_iter_forward_word_end (end);
3515-- while (!gtk_text_iter_starts_word (end))
3516-- {
3517-- if (!gtk_text_iter_forward_char (end))
3518-- break;
3519-- }
3520-- *start = *end;
3521-- if (!gtk_text_iter_is_end (end))
3522-- {
3523-- gtk_text_iter_forward_word_end (end);
3524-- while (!gtk_text_iter_starts_word (end))
3525-- {
3526-- if (!gtk_text_iter_forward_char (end))
3527-- break;
3528-- }
3529-- }
3530-- break;
3531--
3532-- case ATK_TEXT_BOUNDARY_WORD_END:
3533-- gtk_text_iter_forward_word_end (end);
3534-- *start = *end;
3535-- if (!gtk_text_iter_is_end (end))
3536-- gtk_text_iter_forward_word_end (end);
3537-- break;
3538--
3539-- case ATK_TEXT_BOUNDARY_SENTENCE_START:
3540-- if (gtk_text_iter_inside_sentence (end))
3541-- gtk_text_iter_forward_sentence_end (end);
3542-- while (!gtk_text_iter_starts_sentence (end))
3543-- {
3544-- if (!gtk_text_iter_forward_char (end))
3545-- break;
3546-- }
3547-- *start = *end;
3548-- if (!gtk_text_iter_is_end (end))
3549-- {
3550-- gtk_text_iter_forward_sentence_end (end);
3551-- while (!gtk_text_iter_starts_sentence (end))
3552-- {
3553-- if (!gtk_text_iter_forward_char (end))
3554-- break;
3555-- }
3556-- }
3557-- break;
3558--
3559-- case ATK_TEXT_BOUNDARY_SENTENCE_END:
3560-- gtk_text_iter_forward_sentence_end (end);
3561-- *start = *end;
3562-- if (!gtk_text_iter_is_end (end))
3563-- gtk_text_iter_forward_sentence_end (end);
3564-- break;
3565--
3566-- case ATK_TEXT_BOUNDARY_LINE_START:
3567-- gtk_text_iter_forward_line (end);
3568-- *start = *end;
3569-- gtk_text_iter_forward_line (end);
3570-- break;
3571--
3572-- case ATK_TEXT_BOUNDARY_LINE_END:
3573-- gtk_text_iter_forward_line (start);
3574-- *end = *start;
3575-- if (!gtk_text_iter_is_end (start))
3576-- {
3577-- while (!gtk_text_iter_ends_line (start))
3578-- {
3579-- if (!gtk_text_iter_backward_char (start))
3580-- break;
3581-- }
3582-- gtk_text_iter_forward_to_line_end (end);
3583-- }
3584-- break;
3585-- }
3586- }
3587-
3588- static GtkTextTag *
3589-diff --git a/gtk/gtktextbufferprivate.h b/gtk/gtktextbufferprivate.h
3590-index 8d8363c..c163f0d 100644
3591---- a/gtk/gtktextbufferprivate.h
3592-+++ b/gtk/gtktextbufferprivate.h
3593-@@ -35,17 +35,14 @@ void _gtk_text_buffer_notify_will_remove_tag (GtkTextBuffer *buffer,
3594- GtkTextTag *tag);
3595-
3596- void _gtk_text_buffer_get_text_before (GtkTextBuffer *buffer,
3597-- AtkTextBoundary boundary_type,
3598- GtkTextIter *position,
3599- GtkTextIter *start,
3600- GtkTextIter *end);
3601- void _gtk_text_buffer_get_text_at (GtkTextBuffer *buffer,
3602-- AtkTextBoundary boundary_type,
3603- GtkTextIter *position,
3604- GtkTextIter *start,
3605- GtkTextIter *end);
3606- void _gtk_text_buffer_get_text_after (GtkTextBuffer *buffer,
3607-- AtkTextBoundary boundary_type,
3608- GtkTextIter *position,
3609- GtkTextIter *start,
3610- GtkTextIter *end);
3611-diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
3612-index 394da40..2873283 100644
3613---- a/gtk/gtktextview.c
3614-+++ b/gtk/gtktextview.c
3615-@@ -1706,7 +1706,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
3616- "move-focus", 1,
3617- GTK_TYPE_DIRECTION_TYPE, GTK_DIR_TAB_BACKWARD);
3618-
3619-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_TEXT_VIEW_ACCESSIBLE);
3620- gtk_widget_class_set_css_name (widget_class, "textview");
3621-
3622- quark_text_selection_data = g_quark_from_static_string ("gtk-text-view-text-selection-data");
3623-@@ -2016,7 +2015,6 @@ gtk_text_view_set_buffer (GtkTextView *text_view,
3624- gtk_text_view_update_handles (text_view, GTK_TEXT_HANDLE_MODE_NONE);
3625- }
3626-
3627-- _gtk_text_view_accessible_set_buffer (text_view, old_buffer);
3628- if (old_buffer)
3629- g_object_unref (old_buffer);
3630-
3631-diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
3632-index f594d8c..17579db 100644
3633---- a/gtk/gtktogglebutton.c
3634-+++ b/gtk/gtktogglebutton.c
3635-@@ -222,7 +222,6 @@ gtk_toggle_button_class_init (GtkToggleButtonClass *class)
3636- NULL,
3637- G_TYPE_NONE, 0);
3638-
3639-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_TOGGLE_BUTTON_ACCESSIBLE);
3640- gtk_widget_class_set_css_name (widget_class, "button");
3641- }
3642-
3643-diff --git a/gtk/gtktoolbar.c b/gtk/gtktoolbar.c
3644-index 79164f3..1b94c08 100644
3645---- a/gtk/gtktoolbar.c
3646-+++ b/gtk/gtktoolbar.c
3647-@@ -413,8 +413,6 @@ gtk_toolbar_class_init (GtkToolbarClass *klass)
3648- widget_class->style_updated = gtk_toolbar_style_updated;
3649- widget_class->focus = gtk_toolbar_focus;
3650-
3651-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_TOOL_BAR);
3652--
3653- /* need to override the base class function via override_class_handler,
3654- * because the signal slot is not available in GtkWidgetClass
3655- */
3656-diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
3657-index e56f28b..6a432ea 100644
3658---- a/gtk/gtktoolbutton.c
3659-+++ b/gtk/gtktoolbutton.c
3660-@@ -1193,7 +1193,6 @@ gtk_tool_button_set_label (GtkToolButton *button,
3661- {
3662- gchar *old_label;
3663- gchar *elided_label;
3664-- AtkObject *accessible;
3665-
3666- g_return_if_fail (GTK_IS_TOOL_BUTTON (button));
3667-
3668-@@ -1205,8 +1204,6 @@ gtk_tool_button_set_label (GtkToolButton *button,
3669- if (label)
3670- {
3671- elided_label = _gtk_toolbar_elide_underscores (label);
3672-- accessible = gtk_widget_get_accessible (GTK_WIDGET (button->priv->button));
3673-- atk_object_set_name (accessible, elided_label);
3674- g_free (elided_label);
3675- }
3676-
3677-diff --git a/gtk/gtktooltipwindow.c b/gtk/gtktooltipwindow.c
3678-index a88a64f..9333232 100644
3679---- a/gtk/gtktooltipwindow.c
3680-+++ b/gtk/gtktooltipwindow.c
3681-@@ -64,7 +64,6 @@ gtk_tooltip_window_class_init (GtkTooltipWindowClass *klass)
3682- GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
3683-
3684- gtk_widget_class_set_css_name (widget_class, I_("tooltip"));
3685-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_TOOL_TIP);
3686- gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/ui/gtktooltipwindow.ui");
3687-
3688- gtk_widget_class_bind_template_child (widget_class, GtkTooltipWindow, box);
3689-diff --git a/gtk/gtktreeselection.c b/gtk/gtktreeselection.c
3690-index 677a277..9b588f6 100644
3691---- a/gtk/gtktreeselection.c
3692-+++ b/gtk/gtktreeselection.c
3693-@@ -1638,12 +1638,10 @@ gtk_tree_selection_real_select_node (GtkTreeSelection *selection,
3694- if (!GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_SELECTED))
3695- {
3696- GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_SELECTED);
3697-- _gtk_tree_view_accessible_add_state (priv->tree_view, tree, node, GTK_CELL_RENDERER_SELECTED);
3698- }
3699- else
3700- {
3701- GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_IS_SELECTED);
3702-- _gtk_tree_view_accessible_remove_state (priv->tree_view, tree, node, GTK_CELL_RENDERER_SELECTED);
3703- }
3704-
3705- _gtk_tree_view_queue_draw_node (priv->tree_view, tree, node, NULL);
3706-diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
3707-index b6a4290..63339e3 100644
3708---- a/gtk/gtktreeview.c
3709-+++ b/gtk/gtktreeview.c
3710-@@ -1811,7 +1811,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
3711-
3712- gtk_binding_entry_add_signal (binding_set, GDK_KEY_F, GDK_CONTROL_MASK, "start-interactive-search", 0);
3713-
3714-- gtk_widget_class_set_accessible_type (widget_class, GTK_TYPE_TREE_VIEW_ACCESSIBLE);
3715- gtk_widget_class_set_css_name (widget_class, "treeview");
3716- }
3717-
3718-@@ -9029,8 +9028,6 @@ gtk_tree_view_row_changed (GtkTreeModel *model,
3719- if (tree == NULL)
3720- goto done;
3721-
3722-- _gtk_tree_view_accessible_changed (tree_view, tree, node);
3723--
3724- if (tree_view->priv->fixed_height_mode
3725- && tree_view->priv->fixed_height >= 0)
3726- {
3727-@@ -9159,8 +9156,6 @@ gtk_tree_view_row_inserted (GtkTreeModel *model,
3728- tmpnode = _gtk_rbtree_insert_after (tree, tmpnode, height, FALSE);
3729- }
3730-
3731-- _gtk_tree_view_accessible_add (tree_view, tree, tmpnode);
3732--
3733- done:
3734- if (height > 0)
3735- {
3736-@@ -9223,12 +9218,10 @@ gtk_tree_view_row_has_child_toggled (GtkTreeModel *model,
3737- if (has_child)
3738- {
3739- GTK_RBNODE_SET_FLAG (node, GTK_RBNODE_IS_PARENT);
3740-- _gtk_tree_view_accessible_add_state (tree_view, tree, node, GTK_CELL_RENDERER_EXPANDABLE);
3741- }
3742- else
3743- {
3744- GTK_RBNODE_UNSET_FLAG (node, GTK_RBNODE_IS_PARENT);
3745-- _gtk_tree_view_accessible_remove_state (tree_view, tree, node, GTK_CELL_RENDERER_EXPANDABLE);
3746- }
3747-
3748- if (has_child && tree_view->priv->is_list)
3749-@@ -9378,15 +9371,10 @@ gtk_tree_view_row_deleted (GtkTreeModel *model,
3750- if (tree_view->priv->tree == tree)
3751- tree_view->priv->tree = NULL;
3752-
3753-- _gtk_tree_view_accessible_remove_state (tree_view,
3754-- tree->parent_tree, tree->parent_node,
3755-- GTK_CELL_RENDERER_EXPANDED);
3756-- _gtk_tree_view_accessible_remove (tree_view, tree, NULL);
3757- _gtk_rbtree_remove (tree);
3758- }
3759- else
3760- {
3761-- _gtk_tree_view_accessible_remove (tree_view, tree, node);
3762- _gtk_rbtree_remove_node (tree, node);
3763- }
3764-
3765-@@ -9460,8 +9448,6 @@ gtk_tree_view_rows_reordered (GtkTreeModel *model,
3766-
3767- _gtk_rbtree_reorder (tree, new_order, len);
3768-
3769-- _gtk_tree_view_accessible_reorder (tree_view);
3770--
3771- gtk_widget_queue_draw (GTK_WIDGET (tree_view));
3772-
3773- gtk_tree_view_dy_to_top_row (tree_view);
3774-@@ -10293,9 +10279,6 @@ _gtk_tree_view_set_focus_column (GtkTreeView *tree_view,
3775-
3776- tree_view->priv->focus_column = column;
3777-
3778-- _gtk_tree_view_accessible_update_focus_column (tree_view,
3779-- old_column,
3780-- column);
3781- }
3782-
3783-
3784-@@ -11593,7 +11576,6 @@ gtk_tree_view_set_model (GtkTreeView *tree_view,
3785- {
3786- tree_view->priv->tree = _gtk_rbtree_new ();
3787- gtk_tree_view_build_tree (tree_view, tree_view->priv->tree, &iter, 1, FALSE);
3788-- _gtk_tree_view_accessible_add (tree_view, tree_view->priv->tree, NULL);
3789- }
3790- gtk_tree_path_free (path);
3791-
3792-@@ -12145,8 +12127,6 @@ gtk_tree_view_remove_column (GtkTreeView *tree_view,
3793- gtk_widget_queue_resize (GTK_WIDGET (tree_view));
3794- }
3795-
3796-- _gtk_tree_view_accessible_remove_column (tree_view, column, position);
3797--
3798- g_object_unref (column);
3799- g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
3800-
3801-@@ -12217,8 +12197,6 @@ gtk_tree_view_insert_column (GtkTreeView *tree_view,
3802- gtk_widget_queue_resize (GTK_WIDGET (tree_view));
3803- }
3804-
3805-- _gtk_tree_view_accessible_add_column (tree_view, column, position);
3806--
3807- g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
3808-
3809- return tree_view->priv->n_columns;
3810-@@ -12436,8 +12414,6 @@ gtk_tree_view_move_column_after (GtkTreeView *tree_view,
3811- gtk_tree_view_size_allocate_columns (GTK_WIDGET (tree_view), NULL);
3812- }
3813-
3814-- _gtk_tree_view_accessible_reorder_column (tree_view, column);
3815--
3816- g_signal_emit (tree_view, tree_view_signals[COLUMNS_CHANGED], 0);
3817- }
3818-
3819-@@ -12910,11 +12886,6 @@ gtk_tree_view_real_expand_row (GtkTreeView *tree_view,
3820- gtk_tree_path_get_depth (path) + 1,
3821- open_all);
3822-
3823-- _gtk_tree_view_accessible_add (tree_view, node->children, NULL);
3824-- _gtk_tree_view_accessible_add_state (tree_view,
3825-- tree, node,
3826-- GTK_CELL_RENDERER_EXPANDED);
3827--
3828- install_presize_handler (tree_view);
3829-
3830- g_signal_emit (tree_view, tree_view_signals[ROW_EXPANDED], 0, &iter, path);
3831-@@ -13061,11 +13032,6 @@ gtk_tree_view_real_collapse_row (GtkTreeView *tree_view,
3832- /* Stop a pending double click */
3833- gtk_event_controller_reset (GTK_EVENT_CONTROLLER (tree_view->priv->multipress_gesture));
3834-
3835-- _gtk_tree_view_accessible_remove (tree_view, node->children, NULL);
3836-- _gtk_tree_view_accessible_remove_state (tree_view,
3837-- tree, node,
3838-- GTK_CELL_RENDERER_EXPANDED);
3839--
3840- _gtk_rbtree_remove (node->children);
3841-
3842- if (cursor_changed)
3843-@@ -13284,10 +13250,6 @@ gtk_tree_view_real_set_cursor (GtkTreeView *tree_view,
3844- {
3845- if (!(flags & CURSOR_INVALID) && tree_view->priv->cursor_node)
3846- {
3847-- _gtk_tree_view_accessible_remove_state (tree_view,
3848-- tree_view->priv->cursor_tree,
3849-- tree_view->priv->cursor_node,
3850-- GTK_CELL_RENDERER_FOCUSED);
3851- _gtk_tree_view_queue_draw_node (tree_view,
3852- tree_view->priv->cursor_tree,
3853- tree_view->priv->cursor_node,
3854-@@ -13352,10 +13314,6 @@ gtk_tree_view_real_set_cursor (GtkTreeView *tree_view,
3855- NULL);
3856- }
3857-
3858-- _gtk_tree_view_accessible_add_state (tree_view,
3859-- tree_view->priv->cursor_tree,
3860-- tree_view->priv->cursor_node,
3861-- GTK_CELL_RENDERER_FOCUSED);
3862- }
3863-
3864- if (!gtk_widget_in_destruction (GTK_WIDGET (tree_view)))
3865-diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
3866-index 366b3aa..4159f85 100644
3867---- a/gtk/gtktreeviewcolumn.c
3868-+++ b/gtk/gtktreeviewcolumn.c
3869-@@ -1889,12 +1889,6 @@ gtk_tree_view_column_set_visible (GtkTreeViewColumn *tree_column,
3870- if (priv->visible)
3871- _gtk_tree_view_column_cell_set_dirty (tree_column, TRUE);
3872-
3873-- if (priv->tree_view)
3874-- {
3875-- _gtk_tree_view_accessible_toggle_visibility (GTK_TREE_VIEW (priv->tree_view),
3876-- tree_column);
3877-- }
3878--
3879- gtk_tree_view_column_update_button (tree_column);
3880- g_object_notify_by_pspec (G_OBJECT (tree_column), tree_column_props[PROP_VISIBLE]);
3881- }
3882-diff --git a/gtk/gtkviewport.c b/gtk/gtkviewport.c
3883-index 601d5a1..c81ce62 100644
3884---- a/gtk/gtkviewport.c
3885-+++ b/gtk/gtkviewport.c
3886-@@ -390,8 +390,6 @@ gtk_viewport_class_init (GtkViewportClass *class)
3887- widget_class->get_preferred_height_for_width = gtk_viewport_get_preferred_height_for_width;
3888- widget_class->queue_draw_region = gtk_viewport_queue_draw_region;
3889-
3890-- gtk_widget_class_set_accessible_role (widget_class, ATK_ROLE_VIEWPORT);
3891--
3892- container_class->remove = gtk_viewport_remove;
3893- container_class->add = gtk_viewport_add;
3894- gtk_container_class_handle_border_width (container_class);
3895-diff --git a/gtk/gtkvolumebutton.c b/gtk/gtkvolumebutton.c
3896-index f406492..e6a103c 100644
3897---- a/gtk/gtkvolumebutton.c
3898-+++ b/gtk/gtkvolumebutton.c
3899-@@ -183,10 +183,6 @@ gtk_volume_button_init (GtkVolumeButton *button)
3900- GtkWidget *widget = GTK_WIDGET (button);
3901-
3902- gtk_widget_init_template (widget);
3903--
3904-- /* The atk action description is not supported by GtkBuilder */
3905-- atk_action_set_description (ATK_ACTION (gtk_widget_get_accessible (GTK_WIDGET (widget))),
3906-- 1, _("Adjusts the volume"));
3907- }
3908-
3909- /**
3910-@@ -220,9 +216,6 @@ cb_query_tooltip (GtkWidget *button,
3911- GtkAdjustment *adjustment;
3912- gdouble val;
3913- char *str;
3914-- AtkImage *image;
3915--
3916-- image = ATK_IMAGE (gtk_widget_get_accessible (button));
3917-
3918- adjustment = gtk_scale_button_get_adjustment (scale_button);
3919- val = gtk_scale_button_get_value (scale_button);
3920-@@ -250,7 +243,6 @@ cb_query_tooltip (GtkWidget *button,
3921- }
3922-
3923- gtk_tooltip_set_text (tooltip, str);
3924-- atk_image_set_image_description (image, str);
3925- g_free (str);
3926-
3927- return TRUE;
3928-diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
3929-index b6e0011..789905a 100644
3930---- a/gtk/gtkwidget.c
3931-+++ b/gtk/gtkwidget.c
3932-@@ -496,8 +496,6 @@ typedef struct {
3933- struct _GtkWidgetClassPrivate
3934- {
3935- GtkWidgetTemplate *template;
3936-- GType accessible_type;
3937-- AtkRole accessible_role;
3938- const char *css_name;
3939- };
3940-
3941-@@ -738,9 +736,6 @@ static void gtk_widget_real_state_flags_changed (GtkWidget
3942- GtkStateFlags old_state);
3943- static void gtk_widget_real_queue_draw_region (GtkWidget *widget,
3944- const cairo_region_t *region);
3945--static AtkObject* gtk_widget_real_get_accessible (GtkWidget *widget);
3946--static void gtk_widget_accessible_interface_init (AtkImplementorIface *iface);
3947--static AtkObject* gtk_widget_ref_accessible (AtkImplementor *implementor);
3948- static void gtk_widget_invalidate_widget_windows (GtkWidget *widget,
3949- cairo_region_t *region);
3950- static GdkScreen * gtk_widget_get_screen_unchecked (GtkWidget *widget);
3951-@@ -878,13 +873,6 @@ gtk_widget_get_type (void)
3952- NULL, /* value_table */
3953- };
3954-
3955-- const GInterfaceInfo accessibility_info =
3956-- {
3957-- (GInterfaceInitFunc) gtk_widget_accessible_interface_init,
3958-- (GInterfaceFinalizeFunc) NULL,
3959-- NULL /* interface data */
3960-- };
3961--
3962- const GInterfaceInfo buildable_info =
3963- {
3964- (GInterfaceInitFunc) gtk_widget_buildable_interface_init,
3965-@@ -900,8 +888,6 @@ gtk_widget_get_type (void)
3966- GtkWidget_private_offset =
3967- g_type_add_instance_private (widget_type, sizeof (GtkWidgetPrivate));
3968-
3969-- g_type_add_interface_static (widget_type, ATK_TYPE_IMPLEMENTOR,
3970-- &accessibility_info) ;
3971- g_type_add_interface_static (widget_type, GTK_TYPE_BUILDABLE,
3972- &buildable_info) ;
3973- }
3974-@@ -1106,11 +1092,6 @@ gtk_widget_class_init (GtkWidgetClass *klass)
3975-
3976- klass->show_help = gtk_widget_real_show_help;
3977-
3978-- /* Accessibility support */
3979-- klass->priv->accessible_type = GTK_TYPE_ACCESSIBLE;
3980-- klass->priv->accessible_role = ATK_ROLE_INVALID;
3981-- klass->get_accessible = gtk_widget_real_get_accessible;
3982--
3983- klass->adjust_size_request = gtk_widget_real_adjust_size_request;
3984- klass->adjust_baseline_request = gtk_widget_real_adjust_baseline_request;
3985- klass->adjust_size_allocation = gtk_widget_real_adjust_size_allocation;
3986-@@ -3722,7 +3703,6 @@ G_GNUC_END_IGNORE_DEPRECATIONS
3987- 1, G_MAXINT, 20,
3988- GTK_PARAM_READABLE));
3989-
3990-- gtk_widget_class_set_accessible_type (klass, GTK_TYPE_WIDGET_ACCESSIBLE);
3991- gtk_widget_class_set_css_name (klass, "widget");
3992- }
3993-
3994-@@ -12332,13 +12312,6 @@ gtk_widget_real_destroy (GtkWidget *object)
3995- }
3996- }
3997-
3998-- if (priv->accessible)
3999-- {
4000-- gtk_accessible_set_widget (GTK_ACCESSIBLE (priv->accessible), NULL);
4001-- g_object_unref (priv->accessible);
4002-- priv->accessible = NULL;
4003-- }
4004--
4005- /* wipe accelerator closures (keep order) */
4006- g_object_set_qdata (G_OBJECT (widget), quark_accel_path, NULL);
4007- g_object_set_qdata (G_OBJECT (widget), quark_accel_closures, NULL);
4008-@@ -12371,8 +12344,6 @@ gtk_widget_finalize (GObject *object)
4009-
4010- g_free (priv->name);
4011-
4012-- g_clear_object (&priv->accessible);
4013--
4014- gtk_widget_clear_path (widget);
4015-
4016- gtk_css_widget_node_widget_destroyed (GTK_CSS_WIDGET_NODE (priv->cssnode));
4017-@@ -13420,190 +13391,6 @@ G_DEFINE_BOXED_TYPE (GtkRequisition, gtk_requisition,
4018- gtk_requisition_copy,
4019- gtk_requisition_free)
4020-
4021--/**
4022-- * gtk_widget_class_set_accessible_type:
4023-- * @widget_class: class to set the accessible type for
4024-- * @type: The object type that implements the accessible for @widget_class
4025-- *
4026-- * Sets the type to be used for creating accessibles for widgets of
4027-- * @widget_class. The given @type must be a subtype of the type used for
4028-- * accessibles of the parent class.
4029-- *
4030-- * This function should only be called from class init functions of widgets.
4031-- *
4032-- * Since: 3.2
4033-- **/
4034--void
4035--gtk_widget_class_set_accessible_type (GtkWidgetClass *widget_class,
4036-- GType type)
4037--{
4038-- GtkWidgetClassPrivate *priv;
4039--
4040-- g_return_if_fail (GTK_IS_WIDGET_CLASS (widget_class));
4041-- g_return_if_fail (g_type_is_a (type, widget_class->priv->accessible_type));
4042--
4043-- priv = widget_class->priv;
4044--
4045-- priv->accessible_type = type;
4046-- /* reset this - honoring the type's role is better. */
4047-- priv->accessible_role = ATK_ROLE_INVALID;
4048--}
4049--
4050--/**
4051-- * gtk_widget_class_set_accessible_role:
4052-- * @widget_class: class to set the accessible role for
4053-- * @role: The role to use for accessibles created for @widget_class
4054-- *
4055-- * Sets the default #AtkRole to be set on accessibles created for
4056-- * widgets of @widget_class. Accessibles may decide to not honor this
4057-- * setting if their role reporting is more refined. Calls to
4058-- * gtk_widget_class_set_accessible_type() will reset this value.
4059-- *
4060-- * In cases where you want more fine-grained control over the role of
4061-- * accessibles created for @widget_class, you should provide your own
4062-- * accessible type and use gtk_widget_class_set_accessible_type()
4063-- * instead.
4064-- *
4065-- * If @role is #ATK_ROLE_INVALID, the default role will not be changed
4066-- * and the accessible’s default role will be used instead.
4067-- *
4068-- * This function should only be called from class init functions of widgets.
4069-- *
4070-- * Since: 3.2
4071-- **/
4072--void
4073--gtk_widget_class_set_accessible_role (GtkWidgetClass *widget_class,
4074-- AtkRole role)
4075--{
4076-- GtkWidgetClassPrivate *priv;
4077--
4078-- g_return_if_fail (GTK_IS_WIDGET_CLASS (widget_class));
4079--
4080-- priv = widget_class->priv;
4081--
4082-- priv->accessible_role = role;
4083--}
4084--
4085--/**
4086-- * _gtk_widget_peek_accessible:
4087-- * @widget: a #GtkWidget
4088-- *
4089-- * Gets the accessible for @widget, if it has been created yet.
4090-- * Otherwise, this function returns %NULL. If the @widget’s implementation
4091-- * does not use the default way to create accessibles, %NULL will always be
4092-- * returned.
4093-- *
4094-- * Returns: (nullable): the accessible for @widget or %NULL if none has been
4095-- * created yet.
4096-- **/
4097--AtkObject *
4098--_gtk_widget_peek_accessible (GtkWidget *widget)
4099--{
4100-- return widget->priv->accessible;
4101--}
4102--
4103--/**
4104-- * gtk_widget_get_accessible:
4105-- * @widget: a #GtkWidget
4106-- *
4107-- * Returns the accessible object that describes the widget to an
4108-- * assistive technology.
4109-- *
4110-- * If accessibility support is not available, this #AtkObject
4111-- * instance may be a no-op. Likewise, if no class-specific #AtkObject
4112-- * implementation is available for the widget instance in question,
4113-- * it will inherit an #AtkObject implementation from the first ancestor
4114-- * class for which such an implementation is defined.
4115-- *
4116-- * The documentation of the
4117-- * [ATK](http://developer.gnome.org/atk/stable/)
4118-- * library contains more information about accessible objects and their uses.
4119-- *
4120-- * Returns: (transfer none): the #AtkObject associated with @widget
4121-- */
4122--AtkObject*
4123--gtk_widget_get_accessible (GtkWidget *widget)
4124--{
4125-- g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
4126--
4127-- return GTK_WIDGET_GET_CLASS (widget)->get_accessible (widget);
4128--}
4129--
4130--static AtkObject*
4131--gtk_widget_real_get_accessible (GtkWidget *widget)
4132--{
4133-- AtkObject* accessible;
4134--
4135-- accessible = widget->priv->accessible;
4136--
4137-- if (!accessible)
4138-- {
4139-- GtkWidgetClass *widget_class;
4140-- GtkWidgetClassPrivate *priv;
4141-- AtkObjectFactory *factory;
4142-- AtkRegistry *default_registry;
4143--
4144-- widget_class = GTK_WIDGET_GET_CLASS (widget);
4145-- priv = widget_class->priv;
4146--
4147-- if (priv->accessible_type == GTK_TYPE_ACCESSIBLE)
4148-- {
4149-- default_registry = atk_get_default_registry ();
4150-- factory = atk_registry_get_factory (default_registry,
4151-- G_TYPE_FROM_INSTANCE (widget));
4152-- accessible = atk_object_factory_create_accessible (factory, G_OBJECT (widget));
4153--
4154-- if (priv->accessible_role != ATK_ROLE_INVALID)
4155-- atk_object_set_role (accessible, priv->accessible_role);
4156--
4157-- widget->priv->accessible = accessible;
4158-- }
4159-- else
4160-- {
4161-- accessible = g_object_new (priv->accessible_type,
4162-- "widget", widget,
4163-- NULL);
4164-- if (priv->accessible_role != ATK_ROLE_INVALID)
4165-- atk_object_set_role (accessible, priv->accessible_role);
4166--
4167-- widget->priv->accessible = accessible;
4168--
4169-- atk_object_initialize (accessible, widget);
4170--
4171-- /* Set the role again, since we don't want a role set
4172-- * in some parent initialize() function to override
4173-- * our own.
4174-- */
4175-- if (priv->accessible_role != ATK_ROLE_INVALID)
4176-- atk_object_set_role (accessible, priv->accessible_role);
4177-- }
4178--
4179-- }
4180--
4181-- return accessible;
4182--}
4183--
4184--/*
4185-- * Initialize a AtkImplementorIface instance’s virtual pointers as
4186-- * appropriate to this implementor’s class (GtkWidget).
4187-- */
4188--static void
4189--gtk_widget_accessible_interface_init (AtkImplementorIface *iface)
4190--{
4191-- iface->ref_accessible = gtk_widget_ref_accessible;
4192--}
4193--
4194--static AtkObject*
4195--gtk_widget_ref_accessible (AtkImplementor *implementor)
4196--{
4197-- AtkObject *accessible;
4198--
4199-- accessible = gtk_widget_get_accessible (GTK_WIDGET (implementor));
4200-- if (accessible)
4201-- g_object_ref (accessible);
4202-- return accessible;
4203--}
4204--
4205- /*
4206- * Expand flag management
4207- */
4208-@@ -14072,9 +13859,6 @@ gtk_widget_buildable_get_internal_child (GtkBuildable *buildable,
4209- GSList *l;
4210- GType internal_child_type = 0;
4211-
4212-- if (strcmp (childname, "accessible") == 0)
4213-- return G_OBJECT (gtk_widget_get_accessible (GTK_WIDGET (buildable)));
4214--
4215- /* Find a widget type which has declared an automated child as internal by
4216- * the name 'childname', if any.
4217- */
4218-@@ -14122,44 +13906,10 @@ gtk_widget_buildable_set_buildable_property (GtkBuildable *buildable,
4219- g_object_set_property (G_OBJECT (buildable), name, value);
4220- }
4221-
4222--typedef struct
4223--{
4224-- gchar *action_name;
4225-- GString *description;
4226-- gchar *context;
4227-- gboolean translatable;
4228--} AtkActionData;
4229--
4230--typedef struct
4231--{
4232-- gchar *target;
4233-- AtkRelationType type;
4234-- gint line;
4235-- gint col;
4236--} AtkRelationData;
4237--
4238--static void
4239--free_action (AtkActionData *data, gpointer user_data)
4240--{
4241-- g_free (data->action_name);
4242-- g_string_free (data->description, TRUE);
4243-- g_free (data->context);
4244-- g_slice_free (AtkActionData, data);
4245--}
4246--
4247--static void
4248--free_relation (AtkRelationData *data, gpointer user_data)
4249--{
4250-- g_free (data->target);
4251-- g_slice_free (AtkRelationData, data);
4252--}
4253--
4254- static void
4255- gtk_widget_buildable_parser_finished (GtkBuildable *buildable,
4256- GtkBuilder *builder)
4257- {
4258-- GSList *atk_relations;
4259--
4260- if (g_object_get_qdata (G_OBJECT (buildable), quark_builder_has_default))
4261- {
4262- gtk_widget_grab_default (GTK_WIDGET (buildable));
4263-@@ -14171,37 +13921,6 @@ gtk_widget_buildable_parser_finished (GtkBuildable *buildable,
4264- gtk_widget_grab_focus (GTK_WIDGET (buildable));
4265- g_object_steal_qdata (G_OBJECT (buildable), quark_builder_has_focus);
4266- }
4267--
4268-- atk_relations = g_object_get_qdata (G_OBJECT (buildable),
4269-- quark_builder_atk_relations);
4270-- if (atk_relations)
4271-- {
4272-- AtkObject *accessible;
4273-- AtkRelationSet *relation_set;
4274-- GSList *l;
4275-- GObject *target;
4276-- AtkObject *target_accessible;
4277--
4278-- accessible = gtk_widget_get_accessible (GTK_WIDGET (buildable));
4279-- relation_set = atk_object_ref_relation_set (accessible);
4280--
4281-- for (l = atk_relations; l; l = l->next)
4282-- {
4283-- AtkRelationData *relation = (AtkRelationData*)l->data;
4284--
4285-- target = _gtk_builder_lookup_object (builder, relation->target, relation->line, relation->col);
4286-- if (!target)
4287-- continue;
4288-- target_accessible = gtk_widget_get_accessible (GTK_WIDGET (target));
4289-- g_assert (target_accessible != NULL);
4290--
4291-- atk_relation_set_add_relation_by_type (relation_set, relation->type, target_accessible);
4292-- }
4293-- g_object_unref (relation_set);
4294--
4295-- g_slist_free_full (atk_relations, (GDestroyNotify) free_relation);
4296-- g_object_steal_qdata (G_OBJECT (buildable), quark_builder_atk_relations);
4297-- }
4298- }
4299-
4300- typedef struct
4301-@@ -14211,125 +13930,6 @@ typedef struct
4302- GSList *relations;
4303- } AccessibilitySubParserData;
4304-
4305--static void
4306--accessibility_start_element (GMarkupParseContext *context,
4307-- const gchar *element_name,
4308-- const gchar **names,
4309-- const gchar **values,
4310-- gpointer user_data,
4311-- GError **error)
4312--{
4313-- AccessibilitySubParserData *data = (AccessibilitySubParserData*)user_data;
4314--
4315-- if (strcmp (element_name, "relation") == 0)
4316-- {
4317-- gchar *target = NULL;
4318-- gchar *type = NULL;
4319-- AtkRelationData *relation;
4320-- AtkRelationType relation_type;
4321--
4322-- if (!_gtk_builder_check_parent (data->builder, context, "accessibility", error))
4323-- return;
4324--
4325-- if (!g_markup_collect_attributes (element_name, names, values, error,
4326-- G_MARKUP_COLLECT_STRING, "target", &target,
4327-- G_MARKUP_COLLECT_STRING, "type", &type,
4328-- G_MARKUP_COLLECT_INVALID))
4329-- {
4330-- _gtk_builder_prefix_error (data->builder, context, error);
4331-- return;
4332-- }
4333--
4334-- relation_type = atk_relation_type_for_name (type);
4335-- if (relation_type == ATK_RELATION_NULL)
4336-- {
4337-- g_set_error (error,
4338-- GTK_BUILDER_ERROR,
4339-- GTK_BUILDER_ERROR_INVALID_VALUE,
4340-- "No such relation type: '%s'", type);
4341-- _gtk_builder_prefix_error (data->builder, context, error);
4342-- return;
4343-- }
4344--
4345-- relation = g_slice_new (AtkRelationData);
4346-- relation->target = g_strdup (target);
4347-- relation->type = relation_type;
4348--
4349-- data->relations = g_slist_prepend (data->relations, relation);
4350-- }
4351-- else if (strcmp (element_name, "action") == 0)
4352-- {
4353-- const gchar *action_name;
4354-- const gchar *description = NULL;
4355-- const gchar *msg_context = NULL;
4356-- gboolean translatable = FALSE;
4357-- AtkActionData *action;
4358--
4359-- if (!_gtk_builder_check_parent (data->builder, context, "accessibility", error))
4360-- return;
4361--
4362-- if (!g_markup_collect_attributes (element_name, names, values, error,
4363-- G_MARKUP_COLLECT_STRING, "action_name", &action_name,
4364-- G_MARKUP_COLLECT_STRING|G_MARKUP_COLLECT_OPTIONAL, "description", &description,
4365-- G_MARKUP_COLLECT_STRING|G_MARKUP_COLLECT_OPTIONAL, "comments", NULL,
4366-- G_MARKUP_COLLECT_STRING|G_MARKUP_COLLECT_OPTIONAL, "context", &msg_context,
4367-- G_MARKUP_COLLECT_BOOLEAN|G_MARKUP_COLLECT_OPTIONAL, "translatable", &translatable,
4368-- G_MARKUP_COLLECT_INVALID))
4369-- {
4370-- _gtk_builder_prefix_error (data->builder, context, error);
4371-- return;
4372-- }
4373--
4374-- action = g_slice_new (AtkActionData);
4375-- action->action_name = g_strdup (action_name);
4376-- action->description = g_string_new (description);
4377-- action->context = g_strdup (msg_context);
4378-- action->translatable = translatable;
4379--
4380-- data->actions = g_slist_prepend (data->actions, action);
4381-- }
4382-- else if (strcmp (element_name, "accessibility") == 0)
4383-- {
4384-- if (!_gtk_builder_check_parent (data->builder, context, "object", error))
4385-- return;
4386--
4387-- if (!g_markup_collect_attributes (element_name, names, values, error,
4388-- G_MARKUP_COLLECT_INVALID, NULL, NULL,
4389-- G_MARKUP_COLLECT_INVALID))
4390-- _gtk_builder_prefix_error (data->builder, context, error);
4391-- }
4392-- else
4393-- {
4394-- _gtk_builder_error_unhandled_tag (data->builder, context,
4395-- "GtkWidget", element_name,
4396-- error);
4397-- }
4398--}
4399--
4400--static void
4401--accessibility_text (GMarkupParseContext *context,
4402-- const gchar *text,
4403-- gsize text_len,
4404-- gpointer user_data,
4405-- GError **error)
4406--{
4407-- AccessibilitySubParserData *data = (AccessibilitySubParserData*)user_data;
4408--
4409-- if (strcmp (g_markup_parse_context_get_element (context), "action") == 0)
4410-- {
4411-- AtkActionData *action = data->actions->data;
4412--
4413-- g_string_append_len (action->description, text, text_len);
4414-- }
4415--}
4416--
4417--static const GMarkupParser accessibility_parser =
4418-- {
4419-- accessibility_start_element,
4420-- NULL,
4421-- accessibility_text,
4422-- };
4423--
4424- typedef struct
4425- {
4426- GObject *object;
4427-@@ -14492,19 +14092,6 @@ gtk_widget_buildable_custom_tag_start (GtkBuildable *buildable,
4428- return TRUE;
4429- }
4430-
4431-- if (strcmp (tagname, "accessibility") == 0)
4432-- {
4433-- AccessibilitySubParserData *data;
4434--
4435-- data = g_slice_new0 (AccessibilitySubParserData);
4436-- data->builder = builder;
4437--
4438-- *parser = accessibility_parser;
4439-- *parser_data = data;
4440--
4441-- return TRUE;
4442-- }
4443--
4444- if (strcmp (tagname, "style") == 0)
4445- {
4446- StyleParserData *data;
4447-@@ -14578,62 +14165,6 @@ gtk_widget_buildable_custom_finished (GtkBuildable *buildable,
4448-
4449- _gtk_widget_buildable_finish_accelerator (GTK_WIDGET (buildable), toplevel, user_data);
4450- }
4451-- else if (strcmp (tagname, "accessibility") == 0)
4452-- {
4453-- AccessibilitySubParserData *a11y_data;
4454--
4455-- a11y_data = (AccessibilitySubParserData*)user_data;
4456--
4457-- if (a11y_data->actions)
4458-- {
4459-- AtkObject *accessible;
4460-- AtkAction *action;
4461-- gint i, n_actions;
4462-- GSList *l;
4463--
4464-- accessible = gtk_widget_get_accessible (GTK_WIDGET (buildable));
4465--
4466-- if (ATK_IS_ACTION (accessible))
4467-- {
4468-- action = ATK_ACTION (accessible);
4469-- n_actions = atk_action_get_n_actions (action);
4470--
4471-- for (l = a11y_data->actions; l; l = l->next)
4472-- {
4473-- AtkActionData *action_data = (AtkActionData*)l->data;
4474--
4475-- for (i = 0; i < n_actions; i++)
4476-- if (strcmp (atk_action_get_name (action, i),
4477-- action_data->action_name) == 0)
4478-- break;
4479--
4480-- if (i < n_actions)
4481-- {
4482-- const gchar *description;
4483--
4484-- if (action_data->translatable && action_data->description->len)
4485-- description = _gtk_builder_parser_translate (gtk_builder_get_translation_domain (builder),
4486-- action_data->context,
4487-- action_data->description->str);
4488-- else
4489-- description = action_data->description->str;
4490--
4491-- atk_action_set_description (action, i, description);
4492-- }
4493-- }
4494-- }
4495-- else
4496-- g_warning ("accessibility action on a widget that does not implement AtkAction");
4497--
4498-- g_slist_free_full (a11y_data->actions, (GDestroyNotify) free_action);
4499-- }
4500--
4501-- if (a11y_data->relations)
4502-- g_object_set_qdata (G_OBJECT (buildable), quark_builder_atk_relations,
4503-- a11y_data->relations);
4504--
4505-- g_slice_free (AccessibilitySubParserData, a11y_data);
4506-- }
4507- else if (strcmp (tagname, "style") == 0)
4508- {
4509- StyleParserData *style_data = (StyleParserData *)user_data;
4510-diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
4511-index 3dada84..27dbd68 100644
4512---- a/gtk/gtkwidget.h
4513-+++ b/gtk/gtkwidget.h
4514-@@ -33,7 +33,6 @@
4515- #include <gtk/gtkaccelgroup.h>
4516- #include <gtk/gtkborder.h>
4517- #include <gtk/gtktypes.h>
4518--#include <atk/atk.h>
4519-
4520- G_BEGIN_DECLS
4521-
4522-@@ -305,8 +304,6 @@ struct _GtkWidget
4523- * @popup_menu: Signal emitted whenever a widget should pop up a
4524- * context menu.
4525- * @show_help:
4526-- * @get_accessible: Returns the accessible object that describes the
4527-- * widget to an assistive technology.
4528- * @screen_changed: Signal emitted when the screen of a widget has
4529- * changed.
4530- * @can_activate_accel: Signal allows applications and derived widgets
4531-@@ -549,8 +546,6 @@ struct _GtkWidgetClass
4532-
4533- /* accessibility support
4534- */
4535-- AtkObject * (* get_accessible) (GtkWidget *widget);
4536--
4537- void (* screen_changed) (GtkWidget *widget,
4538- GdkScreen *previous_screen);
4539- gboolean (* can_activate_accel) (GtkWidget *widget,
4540-@@ -1056,16 +1051,6 @@ GDK_AVAILABLE_IN_ALL
4541- void gtk_widget_set_support_multidevice (GtkWidget *widget,
4542- gboolean support_multidevice);
4543-
4544--/* Accessibility support */
4545--GDK_AVAILABLE_IN_3_2
4546--void gtk_widget_class_set_accessible_type (GtkWidgetClass *widget_class,
4547-- GType type);
4548--GDK_AVAILABLE_IN_3_2
4549--void gtk_widget_class_set_accessible_role (GtkWidgetClass *widget_class,
4550-- AtkRole role);
4551--GDK_AVAILABLE_IN_ALL
4552--AtkObject* gtk_widget_get_accessible (GtkWidget *widget);
4553--
4554-
4555- /* Margin and alignment */
4556- GDK_AVAILABLE_IN_ALL
4557-diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
4558-index 1b7ddf2..22dc342 100644
4559---- a/gtk/gtkwidgetprivate.h
4560-+++ b/gtk/gtkwidgetprivate.h
4561-@@ -158,8 +158,6 @@ struct _GtkWidgetPrivate
4562- GtkWidget *parent;
4563-
4564- GList *event_controllers;
4565--
4566-- AtkObject *accessible;
4567- };
4568-
4569- GtkCssNode * gtk_widget_get_css_node (GtkWidget *widget);
4570-@@ -213,8 +211,6 @@ gboolean _gtk_widget_has_baseline_support (GtkWidget *widget);
4571- const gchar* _gtk_widget_get_accel_path (GtkWidget *widget,
4572- gboolean *locked);
4573-
4574--AtkObject * _gtk_widget_peek_accessible (GtkWidget *widget);
4575--
4576- void _gtk_widget_set_has_default (GtkWidget *widget,
4577- gboolean has_default);
4578- void _gtk_widget_set_has_grab (GtkWidget *widget,
4579---
4580-2.44.0
4581-
+0,
-1
1@@ -1,3 +1,2 @@
2 https://download.gnome.org/sources/gtk+/3.24/gtk+-3.24.41.tar.xz
3 patches/0001-remove-fribidi-dependency.patch
4-patches/0002-remove-need-for-atk.patch