[gtk/gtk-3-24] Update a11y test results



commit e082414f0c340398094def1f65ca6dba345e00c3
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Sep 3 22:21:05 2019 -0400

    Update a11y test results

 testsuite/a11y/about.txt           |  61 ++++++--
 testsuite/a11y/assistant.txt       | 148 ++++++++++++++++----
 testsuite/a11y/colorchooser.txt    | 276 ++++++++++++++++++++++++-------------
 testsuite/a11y/headerbar.txt       | 100 +++++++++++++-
 testsuite/a11y/menu.txt            | 123 ++++++++++++++++-
 testsuite/a11y/menubutton.txt      | 123 ++++++++++++++++-
 testsuite/a11y/menubutton2.txt     | 149 ++++++++++++++++++--
 testsuite/a11y/menubutton3.txt     | 149 ++++++++++++++++++--
 testsuite/a11y/menus.txt           | 123 ++++++++++++++++-
 testsuite/a11y/scale-drawvalue.txt | 123 ++++++++++++++++-
 testsuite/a11y/tooltips.txt        | 123 ++++++++++++++++-
 11 files changed, 1321 insertions(+), 177 deletions(-)
---
diff --git a/testsuite/a11y/about.txt b/testsuite/a11y/about.txt
index d25beabc08..052e037ca4 100644
--- a/testsuite/a11y/about.txt
+++ b/testsuite/a11y/about.txt
@@ -17,6 +17,39 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
+    unnamed-GtkContainerAccessible-0
+      "filler"
+      parent: headerbar1
+      state: enabled horizontal sensitive visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      unnamed-GtkWidgetAccessible-1
+        "separator"
+        parent: unnamed-GtkContainerAccessible-0
+        index: 0
+        state: enabled sensitive vertical
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+      unnamed-GtkButtonAccessible-2
+        "push button"
+        parent: unnamed-GtkContainerAccessible-0
+        index: 1
+        name: Close
+        state: enabled sensitive visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkImage>
+        image size: -1 x -1
+        image description: (null)
+        <AtkAction>
+        action 0 name: click
+        action 0 description: Clicks the button
     stack_switcher
       "filler"
       parent: headerbar1
@@ -26,14 +59,14 @@ window1
       <AtkComponent>
       layer: widget
       alpha: 1
-      unnamed-GtkRadioButtonAccessible-0
+      unnamed-GtkRadioButtonAccessible-3
         "radio button"
         parent: stack_switcher
         index: 0
         name: About
-        member-of: unnamed-GtkRadioButtonAccessible-1
-                   unnamed-GtkRadioButtonAccessible-2
-                   unnamed-GtkRadioButtonAccessible-0
+        member-of: unnamed-GtkRadioButtonAccessible-4
+                   unnamed-GtkRadioButtonAccessible-5
+                   unnamed-GtkRadioButtonAccessible-3
         state: checked enabled focusable sensitive visible
         toolkit: gtk
         <AtkComponent>
@@ -45,14 +78,14 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 description: Clicks the button
-      unnamed-GtkRadioButtonAccessible-2
+      unnamed-GtkRadioButtonAccessible-5
         "radio button"
         parent: stack_switcher
         index: 1
         name: Credits
-        member-of: unnamed-GtkRadioButtonAccessible-1
-                   unnamed-GtkRadioButtonAccessible-2
-                   unnamed-GtkRadioButtonAccessible-0
+        member-of: unnamed-GtkRadioButtonAccessible-4
+                   unnamed-GtkRadioButtonAccessible-5
+                   unnamed-GtkRadioButtonAccessible-3
         state: enabled focusable sensitive
         toolkit: gtk
         <AtkComponent>
@@ -64,14 +97,14 @@ window1
         <AtkAction>
         action 0 name: click
         action 0 description: Clicks the button
-      unnamed-GtkRadioButtonAccessible-1
+      unnamed-GtkRadioButtonAccessible-4
         "radio button"
         parent: stack_switcher
         index: 2
         name: License
-        member-of: unnamed-GtkRadioButtonAccessible-1
-                   unnamed-GtkRadioButtonAccessible-2
-                   unnamed-GtkRadioButtonAccessible-0
+        member-of: unnamed-GtkRadioButtonAccessible-4
+                   unnamed-GtkRadioButtonAccessible-5
+                   unnamed-GtkRadioButtonAccessible-3
         state: enabled focusable sensitive
         toolkit: gtk
         <AtkComponent>
@@ -295,7 +328,7 @@ window1
               start index: 0
               end index: 7
               anchors: http://www.gtk.org
-            unnamed-GtkLabelAccessibleLinkImpl-3
+            unnamed-GtkLabelAccessibleLinkImpl-6
               "link"
               parent: website_label
               state: enabled focusable focused multi-line sensitive showing visible
@@ -390,7 +423,7 @@ See the GNU General Public License, version 3 or later for details.
               start index: 56
               end index: 102
               anchors: https://www.gnu.org/licenses/gpl-3.0.html
-            unnamed-GtkLabelAccessibleLinkImpl-4
+            unnamed-GtkLabelAccessibleLinkImpl-7
               "link"
               parent: license_label
               state: enabled focusable focused multi-line sensitive showing visible
