Make a11y testsuite pass

36 files changed, 48 insertions, 82 deletions

diff --git a/testsuite/a11y/about.txt b/testsuite/a11y/about.txt
index f1b4823ddb..b47f6bd1ce 100644
--- a/testsuite/a11y/about.txt
+++ b/testsuite/a11y/about.txt
@@ -6,7 +6,7 @@ window1
   toolkit: gtk
   window-type: dialog
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   ___object_1___
     "filler"
diff --git a/testsuite/a11y/accessible-name.txt b/testsuite/a11y/accessible-name.txt
index 30b17ba67a..781179e238 100644
--- a/testsuite/a11y/accessible-name.txt
+++ b/testsuite/a11y/accessible-name.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/actionbar.txt b/testsuite/a11y/actionbar.txt
index 3a7311a652..cd4b13d3c8 100644
--- a/testsuite/a11y/actionbar.txt
+++ b/testsuite/a11y/actionbar.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/assistant.txt b/testsuite/a11y/assistant.txt
index b0254b31bf..df7f2a16a3 100644
--- a/testsuite/a11y/assistant.txt
+++ b/testsuite/a11y/assistant.txt
@@ -1,12 +1,12 @@
 window1
-  "frame"
+  "panel"
   index: 0
   name: Page 1
   state: enabled resizable sensitive showing visible
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   button1
     "push button"
diff --git a/testsuite/a11y/buttons.txt b/testsuite/a11y/buttons.txt
index e9f76922de..af00942731 100644
--- a/testsuite/a11y/buttons.txt
+++ b/testsuite/a11y/buttons.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/calendar.txt b/testsuite/a11y/calendar.txt
index f791d86702..5adc6f1b1e 100644
--- a/testsuite/a11y/calendar.txt
+++ b/testsuite/a11y/calendar.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/colorchooser.txt b/testsuite/a11y/colorchooser.txt
index b0b1503e2f..3d8ac7a68c 100644
--- a/testsuite/a11y/colorchooser.txt
+++ b/testsuite/a11y/colorchooser.txt
@@ -6,7 +6,7 @@ window1
   toolkit: gtk
   window-type: dialog
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   ___object_1___
     "filler"
@@ -741,40 +741,6 @@ window1
               action 1 description: Activates the color
               action 2 name: customize
               action 2 description: Customizes the color
-            unnamed-GtkColorSwatchAccessible-41
-              "radio button"
-              parent: unnamed-GtkContainerAccessible-39
-              index: 1
-              name: Custom color 1: Red 0%, Green 0%, Blue 100%
-              state: enabled focusable sensitive showing visible
-              toolkit: gtk
-              <AtkComponent>
-              layer: widget
-              alpha: 1
-              <AtkAction>
-              action 0 name: select
-              action 0 description: Selects the color
-              action 1 name: activate
-              action 1 description: Activates the color
-              action 2 name: customize
-              action 2 description: Customizes the color
-            unnamed-GtkColorSwatchAccessible-42
-              "radio button"
-              parent: unnamed-GtkContainerAccessible-39
-              index: 2
-              name: Custom color 2: Red 19%, Green 41%, Blue 63%
-              state: enabled focusable sensitive showing visible
-              toolkit: gtk
-              <AtkComponent>
-              layer: widget
-              alpha: 1
-              <AtkAction>
-              action 0 name: select
-              action 0 description: Selects the color
-              action 1 name: activate
-              action 1 description: Activates the color
-              action 2 name: customize
-              action 2 description: Customizes the color
         GtkColorEditor
           "filler"
           parent: chooser
@@ -845,8 +811,8 @@ window1
                 layer: widget
                 alpha: 1
                 <AtkText>
-                text: #FFFFFF
-                character count: 7
+                text: 
+                character count: 0
                 caret offset: -1
                 default attributes: bg-color: <omitted>
                                     bg-full-height: 0
@@ -903,7 +869,7 @@ window1
                 <AtkValue>
                 minimum value: 0.000000
                 maximum value: 1.000000
-                current value: 1.000000
+                current value: 0.000000
               sv_plane
                 "color chooser"
                 parent: grid
@@ -1039,7 +1005,7 @@ window1
                   <AtkValue>
                   minimum value: 0.000000
                   maximum value: 100.000000
