From b1afe5ff237c094f701890bfde2b244722cc27c0 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 29 Mar 2020 21:50:31 -0400
Subject: [PATCH] a11y tests: Stop using can-focus

---
 testsuite/a11y/accessible-name.ui  | 2 --
 testsuite/a11y/assistant.ui        | 2 --
 testsuite/a11y/buttons.ui          | 9 ---------
 testsuite/a11y/calendar.ui         | 1 -
 testsuite/a11y/combos.ui           | 1 -
 testsuite/a11y/entries.ui          | 1 -
 testsuite/a11y/expander.ui         | 1 -
 testsuite/a11y/hello-world.ui      | 2 --
 testsuite/a11y/iconview.ui         | 1 -
 testsuite/a11y/infobar.ui          | 1 -
 testsuite/a11y/label-static.ui     | 1 -
 testsuite/a11y/label.ui            | 1 -
 testsuite/a11y/link.ui             | 2 --
 testsuite/a11y/listbox.ui          | 1 -
 testsuite/a11y/lockbutton.ui       | 1 -
 testsuite/a11y/menubutton.ui       | 2 --
 testsuite/a11y/menubutton2.ui      | 2 --
 testsuite/a11y/mnemonic.ui         | 1 -
 testsuite/a11y/placeholder-text.ui | 1 -
 testsuite/a11y/progress.ui         | 1 -
 testsuite/a11y/range.ui            | 2 --
 testsuite/a11y/scale-drawvalue.ui  | 2 --
 testsuite/a11y/spinner.ui          | 1 -
 testsuite/a11y/statusbar.ui        | 1 -
 testsuite/a11y/text.ui             | 2 --
 testsuite/a11y/tree.ui             | 2 --
 26 files changed, 44 deletions(-)

diff --git a/testsuite/a11y/accessible-name.ui b/testsuite/a11y/accessible-name.ui
index 4b36e0ce76..a71bf44cc8 100644
--- a/testsuite/a11y/accessible-name.ui
+++ b/testsuite/a11y/accessible-name.ui
@@ -2,12 +2,10 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="label" translatable="yes">Hello World!</property>
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
         <property name="receives_default">True</property>
         <child internal-child="accessible">
           <object class="AtkObject" id="button1-accessible">
diff --git a/testsuite/a11y/assistant.ui b/testsuite/a11y/assistant.ui
index dd13171d8a..b7be54e2bd 100644
--- a/testsuite/a11y/assistant.ui
+++ b/testsuite/a11y/assistant.ui
@@ -6,7 +6,6 @@
         <property name="child">
           <object class="GtkButton" id="button1">
             <property name="label" translatable="yes">Button 1</property>
-            <property name="can_focus">1</property>
           </object>
         </property>
       </object>
@@ -17,7 +16,6 @@
         <property name="child">
           <object class="GtkButton" id="button2">
             <property name="label" translatable="yes">Button 2</property>
-            <property name="can_focus">1</property>
           </object>
         </property>
       </object>
diff --git a/testsuite/a11y/buttons.ui b/testsuite/a11y/buttons.ui
index 537a20144e..9450cf6e6e 100644
--- a/testsuite/a11y/buttons.ui
+++ b/testsuite/a11y/buttons.ui
@@ -7,7 +7,6 @@
           <object class="GtkToggleButton" id="button1">
             <property name="label" translatable="yes">Hello World!</property>
             <property name="active">1</property>
-            <property name="can_focus">1</property>
             <property name="receives_default">1</property>
             <layout>
               <property name="left_attach">0</property>
@@ -18,7 +17,6 @@
         <child>
           <object class="GtkCheckButton" id="button2">
             <property name="label" translatable="yes">Hello World!</property>
-            <property name="can_focus">1</property>
             <property name="receives_default">1</property>
             <layout>
               <property name="left_attach">1</property>
@@ -29,7 +27,6 @@
         <child>
           <object class="GtkRadioButton" id="button3">
             <property name="label" translatable="yes">Hello World!</property>
-            <property name="can_focus">1</property>
             <property name="receives_default">1</property>
             <layout>
               <property name="left_attach">2</property>
@@ -42,7 +39,6 @@
             <property name="label" translatable="yes">Hello World!</property>
             <property name="active">1</property>
             <property name="group">button3</property>
-            <property name="can_focus">1</property>
             <property name="receives_default">1</property>
             <layout>
               <property name="left_attach">3</property>
@@ -53,7 +49,6 @@
         <child>
           <object class="GtkSwitch" id="button5">
             <property name="active">1</property>
-            <property name="can_focus">1</property>
             <property name="receives_default">1</property>
             <layout>
               <property name="left_attach">4</property>
@@ -63,7 +58,6 @@
         </child>
         <child>
           <object class="GtkSwitch" id="button6">
-            <property name="can_focus">1</property>
             <property name="receives_default">1</property>
             <child internal-child="accessible">
               <object class="AtkObject" id="button6-accessible">
@@ -78,7 +72,6 @@
         </child>
         <child>
           <object class="GtkButton" id="button7">