diff --git a/testsuite/a11y/assistant.txt b/testsuite/a11y/assistant.txt
index 9b82566d29..d65ee3bc48 100644
--- a/testsuite/a11y/assistant.txt
+++ b/testsuite/a11y/assistant.txt
@@ -58,12 +58,12 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    cancel
+    apply
       "push button"
       parent: headerbar
-      index: 0
-      name: Cancel
-      state: enabled focusable sensitive showing visible
+      index: 5
+      name: Apply
+      state: enabled focusable sensitive
       toolkit: gtk
       <AtkComponent>
       layer: widget
@@ -74,13 +74,13 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 description: Clicks the button
-      action 0 keybinding: <Alt>c
-    back
+      action 0 keybinding: <Alt>a
+    forward
       "push button"
       parent: headerbar
-      index: 1
-      name: Back
-      state: enabled focusable sensitive
+      index: 4
+      name: Next
+      state: focusable showing visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
@@ -91,13 +91,13 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 description: Clicks the button
-      action 0 keybinding: <Alt>b
-    close
+      action 0 keybinding: <Alt>n
+    last
       "push button"
       parent: headerbar
-      index: 2
-      name: Close
-      state: enabled focusable sensitive
+      index: 3
+      name: Finish
+      state: focusable
       toolkit: gtk
       <AtkComponent>
       layer: widget
@@ -108,13 +108,13 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 description: Clicks the button
-      action 0 keybinding: <Alt>c
-    last
+      action 0 keybinding: <Alt>f
+    close
       "push button"
       parent: headerbar
-      index: 3
-      name: Finish
-      state: focusable
+      index: 2
+      name: Close
+      state: enabled focusable sensitive
       toolkit: gtk
       <AtkComponent>
       layer: widget
@@ -125,13 +125,101 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 description: Clicks the button
-      action 0 keybinding: <Alt>f
-    forward
+      action 0 keybinding: <Alt>c
+    unnamed-GtkContainerAccessible-2
+      "filler"
+      parent: headerbar
+      state: enabled sensitive showing vertical visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      Page 1
+        "label"
+        parent: unnamed-GtkContainerAccessible-2
+        index: 0
+        name: Page 1
+        state: enabled multi-line sensitive showing visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: Page 1
+        character count: 6
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
+      
+        "label"
+        parent: unnamed-GtkContainerAccessible-2
+        index: 1
+        name: 
+        state: enabled multi-line sensitive
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: 
+        character count: 0
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
+    back
       "push button"
       parent: headerbar
-      index: 4
-      name: Next
-      state: focusable showing visible
+      index: 1
+      name: Back
+      state: enabled focusable sensitive
       toolkit: gtk
       <AtkComponent>
       layer: widget
@@ -142,13 +230,13 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 description: Clicks the button
-      action 0 keybinding: <Alt>n
-    apply
+      action 0 keybinding: <Alt>b
+    cancel
       "push button"
       parent: headerbar
-      index: 5
-      name: Apply
-      state: enabled focusable sensitive
+      index: 0
+      name: Cancel
+      state: enabled focusable sensitive showing visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
@@ -159,4 +247,4 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 description: Clicks the button
-      action 0 keybinding: <Alt>a
+      action 0 keybinding: <Alt>c
diff --git a/testsuite/a11y/colorchooser.txt b/testsuite/a11y/colorchooser.txt
index aab761c9df..f86d6b370b 100644
--- a/testsuite/a11y/colorchooser.txt
+++ b/testsuite/a11y/colorchooser.txt
@@ -17,12 +17,12 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    cancel_button
+    ok_button
       "push button"
       parent: headerbar
-      index: 0
-      name: Cancel
-      state: enabled focusable sensitive showing visible
+      index: 1
+      name: Select
+      state: enabled focusable sensitive showing visible default
       toolkit: gtk
       <AtkComponent>
       layer: widget
@@ -33,13 +33,101 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 description: Clicks the button
-      action 0 keybinding: <Alt>c
-    ok_button
+      action 0 keybinding: <Alt>s
+    unnamed-GtkContainerAccessible-0
+      "filler"
+      parent: headerbar
+      state: enabled sensitive showing vertical visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      Select a Color
+        "label"
+        parent: unnamed-GtkContainerAccessible-0
+        index: 0
+        name: Select a Color
+        state: enabled multi-line sensitive showing visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: Select a Color
+        character count: 14
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
+      
+        "label"
+        parent: unnamed-GtkContainerAccessible-0
+        index: 1
+        name: 
+        state: enabled multi-line sensitive
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: 
+        character count: 0
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
+    cancel_button
       "push button"
       parent: headerbar
-      index: 1
-      name: Select
-      state: enabled focusable sensitive showing visible default
+      index: 0
+      name: Cancel
+      state: enabled focusable sensitive showing visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
@@ -50,7 +138,7 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 description: Clicks the button
-      action 0 keybinding: <Alt>s
+      action 0 keybinding: <Alt>c
   dialog-vbox1
     "filler"
     parent: window1