-                  current value: 100.000000
+                  current value: 0.000000
             h_popup
               "filler"
               parent: overlay
@@ -1110,7 +1076,7 @@ window1
                   alpha: 1
                   <AtkValue>
                   minimum value: 0.000000
-                  maximum value: 100.000000
+                  maximum value: 360.000000
                   current value: 0.000000
             a_popup
               "filler"
@@ -1183,7 +1149,7 @@ window1
                   <AtkValue>
                   minimum value: 0.000000
                   maximum value: 100.000000
-                  current value: 100.000000
+                  current value: 0.000000
     action_box
       "filler"
       parent: ___object_1___
@@ -1213,7 +1179,7 @@ window1
     alpha: 1
     cancel_button
       "push button"
-      parent: unnamed-GtkContainerAccessible-43
+      parent: unnamed-GtkContainerAccessible-41
       index: 0
       name: Cancel
       state: enabled focusable sensitive showing visible
@@ -1230,7 +1196,7 @@ window1
       action 0 keybinding: <Alt>c
     ok_button
       "push button"
-      parent: unnamed-GtkContainerAccessible-44
+      parent: unnamed-GtkContainerAccessible-42
       index: 0
       name: Select
       state: enabled focusable sensitive showing visible default
diff --git a/testsuite/a11y/combos.txt b/testsuite/a11y/combos.txt
index a47de4a219..9ff7752a24 100644
--- a/testsuite/a11y/combos.txt
+++ b/testsuite/a11y/combos.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/entries.txt b/testsuite/a11y/entries.txt
index 329fe903d4..d4f6f08166 100644
--- a/testsuite/a11y/entries.txt
+++ b/testsuite/a11y/entries.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/expander.txt b/testsuite/a11y/expander.txt
index b5930cc3ff..48a2554c45 100644
--- a/testsuite/a11y/expander.txt
+++ b/testsuite/a11y/expander.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/headerbar.txt b/testsuite/a11y/headerbar.txt
index a4e722752b..8d27a278b9 100644
--- a/testsuite/a11y/headerbar.txt
+++ b/testsuite/a11y/headerbar.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/hello-world.txt b/testsuite/a11y/hello-world.txt
index af53ac279b..16d02bad58 100644
--- a/testsuite/a11y/hello-world.txt
+++ b/testsuite/a11y/hello-world.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/iconview.txt b/testsuite/a11y/iconview.txt
index dfae902e31..017b9a7ec4 100644
--- a/testsuite/a11y/iconview.txt
+++ b/testsuite/a11y/iconview.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/infobar.txt b/testsuite/a11y/infobar.txt
index 6c87375fce..28a0011508 100644
--- a/testsuite/a11y/infobar.txt
+++ b/testsuite/a11y/infobar.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/label-static.txt b/testsuite/a11y/label-static.txt
index 1d210163e8..c477968818 100644
--- a/testsuite/a11y/label-static.txt
+++ b/testsuite/a11y/label-static.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/label.txt b/testsuite/a11y/label.txt
index a4f91aecd7..ff984bb121 100644
--- a/testsuite/a11y/label.txt
+++ b/testsuite/a11y/label.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/link.txt b/testsuite/a11y/link.txt
index 4beae3a972..c394f5256a 100644
--- a/testsuite/a11y/link.txt
+++ b/testsuite/a11y/link.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/listbox.txt b/testsuite/a11y/listbox.txt
index 971c8fd08c..12ebada686 100644
--- a/testsuite/a11y/listbox.txt
+++ b/testsuite/a11y/listbox.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/lockbutton.txt b/testsuite/a11y/lockbutton.txt
index fea2d65eab..ecafbfa0da 100644
--- a/testsuite/a11y/lockbutton.txt
+++ b/testsuite/a11y/lockbutton.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/menubutton.txt b/testsuite/a11y/menubutton.txt
index ec6956665b..43f0287858 100644
--- a/testsuite/a11y/menubutton.txt
+++ b/testsuite/a11y/menubutton.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/menubutton2.txt b/testsuite/a11y/menubutton2.txt
index ec6956665b..43f0287858 100644
--- a/testsuite/a11y/menubutton2.txt
+++ b/testsuite/a11y/menubutton2.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/messagedialog.txt b/testsuite/a11y/messagedialog.txt
index 0216d13dc6..a387d8e81b 100644
--- a/testsuite/a11y/messagedialog.txt
+++ b/testsuite/a11y/messagedialog.txt
@@ -6,7 +6,7 @@ window1
   toolkit: gtk
   window-type: dialog
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "filler"
diff --git a/testsuite/a11y/mnemonic.txt b/testsuite/a11y/mnemonic.txt
index c1d16ce327..43dc9dbd25 100644
--- a/testsuite/a11y/mnemonic.txt
+++ b/testsuite/a11y/mnemonic.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/notebook.txt b/testsuite/a11y/notebook.txt
index f32775d2db..91d02605e4 100644
--- a/testsuite/a11y/notebook.txt
+++ b/testsuite/a11y/notebook.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/paned.txt b/testsuite/a11y/paned.txt
index 58bf570763..8e3e4bb283 100644
--- a/testsuite/a11y/paned.txt
+++ b/testsuite/a11y/paned.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
@@ -26,8 +26,8 @@ window1
     alpha: 1
     <AtkValue>
     minimum value: 0.000000
