From: Benjamin Otte <otte@redhat.com>
Date: Mon, 3 Feb 2020 04:40:46 +0000 (+0100)
Subject: testsuite: Get rid of GtkToolbar
X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~77^2~1
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=d72301b3c1edfa5f1d2f3d8dd850379e18f6400a;p=gtk4.git

testsuite: Get rid of GtkToolbar

Just use GtkBox instead
---

diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 645f86bb03..8544ab2d4d 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -639,6 +639,7 @@ test_types (void)
 {
   const gchar buffer[] = 
     "<interface>"
+    "  <object class=\"GtkBox\" id=\"box\"/>"
     "  <object class=\"GtkButton\" id=\"button\"/>"
     "  <object class=\"GtkCheckButton\" id=\"checkbutton\"/>"
     "  <object class=\"GtkDialog\" id=\"dialog\"/>"
@@ -657,7 +658,6 @@ test_types (void)
     "  <object class=\"GtkStatusbar\" id=\"statusbar\"/>"
     "  <object class=\"GtkTextView\" id=\"textview\"/>"
     "  <object class=\"GtkToggleButton\" id=\"togglebutton\"/>"
-    "  <object class=\"GtkToolbar\" id=\"toolbar\"/>"
     "  <object class=\"GtkTreeStore\" id=\"treestore\"/>"
     "  <object class=\"GtkTreeView\" id=\"treeview\"/>"
     "  <object class=\"GtkViewport\" id=\"viewport\"/>"
diff --git a/testsuite/reftests/border-image-excess-size.css b/testsuite/reftests/border-image-excess-size.css
index b41344cfce..5a2a0f8575 100644
--- a/testsuite/reftests/border-image-excess-size.css
+++ b/testsuite/reftests/border-image-excess-size.css
@@ -1,6 +1,6 @@
 @import "reset-to-defaults.css";
 
-toolbar {
+box {
   border-image: url("green-20x20.png") 5000;
   background-image: none;
   background-color: #000;
diff --git a/testsuite/reftests/border-image-excess-size.ref.ui b/testsuite/reftests/border-image-excess-size.ref.ui
index 9da0c1204d..599e809c00 100644
--- a/testsuite/reftests/border-image-excess-size.ref.ui
+++ b/testsuite/reftests/border-image-excess-size.ref.ui
@@ -7,11 +7,10 @@
         <property name="row_spacing">8</property>
         <property name="column_spacing">8</property>
         <child>
-          <object class="GtkToolbar" id="toolbar1">
+          <object class="GtkBox">
             <property name="width_request">1</property>
             <property name="height_request">1</property>
             <property name="can_focus">1</property>
-            <property name="show_arrow">0</property>
             <layout>
               <property name="left_attach">0</property>
               <property name="top_attach">0</property>
@@ -21,11 +20,10 @@
           </object>
         </child>
         <child>
-          <object class="GtkToolbar" id="toolbar2">
+          <object class="GtkBox">
             <property name="width_request">1</property>
             <property name="height_request">1</property>
             <property name="can_focus">1</property>
-            <property name="show_arrow">0</property>
             <layout>
               <property name="left_attach">1</property>
               <property name="top_attach">0</property>
@@ -35,11 +33,10 @@
           </object>
         </child>
         <child>
-          <object class="GtkToolbar" id="toolbar3">
+          <object class="GtkBox">
             <property name="width_request">1</property>
             <property name="height_request">1</property>
             <property name="can_focus">1</property>
-            <property name="show_arrow">0</property>
             <layout>
               <property name="left_attach">1</property>
               <property name="top_attach">1</property>
@@ -49,11 +46,10 @@
           </object>
         </child>
         <child>
-          <object class="GtkToolbar" id="toolbar4">
+          <object class="GtkBox">
             <property name="width_request">1</property>
             <property name="height_request">1</property>
             <property name="can_focus">1</property>
-            <property name="show_arrow">0</property>
             <layout>
               <property name="left_attach">0</property>
               <property name="top_attach">1</property>
diff --git a/testsuite/reftests/border-image-excess-size.ui b/testsuite/reftests/border-image-excess-size.ui
index f4a5021f48..3ea01d36f2 100644
--- a/testsuite/reftests/border-image-excess-size.ui
+++ b/testsuite/reftests/border-image-excess-size.ui
@@ -3,11 +3,10 @@
   <object class="GtkWindow" id="window1">
     <property name="type">popup</property>
     <child>
-      <object class="GtkToolbar" id="toolbar1">
+      <object class="GtkBox">
         <property name="width_request">10</property>
         <property name="height_request">10</property>
         <property name="can_focus">1</property>
-        <property name="show_arrow">0</property>
       </object>
     </child>
   </object>