@@ -69,7 +157,7 @@ window1
       <AtkComponent>
       layer: widget
       alpha: 1
-      unnamed-GtkContainerAccessible-0
+      unnamed-GtkContainerAccessible-1
         "filler"
         parent: chooser
         index: 0
@@ -78,18 +166,18 @@ window1
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkContainerAccessible-1
+        unnamed-GtkContainerAccessible-2
           "panel"
-          parent: unnamed-GtkContainerAccessible-0
+          parent: unnamed-GtkContainerAccessible-1
           index: 0
           state: enabled horizontal sensitive showing visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          unnamed-GtkColorSwatchAccessible-2
+          unnamed-GtkColorSwatchAccessible-3
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 0
             name: Dark Aluminum 2
             state: enabled focusable sensitive showing visible
@@ -104,9 +192,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-3
+          unnamed-GtkColorSwatchAccessible-4
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 1
             name: Aluminum 2
             state: enabled focusable sensitive showing visible
@@ -121,9 +209,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-4
+          unnamed-GtkColorSwatchAccessible-5
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 2
             name: Light Aluminum 2
             state: enabled focusable sensitive showing visible
@@ -138,9 +226,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-5
+          unnamed-GtkColorSwatchAccessible-6
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 3
             name: Dark Aluminum 1
             state: enabled focusable sensitive showing visible
@@ -155,9 +243,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-6
+          unnamed-GtkColorSwatchAccessible-7
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 4
             name: Aluminum 1
             state: enabled focusable sensitive showing visible
@@ -172,9 +260,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-7
+          unnamed-GtkColorSwatchAccessible-8
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 5
             name: Light Aluminum 1
             state: enabled focusable sensitive showing visible
@@ -189,9 +277,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-8
+          unnamed-GtkColorSwatchAccessible-9
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 6
             name: Dark Chocolate
             state: enabled focusable sensitive showing visible
@@ -206,9 +294,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-9
+          unnamed-GtkColorSwatchAccessible-10
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 7
             name: Chocolate
             state: enabled focusable sensitive showing visible
@@ -223,9 +311,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-10
+          unnamed-GtkColorSwatchAccessible-11
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 8
             name: Light Chocolate
             state: enabled focusable sensitive showing visible
@@ -240,9 +328,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-11
+          unnamed-GtkColorSwatchAccessible-12
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 9
             name: Dark Plum
             state: enabled focusable sensitive showing visible
@@ -257,9 +345,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-12
+          unnamed-GtkColorSwatchAccessible-13
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 10
             name: Plum
             state: enabled focusable sensitive showing visible
@@ -274,9 +362,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-13
+          unnamed-GtkColorSwatchAccessible-14
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 11
             name: Light Plum
             state: enabled focusable sensitive showing visible
@@ -291,9 +379,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-14
+          unnamed-GtkColorSwatchAccessible-15
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 12
             name: Dark Sky Blue
             state: enabled focusable sensitive showing visible
@@ -308,9 +396,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-15
+          unnamed-GtkColorSwatchAccessible-16
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 13
             name: Sky Blue
             state: enabled focusable sensitive showing visible
@@ -325,9 +413,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-16
+          unnamed-GtkColorSwatchAccessible-17
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 14
             name: Light Sky Blue
             state: enabled focusable sensitive showing visible
@@ -342,9 +430,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-17
+          unnamed-GtkColorSwatchAccessible-18
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 15
             name: Dark Chameleon
             state: enabled focusable sensitive showing visible
@@ -359,9 +447,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-18
+          unnamed-GtkColorSwatchAccessible-19
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 16
             name: Chameleon
             state: enabled focusable sensitive showing visible
@@ -376,9 +464,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-19
+          unnamed-GtkColorSwatchAccessible-20
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 17
             name: Light Chameleon
             state: enabled focusable sensitive showing visible
@@ -393,9 +481,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-20
+          unnamed-GtkColorSwatchAccessible-21
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 18
             name: Dark Butter
             state: enabled focusable sensitive showing visible
@@ -410,9 +498,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-21
+          unnamed-GtkColorSwatchAccessible-22
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 19
             name: Butter
             state: enabled focusable sensitive showing visible
@@ -427,9 +515,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-22
+          unnamed-GtkColorSwatchAccessible-23
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 20
             name: Light Butter
             state: enabled focusable sensitive showing visible
@@ -444,9 +532,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-23
+          unnamed-GtkColorSwatchAccessible-24
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 21
             name: Dark Orange
             state: enabled focusable sensitive showing visible
@@ -461,9 +549,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-24
+          unnamed-GtkColorSwatchAccessible-25
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 22
             name: Orange
             state: enabled focusable sensitive showing visible
@@ -478,9 +566,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-25
+          unnamed-GtkColorSwatchAccessible-26
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 23
             name: Light Orange
             state: enabled focusable sensitive showing visible
@@ -495,9 +583,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-26
+          unnamed-GtkColorSwatchAccessible-27
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 24
             name: Dark Scarlet Red
             state: enabled focusable sensitive showing visible
@@ -512,9 +600,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-27
+          unnamed-GtkColorSwatchAccessible-28
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 25
             name: Scarlet Red
             state: enabled focusable sensitive showing visible