-            <property name="can_focus">1</property>
             <property name="receives_default">1</property>
             <property name="label">Text Button</property>
             <layout>
@@ -89,7 +82,6 @@
         </child>
         <child>
           <object class="GtkButton" id="button8">
-            <property name="can_focus">1</property>
             <property name="receives_default">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
@@ -101,7 +93,6 @@
         </child>
         <child>
           <object class="GtkButton" id="button9">
-            <property name="can_focus">1</property>
             <property name="receives_default">1</property>
             <property name="halign">center</property>
             <property name="valign">center</property>
diff --git a/testsuite/a11y/calendar.ui b/testsuite/a11y/calendar.ui
index ac1486f93d..9a0da55b6f 100644
--- a/testsuite/a11y/calendar.ui
+++ b/testsuite/a11y/calendar.ui
@@ -2,7 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkCalendar" id="calendar1">
         <property name="visible">True</property>
diff --git a/testsuite/a11y/combos.ui b/testsuite/a11y/combos.ui
index d05f042e97..e80bf1ce94 100644
--- a/testsuite/a11y/combos.ui
+++ b/testsuite/a11y/combos.ui
@@ -2,7 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/a11y/entries.ui b/testsuite/a11y/entries.ui
index 1f51b25348..b0fd260798 100644
--- a/testsuite/a11y/entries.ui
+++ b/testsuite/a11y/entries.ui
@@ -10,7 +10,6 @@
     <property name="page-increment">5.0</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/a11y/expander.ui b/testsuite/a11y/expander.ui
index 89d8baef9e..76145bb358 100644
--- a/testsuite/a11y/expander.ui
+++ b/testsuite/a11y/expander.ui
@@ -2,7 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkExpander" id="expander1">
         <property name="label" translatable="yes">Reveal this</property>
diff --git a/testsuite/a11y/hello-world.ui b/testsuite/a11y/hello-world.ui
index 1b8ed5154a..bed92b67b6 100644
--- a/testsuite/a11y/hello-world.ui
+++ b/testsuite/a11y/hello-world.ui
@@ -2,12 +2,10 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkButton" id="button1">
         <property name="label" translatable="yes">Hello World!</property>
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
         <property name="receives_default">True</property>
       </object>
     </child>
diff --git a/testsuite/a11y/iconview.ui b/testsuite/a11y/iconview.ui
index c262f24d83..a12d846b28 100644
--- a/testsuite/a11y/iconview.ui
+++ b/testsuite/a11y/iconview.ui
@@ -14,7 +14,6 @@
     </data>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkIconView" id="iv1">
         <property name="visible">True</property>
diff --git a/testsuite/a11y/infobar.ui b/testsuite/a11y/infobar.ui
index 52d2b82ea5..6348b08dc9 100644
--- a/testsuite/a11y/infobar.ui
+++ b/testsuite/a11y/infobar.ui
@@ -2,7 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkInfoBar" id="bar1">
         <property name="visible">True</property>
diff --git a/testsuite/a11y/label-static.ui b/testsuite/a11y/label-static.ui
index 32742dd4b7..08571bd1ee 100644
--- a/testsuite/a11y/label-static.ui
+++ b/testsuite/a11y/label-static.ui
@@ -2,7 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label">Go to the &lt;a href="http://www.gtk.org" title="&lt;i&gt;Our&lt;/i&gt; website"&gt;GTK+ website&lt;/a&gt; or &lt;small&gt;&gt;&lt;a href="http://www.google.com"&gt;google it&lt;/a&gt;&lt;/small&gt;</property>
diff --git a/testsuite/a11y/label.ui b/testsuite/a11y/label.ui
index 244bfeaacd..6ad282a2c0 100644
--- a/testsuite/a11y/label.ui
+++ b/testsuite/a11y/label.ui
@@ -2,7 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkLabel" id="label1">
         <property name="label">Go to the &lt;a href="http://www.gtk.org" title="&lt;i&gt;Our&lt;/i&gt; website"&gt;GTK+ website&lt;/a&gt; or &lt;small&gt;&gt;&lt;a href="http://www.google.com"&gt;google it&lt;/a&gt;&lt;/small&gt;</property>
diff --git a/testsuite/a11y/link.ui b/testsuite/a11y/link.ui
index 26458921e6..b91f8af622 100644
--- a/testsuite/a11y/link.ui
+++ b/testsuite/a11y/link.ui
@@ -2,12 +2,10 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkLinkButton" id="button1">
         <property name="label" translatable="yes">Hello World!</property>
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
         <property name="uri">http://www.gtk.org</property>
         <property name="visited">True</property>
       </object>
diff --git a/testsuite/a11y/listbox.ui b/testsuite/a11y/listbox.ui
index 6e5a588a68..f87c506018 100644
--- a/testsuite/a11y/listbox.ui
+++ b/testsuite/a11y/listbox.ui
@@ -2,7 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
diff --git a/testsuite/a11y/lockbutton.ui b/testsuite/a11y/lockbutton.ui
index 745abd853c..6845ca0fea 100644
--- a/testsuite/a11y/lockbutton.ui
+++ b/testsuite/a11y/lockbutton.ui
@@ -2,7 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkLockButton" id="button1">
         <property name="visible">True</property>