-    maximum value: 239.000000
-    current value: 24.000000
+    maximum value: 219.000000
+    current value: 26.000000
     label1
       "label"
       parent: paned1
diff --git a/testsuite/a11y/pickers.txt b/testsuite/a11y/pickers.txt
index c3861f41d5..cb2030559a 100644
--- a/testsuite/a11y/pickers.txt
+++ b/testsuite/a11y/pickers.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/placeholder-text.txt b/testsuite/a11y/placeholder-text.txt
index 327937aa94..b44c522a80 100644
--- a/testsuite/a11y/placeholder-text.txt
+++ b/testsuite/a11y/placeholder-text.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/progress.txt b/testsuite/a11y/progress.txt
index 1630596d9e..50fbd82548 100644
--- a/testsuite/a11y/progress.txt
+++ b/testsuite/a11y/progress.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/range.txt b/testsuite/a11y/range.txt
index db634b91dc..f9efd656b4 100644
--- a/testsuite/a11y/range.txt
+++ b/testsuite/a11y/range.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/scale-drawvalue.txt b/testsuite/a11y/scale-drawvalue.txt
index 21877a4601..62764f15a0 100644
--- a/testsuite/a11y/scale-drawvalue.txt
+++ b/testsuite/a11y/scale-drawvalue.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/spinner.txt b/testsuite/a11y/spinner.txt
index 8082e508f0..b055a5af11 100644
--- a/testsuite/a11y/spinner.txt
+++ b/testsuite/a11y/spinner.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
@@ -27,5 +27,5 @@ window1
     layer: widget
     alpha: 1
     <AtkImage>
-    image size: 240 x 68
+    image size: 220 x 68
     image description: (null)
diff --git a/testsuite/a11y/stack.txt b/testsuite/a11y/stack.txt
index 149059413b..dd46bed5fb 100644
--- a/testsuite/a11y/stack.txt
+++ b/testsuite/a11y/stack.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/statusbar.txt b/testsuite/a11y/statusbar.txt
index c1056520b3..463cbbd548 100644
--- a/testsuite/a11y/statusbar.txt
+++ b/testsuite/a11y/statusbar.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/text.txt b/testsuite/a11y/text.txt
index 137843c28b..3e9e51417f 100644
--- a/testsuite/a11y/text.txt
+++ b/testsuite/a11y/text.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/tooltips.txt b/testsuite/a11y/tooltips.txt
index cee7fd7cdd..0dcb81ee28 100644
--- a/testsuite/a11y/tooltips.txt
+++ b/testsuite/a11y/tooltips.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"
diff --git a/testsuite/a11y/tree.txt b/testsuite/a11y/tree.txt
index 653f90cade..3ecbbdc297 100644
--- a/testsuite/a11y/tree.txt
+++ b/testsuite/a11y/tree.txt
@@ -5,7 +5,7 @@ window1
   toolkit: gtk
   window-type: normal
   <AtkComponent>
-  layer: window
+  layer: widget
   alpha: 1
   unnamed-GtkContainerAccessible-0
     "panel"