@@ -529,9 +617,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-28
+          unnamed-GtkColorSwatchAccessible-29
             "radio button"
-            parent: unnamed-GtkContainerAccessible-1
+            parent: unnamed-GtkContainerAccessible-2
             index: 26
             name: Light Scarlet Red
             state: enabled focusable sensitive showing visible
@@ -546,18 +634,18 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-        unnamed-GtkContainerAccessible-29
+        unnamed-GtkContainerAccessible-30
           "panel"
-          parent: unnamed-GtkContainerAccessible-0
+          parent: unnamed-GtkContainerAccessible-1
           index: 1
           state: enabled horizontal sensitive showing visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          unnamed-GtkColorSwatchAccessible-30
+          unnamed-GtkColorSwatchAccessible-31
             "radio button"
-            parent: unnamed-GtkContainerAccessible-29
+            parent: unnamed-GtkContainerAccessible-30
             index: 0
             name: White
             state: checked enabled focusable sensitive showing visible
@@ -572,9 +660,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-31
+          unnamed-GtkColorSwatchAccessible-32
             "radio button"
-            parent: unnamed-GtkContainerAccessible-29
+            parent: unnamed-GtkContainerAccessible-30
             index: 1
             name: Very Light Gray
             state: enabled focusable sensitive showing visible
@@ -589,9 +677,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-32
+          unnamed-GtkColorSwatchAccessible-33
             "radio button"
-            parent: unnamed-GtkContainerAccessible-29
+            parent: unnamed-GtkContainerAccessible-30
             index: 2
             name: Lighter Gray
             state: enabled focusable sensitive showing visible
@@ -606,9 +694,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-33
+          unnamed-GtkColorSwatchAccessible-34
             "radio button"
-            parent: unnamed-GtkContainerAccessible-29
+            parent: unnamed-GtkContainerAccessible-30
             index: 3
             name: Light Gray
             state: enabled focusable sensitive showing visible
@@ -623,9 +711,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-34
+          unnamed-GtkColorSwatchAccessible-35
             "radio button"
-            parent: unnamed-GtkContainerAccessible-29
+            parent: unnamed-GtkContainerAccessible-30
             index: 4
             name: Medium Gray
             state: enabled focusable sensitive showing visible
@@ -640,9 +728,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-35
+          unnamed-GtkColorSwatchAccessible-36
             "radio button"
-            parent: unnamed-GtkContainerAccessible-29
+            parent: unnamed-GtkContainerAccessible-30
             index: 5
             name: Dark Gray
             state: enabled focusable sensitive showing visible
@@ -657,9 +745,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-36
+          unnamed-GtkColorSwatchAccessible-37
             "radio button"
-            parent: unnamed-GtkContainerAccessible-29
+            parent: unnamed-GtkContainerAccessible-30
             index: 6
             name: Darker Gray
             state: enabled focusable sensitive showing visible
@@ -674,9 +762,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-37
+          unnamed-GtkColorSwatchAccessible-38
             "radio button"
-            parent: unnamed-GtkContainerAccessible-29
+            parent: unnamed-GtkContainerAccessible-30
             index: 7
             name: Very Dark Gray
             state: enabled focusable sensitive showing visible
@@ -691,9 +779,9 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-          unnamed-GtkColorSwatchAccessible-38
+          unnamed-GtkColorSwatchAccessible-39
             "radio button"
-            parent: unnamed-GtkContainerAccessible-29
+            parent: unnamed-GtkContainerAccessible-30
             index: 8
             name: Black
             state: enabled focusable sensitive showing visible
@@ -710,7 +798,7 @@ window1
             action 2 description: Customizes the color
         Custom
           "label"
-          parent: unnamed-GtkContainerAccessible-0
+          parent: unnamed-GtkContainerAccessible-1
           index: 2
           name: Custom
           state: enabled multi-line sensitive showing visible
@@ -748,18 +836,18 @@ window1
                               weight: <omitted>
                               wrap-mode: word
           <AtkHypertext>
-        unnamed-GtkContainerAccessible-39
+        unnamed-GtkContainerAccessible-40
           "filler"
-          parent: unnamed-GtkContainerAccessible-0
+          parent: unnamed-GtkContainerAccessible-1
           index: 3
           state: enabled horizontal sensitive showing visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          unnamed-GtkColorSwatchAccessible-40
+          unnamed-GtkColorSwatchAccessible-41
             "push button"
-            parent: unnamed-GtkContainerAccessible-39
+            parent: unnamed-GtkContainerAccessible-40
             index: 0
             name: Custom color
             description: Create a custom color
@@ -775,7 +863,7 @@ window1
             action 1 description: Activates the color
             action 2 name: customize
             action 2 description: Customizes the color
-      unnamed-GtkContainerAccessible-41
+      unnamed-GtkContainerAccessible-42
         "filler"
         parent: chooser
         index: 1
@@ -786,7 +874,7 @@ window1
         alpha: 1
         GtkColorEditor
           "filler"
-          parent: unnamed-GtkContainerAccessible-41
+          parent: unnamed-GtkContainerAccessible-42
           index: 0
           state: enabled horizontal sensitive
           toolkit: gtk