diff --git a/testsuite/a11y/menubutton.ui b/testsuite/a11y/menubutton.ui
index c48c253b29..a0423d57f7 100644
--- a/testsuite/a11y/menubutton.ui
+++ b/testsuite/a11y/menubutton.ui
@@ -10,10 +10,8 @@
     </child>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkMenuButton" id="menubutton">
-        <property name="can_focus">True</property>
         <property name="popover">menu</property>
       </object>
     </child>
diff --git a/testsuite/a11y/menubutton2.ui b/testsuite/a11y/menubutton2.ui
index 97c31b11ae..df1f590cc3 100644
--- a/testsuite/a11y/menubutton2.ui
+++ b/testsuite/a11y/menubutton2.ui
@@ -9,10 +9,8 @@
     </section>
   </menu>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkMenuButton" id="menubutton">
-        <property name="can_focus">True</property>
         <property name="menu-model">menu</property>
       </object>
     </child>
diff --git a/testsuite/a11y/mnemonic.ui b/testsuite/a11y/mnemonic.ui
index dedf38fcd1..2e68cf8122 100644
--- a/testsuite/a11y/mnemonic.ui
+++ b/testsuite/a11y/mnemonic.ui
@@ -2,7 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkBox" id="box1">
         <child>
diff --git a/testsuite/a11y/placeholder-text.ui b/testsuite/a11y/placeholder-text.ui
index aa5b7a1a48..fef5966f85 100644
--- a/testsuite/a11y/placeholder-text.ui
+++ b/testsuite/a11y/placeholder-text.ui
@@ -2,7 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkBox" id="box1">
         <property name="orientation">vertical</property>
diff --git a/testsuite/a11y/progress.ui b/testsuite/a11y/progress.ui
index 7a9affe325..b87c182995 100644
--- a/testsuite/a11y/progress.ui
+++ b/testsuite/a11y/progress.ui
@@ -2,7 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkProgressBar" id="progress1">
         <property name="visible">True</property>
diff --git a/testsuite/a11y/range.ui b/testsuite/a11y/range.ui
index 256019aa6a..2cb26c30e0 100644
--- a/testsuite/a11y/range.ui
+++ b/testsuite/a11y/range.ui
@@ -12,7 +12,6 @@
       <object class="GtkGrid" id="grid1">
         <child>
           <object class="GtkScale" id="scale1">
-            <property name="can_focus">1</property>
             <property name="adjustment">adjustment1</property>
             <layout>
               <property name="left_attach">0</property>
@@ -22,7 +21,6 @@
         </child>
         <child>
           <object class="GtkScrollbar" id="scrollbar1">
-            <property name="can_focus">1</property>
             <property name="adjustment">adjustment1</property>
             <layout>
               <property name="left_attach">1</property>
diff --git a/testsuite/a11y/scale-drawvalue.ui b/testsuite/a11y/scale-drawvalue.ui
index ad6abbeac0..82823e548a 100644
--- a/testsuite/a11y/scale-drawvalue.ui
+++ b/testsuite/a11y/scale-drawvalue.ui
@@ -9,12 +9,10 @@
     <property name="page_increment">10</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkScale" id="scale1">
         <property name="width-request">100</property>
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
         <property name="adjustment">adjustment1</property>
         <property name="round_digits">1</property>
       </object>
diff --git a/testsuite/a11y/spinner.ui b/testsuite/a11y/spinner.ui
index e268aafefd..6f8be8cf3c 100644
--- a/testsuite/a11y/spinner.ui
+++ b/testsuite/a11y/spinner.ui
@@ -2,7 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkSpinner" id="spinner1">
         <property name="visible">True</property>
diff --git a/testsuite/a11y/statusbar.ui b/testsuite/a11y/statusbar.ui
index deeb21c0b8..b704061811 100644
--- a/testsuite/a11y/statusbar.ui
+++ b/testsuite/a11y/statusbar.ui
@@ -2,7 +2,6 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkStatusbar" id="statusbar1">
         <property name="visible">True</property>
diff --git a/testsuite/a11y/text.ui b/testsuite/a11y/text.ui
index 7026eb7484..d8fde1ed6a 100644
--- a/testsuite/a11y/text.ui
+++ b/testsuite/a11y/text.ui
@@ -6,11 +6,9 @@
 Did gyre and gimple in the wabe</property>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkTextView" id="text1">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
         <property name="buffer">buffer1</property>
       </object>
     </child>
diff --git a/testsuite/a11y/tree.ui b/testsuite/a11y/tree.ui
index bdef6fd2e5..eadd2c3e98 100644
--- a/testsuite/a11y/tree.ui
+++ b/testsuite/a11y/tree.ui
@@ -13,11 +13,9 @@
     </data>
   </object>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkTreeView" id="tv">
         <property name="visible">True</property>
-        <property name="can_focus">True</property>
         <property name="model">store</property>
         <child>
           <object class="GtkTreeViewColumn" id="col">