diff --git a/testsuite/a11y/headerbar.txt b/testsuite/a11y/headerbar.txt
index 1905c05131..8ed6420872 100644
--- a/testsuite/a11y/headerbar.txt
+++ b/testsuite/a11y/headerbar.txt
@@ -16,11 +16,11 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    button1
+    page2
       "push button"
       parent: headerbar1
-      index: 0
-      name: Yes
+      index: 1
+      name: No
       state: enabled focusable sensitive showing visible
       toolkit: gtk
       <AtkComponent>
@@ -32,11 +32,99 @@ window1
       <AtkAction>
       action 0 name: click
       action 0 description: Clicks the button
-    page2
+    unnamed-GtkContainerAccessible-0
+      "filler"
+      parent: headerbar1
+      state: enabled sensitive showing vertical visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      Title
+        "label"
+        parent: unnamed-GtkContainerAccessible-0
+        index: 0
+        name: Title
+        state: enabled multi-line sensitive showing visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: Title
+        character count: 5
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
+      Subtitle
+        "label"
+        parent: unnamed-GtkContainerAccessible-0
+        index: 1
+        name: Subtitle
+        state: enabled multi-line sensitive showing visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: Subtitle
+        character count: 8
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
+    button1
       "push button"
       parent: headerbar1
-      index: 1
-      name: No
+      index: 0
+      name: Yes
       state: enabled focusable sensitive showing visible
       toolkit: gtk
       <AtkComponent>
diff --git a/testsuite/a11y/menu.txt b/testsuite/a11y/menu.txt
index 1bcc611a33..df486270da 100644
--- a/testsuite/a11y/menu.txt
+++ b/testsuite/a11y/menu.txt
@@ -7,7 +7,7 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
+  unnamed-GtkHeaderBarAccessible-0
     "panel"
     parent: window1
     state: enabled sensitive showing visible
@@ -15,6 +15,127 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
+    unnamed-GtkContainerAccessible-1
+      "filler"
+      parent: unnamed-GtkHeaderBarAccessible-0
+      state: enabled horizontal sensitive visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      unnamed-GtkWidgetAccessible-2
+        "separator"
+        parent: unnamed-GtkContainerAccessible-1
+        index: 0
+        state: enabled sensitive vertical
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+      unnamed-GtkButtonAccessible-3
+        "push button"
+        parent: unnamed-GtkContainerAccessible-1
+        index: 1
+        name: Close
+        state: enabled sensitive visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkImage>
+        image size: -1 x -1
+        image description: (null)
+        <AtkAction>
+        action 0 name: click
+        action 0 description: Clicks the button
+    unnamed-GtkContainerAccessible-4
+      "filler"
+      parent: unnamed-GtkHeaderBarAccessible-0
+      state: enabled sensitive showing vertical visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      lt-accessibility-dump
+        "label"
+        parent: unnamed-GtkContainerAccessible-4
+        index: 0
+        name: lt-accessibility-dump
+        state: enabled multi-line sensitive showing visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: lt-accessibility-dump
+        character count: 21
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
+      
+        "label"
+        parent: unnamed-GtkContainerAccessible-4
+        index: 1
+        name: 
+        state: enabled multi-line sensitive
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: 
+        character count: 0
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
   menubar1
     "menu bar"
     parent: window1
diff --git a/testsuite/a11y/menubutton.txt b/testsuite/a11y/menubutton.txt
index f896294b7d..0ffff3392f 100644
--- a/testsuite/a11y/menubutton.txt
+++ b/testsuite/a11y/menubutton.txt
@@ -7,7 +7,7 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
+  unnamed-GtkHeaderBarAccessible-0
     "panel"
     parent: window1
     state: enabled sensitive showing visible
@@ -15,6 +15,127 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
+    unnamed-GtkContainerAccessible-1
+      "filler"
+      parent: unnamed-GtkHeaderBarAccessible-0
+      state: enabled horizontal sensitive visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      unnamed-GtkWidgetAccessible-2
+        "separator"
+        parent: unnamed-GtkContainerAccessible-1
+        index: 0
+        state: enabled sensitive vertical
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+      unnamed-GtkButtonAccessible-3
+        "push button"
+        parent: unnamed-GtkContainerAccessible-1
+        index: 1
+        name: Close
+        state: enabled sensitive visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkImage>
+        image size: -1 x -1
+        image description: (null)
+        <AtkAction>
+        action 0 name: click
+        action 0 description: Clicks the button
+    unnamed-GtkContainerAccessible-4
+      "filler"
+      parent: unnamed-GtkHeaderBarAccessible-0
+      state: enabled sensitive showing vertical visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      lt-accessibility-dump
+        "label"
+        parent: unnamed-GtkContainerAccessible-4
+        index: 0
+        name: lt-accessibility-dump
+        state: enabled multi-line sensitive showing visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: lt-accessibility-dump
+        character count: 21
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
+      
+        "label"
+        parent: unnamed-GtkContainerAccessible-4
+        index: 1
+        name: 
+        state: enabled multi-line sensitive
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: 
+        character count: 0
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
   menubutton
     "toggle button"
     parent: window1
diff --git a/testsuite/a11y/menubutton2.txt b/testsuite/a11y/menubutton2.txt
index 32b6b73647..e1cddb1c82 100644
--- a/testsuite/a11y/menubutton2.txt
+++ b/testsuite/a11y/menubutton2.txt
@@ -7,7 +7,7 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
+  unnamed-GtkHeaderBarAccessible-0
     "panel"
     parent: window1
     state: enabled sensitive showing visible
@@ -15,6 +15,127 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
+    unnamed-GtkContainerAccessible-1
+      "filler"
+      parent: unnamed-GtkHeaderBarAccessible-0
+      state: enabled horizontal sensitive visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      unnamed-GtkWidgetAccessible-2
+        "separator"
+        parent: unnamed-GtkContainerAccessible-1
+        index: 0
+        state: enabled sensitive vertical
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+      unnamed-GtkButtonAccessible-3
+        "push button"
+        parent: unnamed-GtkContainerAccessible-1
+        index: 1
+        name: Close
+        state: enabled sensitive visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkImage>
+        image size: -1 x -1
+        image description: (null)
+        <AtkAction>
+        action 0 name: click
+        action 0 description: Clicks the button
+    unnamed-GtkContainerAccessible-4
+      "filler"
+      parent: unnamed-GtkHeaderBarAccessible-0
+      state: enabled sensitive showing vertical visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      lt-accessibility-dump
+        "label"
+        parent: unnamed-GtkContainerAccessible-4
+        index: 0
+        name: lt-accessibility-dump
+        state: enabled multi-line sensitive showing visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: lt-accessibility-dump
+        character count: 21
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
+      
+        "label"
+        parent: unnamed-GtkContainerAccessible-4
+        index: 1
+        name: 
+        state: enabled multi-line sensitive
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: 
+        character count: 0
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
   menubutton
     "toggle button"
     parent: window1
@@ -31,7 +152,7 @@ window1
     <AtkAction>
     action 0 name: click
     action 0 description: Clicks the button
-  unnamed-GtkPopoverAccessible-1
+  unnamed-GtkPopoverAccessible-5
     "panel"
     parent: menubutton
     popup-for: menubutton
@@ -40,54 +161,54 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    unnamed-GtkStackAccessible-2
+    unnamed-GtkStackAccessible-6
       "panel"
-      parent: unnamed-GtkPopoverAccessible-1
+      parent: unnamed-GtkPopoverAccessible-5
       index: 0
       state: enabled sensitive visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
       alpha: 1
-      unnamed-GtkContainerAccessible-3
+      unnamed-GtkContainerAccessible-7
         "filler"
-        parent: unnamed-GtkStackAccessible-2
+        parent: unnamed-GtkStackAccessible-6
         index: 0
         state: enabled sensitive vertical visible
         toolkit: gtk
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkContainerAccessible-4
+        unnamed-GtkContainerAccessible-8
           "filler"
-          parent: unnamed-GtkContainerAccessible-3
+          parent: unnamed-GtkContainerAccessible-7
           index: 0
           state: enabled sensitive vertical visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          unnamed-GtkContainerAccessible-5
+          unnamed-GtkContainerAccessible-9
             "filler"
-            parent: unnamed-GtkContainerAccessible-4
+            parent: unnamed-GtkContainerAccessible-8
             index: 0
             state: enabled sensitive vertical visible
             toolkit: gtk
             <AtkComponent>
             layer: widget
             alpha: 1
-            unnamed-GtkContainerAccessible-6
+            unnamed-GtkContainerAccessible-10
               "filler"
-              parent: unnamed-GtkContainerAccessible-5
+              parent: unnamed-GtkContainerAccessible-9
               index: 0
               state: enabled sensitive vertical visible
               toolkit: gtk
               <AtkComponent>
               layer: widget
               alpha: 1
-              unnamed-GtkButtonAccessible-7
+              unnamed-GtkButtonAccessible-11
                 "push button"
-                parent: unnamed-GtkContainerAccessible-6
+                parent: unnamed-GtkContainerAccessible-10
                 index: 0
                 name: New
                 state: enabled focusable sensitive visible
diff --git a/testsuite/a11y/menubutton3.txt b/testsuite/a11y/menubutton3.txt
index 32b6b73647..e1cddb1c82 100644
--- a/testsuite/a11y/menubutton3.txt
+++ b/testsuite/a11y/menubutton3.txt
@@ -7,7 +7,7 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
+  unnamed-GtkHeaderBarAccessible-0
     "panel"
     parent: window1
     state: enabled sensitive showing visible
@@ -15,6 +15,127 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
+    unnamed-GtkContainerAccessible-1
+      "filler"
+      parent: unnamed-GtkHeaderBarAccessible-0
+      state: enabled horizontal sensitive visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      unnamed-GtkWidgetAccessible-2
+        "separator"
+        parent: unnamed-GtkContainerAccessible-1
+        index: 0
+        state: enabled sensitive vertical
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+      unnamed-GtkButtonAccessible-3
+        "push button"
+        parent: unnamed-GtkContainerAccessible-1
+        index: 1
+        name: Close
+        state: enabled sensitive visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkImage>
+        image size: -1 x -1
+        image description: (null)
+        <AtkAction>
+        action 0 name: click
+        action 0 description: Clicks the button
+    unnamed-GtkContainerAccessible-4
+      "filler"
+      parent: unnamed-GtkHeaderBarAccessible-0
+      state: enabled sensitive showing vertical visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      lt-accessibility-dump
+        "label"
+        parent: unnamed-GtkContainerAccessible-4
+        index: 0
+        name: lt-accessibility-dump
+        state: enabled multi-line sensitive showing visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: lt-accessibility-dump
+        character count: 21
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
+      
+        "label"
+        parent: unnamed-GtkContainerAccessible-4
+        index: 1
+        name: 
+        state: enabled multi-line sensitive
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: 
+        character count: 0
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
   menubutton
     "toggle button"
     parent: window1
@@ -31,7 +152,7 @@ window1
     <AtkAction>
     action 0 name: click
     action 0 description: Clicks the button
-  unnamed-GtkPopoverAccessible-1
+  unnamed-GtkPopoverAccessible-5
     "panel"
     parent: menubutton
     popup-for: menubutton
@@ -40,54 +161,54 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
-    unnamed-GtkStackAccessible-2
+    unnamed-GtkStackAccessible-6
       "panel"
-      parent: unnamed-GtkPopoverAccessible-1
+      parent: unnamed-GtkPopoverAccessible-5
       index: 0
       state: enabled sensitive visible
       toolkit: gtk
       <AtkComponent>
       layer: widget
       alpha: 1
-      unnamed-GtkContainerAccessible-3
+      unnamed-GtkContainerAccessible-7
         "filler"
-        parent: unnamed-GtkStackAccessible-2
+        parent: unnamed-GtkStackAccessible-6
         index: 0
         state: enabled sensitive vertical visible
         toolkit: gtk
         <AtkComponent>
         layer: widget
         alpha: 1
-        unnamed-GtkContainerAccessible-4
+        unnamed-GtkContainerAccessible-8
           "filler"
-          parent: unnamed-GtkContainerAccessible-3
+          parent: unnamed-GtkContainerAccessible-7
           index: 0
           state: enabled sensitive vertical visible
           toolkit: gtk
           <AtkComponent>
           layer: widget
           alpha: 1
-          unnamed-GtkContainerAccessible-5
+          unnamed-GtkContainerAccessible-9
             "filler"
-            parent: unnamed-GtkContainerAccessible-4
+            parent: unnamed-GtkContainerAccessible-8
             index: 0
             state: enabled sensitive vertical visible
             toolkit: gtk
             <AtkComponent>
             layer: widget
             alpha: 1
-            unnamed-GtkContainerAccessible-6
+            unnamed-GtkContainerAccessible-10
               "filler"
-              parent: unnamed-GtkContainerAccessible-5
+              parent: unnamed-GtkContainerAccessible-9
               index: 0
               state: enabled sensitive vertical visible
               toolkit: gtk
               <AtkComponent>
               layer: widget
               alpha: 1
-              unnamed-GtkButtonAccessible-7
+              unnamed-GtkButtonAccessible-11
                 "push button"
-                parent: unnamed-GtkContainerAccessible-6
+                parent: unnamed-GtkContainerAccessible-10
                 index: 0
                 name: New
                 state: enabled focusable sensitive visible
diff --git a/testsuite/a11y/menus.txt b/testsuite/a11y/menus.txt
index 9e06483c33..aec77e012a 100644
--- a/testsuite/a11y/menus.txt
+++ b/testsuite/a11y/menus.txt
@@ -7,7 +7,7 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
+  unnamed-GtkHeaderBarAccessible-0
     "panel"
     parent: window1
     state: enabled sensitive showing visible
@@ -15,6 +15,127 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
+    unnamed-GtkContainerAccessible-1
+      "filler"
+      parent: unnamed-GtkHeaderBarAccessible-0
+      state: enabled horizontal sensitive visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      unnamed-GtkWidgetAccessible-2
+        "separator"
+        parent: unnamed-GtkContainerAccessible-1
+        index: 0
+        state: enabled sensitive vertical
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+      unnamed-GtkButtonAccessible-3
+        "push button"
+        parent: unnamed-GtkContainerAccessible-1
+        index: 1
+        name: Close
+        state: enabled sensitive visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkImage>
+        image size: -1 x -1
+        image description: (null)
+        <AtkAction>
+        action 0 name: click
+        action 0 description: Clicks the button
+    unnamed-GtkContainerAccessible-4
+      "filler"
+      parent: unnamed-GtkHeaderBarAccessible-0
+      state: enabled sensitive showing vertical visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      lt-accessibility-dump
+        "label"
+        parent: unnamed-GtkContainerAccessible-4
+        index: 0
+        name: lt-accessibility-dump
+        state: enabled multi-line sensitive showing visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: lt-accessibility-dump
+        character count: 21
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
+      
+        "label"
+        parent: unnamed-GtkContainerAccessible-4
+        index: 1
+        name: 
+        state: enabled multi-line sensitive
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: 
+        character count: 0
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
   menubar1
     "menu bar"
     parent: window1
diff --git a/testsuite/a11y/scale-drawvalue.txt b/testsuite/a11y/scale-drawvalue.txt
index 327b819ffa..e6e00af626 100644
--- a/testsuite/a11y/scale-drawvalue.txt
+++ b/testsuite/a11y/scale-drawvalue.txt
@@ -7,7 +7,7 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
+  unnamed-GtkHeaderBarAccessible-0
     "panel"
     parent: window1
     state: enabled sensitive showing visible
@@ -15,6 +15,127 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
+    unnamed-GtkContainerAccessible-1
+      "filler"
+      parent: unnamed-GtkHeaderBarAccessible-0
+      state: enabled horizontal sensitive visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      unnamed-GtkWidgetAccessible-2
+        "separator"
+        parent: unnamed-GtkContainerAccessible-1
+        index: 0
+        state: enabled sensitive vertical
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+      unnamed-GtkButtonAccessible-3
+        "push button"
+        parent: unnamed-GtkContainerAccessible-1
+        index: 1
+        name: Close
+        state: enabled sensitive visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkImage>
+        image size: -1 x -1
+        image description: (null)
+        <AtkAction>
+        action 0 name: click
+        action 0 description: Clicks the button
+    unnamed-GtkContainerAccessible-4
+      "filler"
+      parent: unnamed-GtkHeaderBarAccessible-0
+      state: enabled sensitive showing vertical visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      lt-accessibility-dump
+        "label"
+        parent: unnamed-GtkContainerAccessible-4
+        index: 0
+        name: lt-accessibility-dump
+        state: enabled multi-line sensitive showing visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: lt-accessibility-dump
+        character count: 21
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
+      
+        "label"
+        parent: unnamed-GtkContainerAccessible-4
+        index: 1
+        name: 
+        state: enabled multi-line sensitive
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: 
+        character count: 0
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
   scale1
     "slider"
     parent: window1
diff --git a/testsuite/a11y/tooltips.txt b/testsuite/a11y/tooltips.txt
index e2a0f3ed99..ff45431313 100644
--- a/testsuite/a11y/tooltips.txt
+++ b/testsuite/a11y/tooltips.txt
@@ -7,7 +7,7 @@ window1
   <AtkComponent>
   layer: window
   alpha: 1
-  unnamed-GtkContainerAccessible-0
+  unnamed-GtkHeaderBarAccessible-0
     "panel"
     parent: window1
     state: enabled sensitive showing visible
@@ -15,6 +15,127 @@ window1
     <AtkComponent>
     layer: widget
     alpha: 1
+    unnamed-GtkContainerAccessible-1
+      "filler"
+      parent: unnamed-GtkHeaderBarAccessible-0
+      state: enabled horizontal sensitive visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      unnamed-GtkWidgetAccessible-2
+        "separator"
+        parent: unnamed-GtkContainerAccessible-1
+        index: 0
+        state: enabled sensitive vertical
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+      unnamed-GtkButtonAccessible-3
+        "push button"
+        parent: unnamed-GtkContainerAccessible-1
+        index: 1
+        name: Close
+        state: enabled sensitive visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkImage>
+        image size: -1 x -1
+        image description: (null)
+        <AtkAction>
+        action 0 name: click
+        action 0 description: Clicks the button
+    unnamed-GtkContainerAccessible-4
+      "filler"
+      parent: unnamed-GtkHeaderBarAccessible-0
+      state: enabled sensitive showing vertical visible
+      toolkit: gtk
+      <AtkComponent>
+      layer: widget
+      alpha: 1
+      lt-accessibility-dump
+        "label"
+        parent: unnamed-GtkContainerAccessible-4
+        index: 0
+        name: lt-accessibility-dump
+        state: enabled multi-line sensitive showing visible
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: lt-accessibility-dump
+        character count: 21
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
+      
+        "label"
+        parent: unnamed-GtkContainerAccessible-4
+        index: 1
+        name: 
+        state: enabled multi-line sensitive
+        toolkit: gtk
+        <AtkComponent>
+        layer: widget
+        alpha: 1
+        <AtkText>
+        text: 
+        character count: 0
+        caret offset: 0
+        default attributes: bg-color: <omitted>
+                            bg-full-height: 0
+                            direction: <omitted>
+                            editable: false
+                            family-name: <omitted>
+                            fg-color: <omitted>
+                            indent: 0
+                            invisible: false
+                            justification: left
+                            language: <omitted>
+                            left-margin: 0
+                            pixels-above-lines: 0
+                            pixels-below-lines: 0
+                            pixels-inside-wrap: 0
+                            right-margin: 0
+                            rise: 0
+                            scale: 1
+                            size: <omitted>
+                            stretch: <omitted>
+                            strikethrough: false
+                            style: <omitted>
+                            underline: none
+                            variant: <omitted>
+                            weight: <omitted>
+                            wrap-mode: word
+        <AtkHypertext>
   box1
     "filler"
     parent: window1


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]