tests: Fix testheightforwidth layout

Stop using child properties and setting visible=true everywhere.

1 files changed, 10 insertions, 161 deletions

diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c
index 41c62f24b6..f5d4afff0e 100644
--- a/tests/testheightforwidth.c
+++ b/tests/testheightforwidth.c
@@ -45,10 +45,8 @@ static TestInterface interfaces[] = {
     "    <child>"
     "      <object class=\"GtkBox\" id=\"hbox5\">"
     "        <property name=\"orientation\">horizontal</property>"
-    "        <property name=\"visible\">True</property>"
     "        <child>"
     "          <object class=\"GtkLabel\" id=\"label9\">"
-    "            <property name=\"visible\">True</property>"
     "            <property name=\"label\" translatable=\"yes\">Some labels do ellipsize</property>"
     "            <property name=\"ellipsize\">end</property>"
     "            <attributes>"
@@ -56,13 +54,9 @@ static TestInterface interfaces[] = {
     "              <attribute name=\"foreground\" value=\"#09610feefe03\"/>"
     "            </attributes>"
     "          </object>"
-    "          <packing>"
-    "            <property name=\"position\">0</property>"
-    "          </packing>"
     "        </child>"
     "        <child>"
     "          <object class=\"GtkLabel\" id=\"label10\">"
-    "            <property name=\"visible\">True</property>"
     "            <property name=\"label\" translatable=\"yes\">but some</property>"
     "            <property name=\"ellipsize\">end</property>"
     "            <attributes>"
@@ -70,13 +64,9 @@ static TestInterface interfaces[] = {
     "              <attribute name=\"foreground\" value=\"#0000af6b0993\"/>"
     "            </attributes>"
     "          </object>"
-    "          <packing>"
-    "            <property name=\"position\">1</property>"
-    "          </packing>"
     "        </child>"
     "        <child>"
     "          <object class=\"GtkLabel\" id=\"label11\">"
-    "            <property name=\"visible\">True</property>"
     "            <property name=\"label\" translatable=\"yes\">do not at all</property>"
     "            <attributes>"
     "              <attribute name=\"style\" value=\"normal\"/>"
@@ -84,9 +74,6 @@ static TestInterface interfaces[] = {
     "              <attribute name=\"foreground\" value=\"#ffff00000000\"/>"
     "            </attributes>"
     "          </object>"
-    "          <packing>"
-    "            <property name=\"position\">2</property>"
-    "          </packing>"
     "        </child>"
     "      </object>"
     "    </child>"
@@ -106,31 +93,25 @@ static TestInterface interfaces[] = {
     "    <child>"
     "      <object class=\"GtkPaned\" id=\"hpaned1\">"
     "        <property name=\"orientation\">horizontal</property>"
-    "        <property name=\"visible\">True</property>"
     "        <property name=\"can_focus\">True</property>"
+    "        <property name=\"resize-child1\">False</property>"
+    "        <property name=\"shrink-child1\">False</property>"
     "        <child>"
     "          <object class=\"GtkBox\" id=\"vbox2\">"
     "            <property name=\"orientation\">vertical</property>"
-    "            <property name=\"visible\">True</property>"
     "            <child>"
     "              <object class=\"GtkLabel\" id=\"label3\">"
-    "                <property name=\"visible\">True</property>"
     "                <property name=\"label\" translatable=\"yes\">A short static label.</property>"
     "                <attributes>"
     "                  <attribute name=\"weight\" value=\"bold\"/>"
     "                </attributes>"
     "              </object>"
-    "              <packing>"
-    "                <property name=\"position\">0</property>"
-    "              </packing>"
     "            </child>"
     "            <child>"
     "              <object class=\"GtkFrame\" id=\"frame1\">"
     "                <property name=\"label\">Long label</property>"
-    "                <property name=\"visible\">True</property>"
     "                <child>"
     "                  <object class=\"GtkLabel\" id=\"label1\">"
-    "                    <property name=\"visible\">True</property>"
     "                    <property name=\"label\" translatable=\"yes\">This is a really long label for the purpose of testing line wrapping is working correctly in conjunction with height-for-width support in GTK+</property>"
     "                    <property name=\"wrap\">True</property>"
     "                    <property name=\"max_width_chars\">30</property>"
@@ -140,18 +121,13 @@ static TestInterface interfaces[] = {
     "                  </object>"
     "                </child>"
     "              </object>"
-    "              <packing>"
-    "                <property name=\"position\">1</property>"
-    "              </packing>"
     "            </child>"
     "            <child>"
     "              <object class=\"GtkButton\" id=\"button2\">"
-    "                <property name=\"visible\">True</property>"
     "                <property name=\"can_focus\">True</property>"
     "                <property name=\"receives_default\">True</property>"
     "                <child>"
     "                  <object class=\"GtkLabel\" id=\"label2\">"
-    "                    <property name=\"visible\">True</property>"
     "                    <property name=\"label\" translatable=\"yes\">A really really long label inside a button to demonstrate height for width working inside buttons</property>"
     "                    <property name=\"wrap\">True</property>"
     "                    <property name=\"max_width_chars\">25</property>"
@@ -161,19 +137,11 @@ static TestInterface interfaces[] = {
     "                  </object>"
     "                </child>"
     "              </object>"
-    "              <packing>"
-    "                <property name=\"position\">2</property>"
-    "              </packing>"
     "            </child>"
     "          </object>"
-    "          <packing>"
-    "            <property name=\"resize\">False</property>"
-    "            <property name=\"shrink\">False</property>"
-    "          </packing>"
     "        </child>"
     "        <child>"
     "          <object class=\"GtkLabel\" id=\"label4\">"
-    "            <property name=\"visible\">True</property>"
     "            <property name=\"label\" translatable=\"yes\">This static label\n"
     "can shrink.</property>"
     "            <property name=\"justify\">center</property>"
@@ -182,10 +150,6 @@ static TestInterface interfaces[] = {
     "              <attribute name=\"foreground\" value=\"#ffff00000000\"/>"
     "            </attributes>"
     "          </object>"
-    "          <packing>"
-    "            <property name=\"resize\">True</property>"
-    "            <property name=\"shrink\">True</property>"
-    "          </packing>"
     "        </child>"
     "      </object>"
     "    </child>"
@@ -206,24 +170,21 @@ static TestInterface interfaces[] = {
     "    <child>"
     "      <object class=\"GtkPaned\" id=\"hpaned1\">"
     "        <property name=\"orientation\">horizontal</property>"
-    "        <property name=\"visible\">True</property>"
     "        <property name=\"can_focus\">True</property>"
+    "        <property name=\"resize-child1\">False</property>"
+    "        <property name=\"shrink-child1\">False</property>"
     "        <child>"
     "          <object class=\"GtkBox\" id=\"vbox1\">"
     "            <property name=\"orientation\">vertical</property>"
-    "            <property name=\"visible\">True</property>"
     "            <child>"
     "              <object class=\"GtkBox\" id=\"hbox1\">"
     "                <property name=\"orientation\">horizontal</property>"
-    "                <property name=\"visible\">True</property>"
     "                <child>"
     "                  <object class=\"GtkButton\" id=\"button1\">"
-    "                    <property name=\"visible\">True</property>"
     "                    <property name=\"can_focus\">True</property>"
     "                    <property name=\"receives_default\">True</property>"
     "                    <child>"
     "                      <object class=\"GtkLabel\" id=\"label2\">"
-    "                        <property name=\"visible\">True</property>"
     "                        <property name=\"label\" translatable=\"yes\">A button that wraps.</property>"
     "                        <property name=\"wrap\">True</property>"
     "                        <property name=\"width_chars\">10</property>"
@@ -233,13 +194,9 @@ static TestInterface interfaces[] = {
     "                      </object>"
     "                    </child>"
     "                  </object>"
-    "                  <packing>"
-    "                    <property name=\"position\">0</property>"
-    "                  </packing>"
     "                </child>"
     "                <child>"
     "                  <object class=\"GtkLabel\" id=\"label1\">"
-    "                    <property name=\"visible\">True</property>"
     "                    <property name=\"label\" translatable=\"yes\">Lets try setting up some long text to wrap up in this hbox and see if the height-for-width is gonna work !</property>"
     "                    <property name=\"wrap\">True</property>"
     "                    <property name=\"width_chars\">30</property>"
@@ -247,35 +204,20 @@ static TestInterface interfaces[] = {
     "                      <attribute name=\"foreground\" value=\"#07d0a9b20972\"/>"
     "                    </attributes>"
     "                  </object>"
-    "                  <packing>"
-    "                    <property name=\"position\">1</property>"
-    "                  </packing>"
     "                </child>"
     "              </object>"
-    "              <packing>"
-    "                <property name=\"position\">0</property>"
-    "              </packing>"
     "            </child>"
     "            <child>"
     "              <object class=\"GtkButton\" id=\"button2\">"
     "                <property name=\"label\" translatable=\"yes\">A button that expands in the vbox</property>"
-    "                <property name=\"visible\">True</property>"
     "                <property name=\"can_focus\">True</property>"
     "                <property name=\"receives_default\">True</property>"
     "              </object>"
-    "              <packing>"
-    "                <property name=\"position\">1</property>"
-    "              </packing>"
     "            </child>"
     "          </object>"
-    "          <packing>"
-    "            <property name=\"resize\">False</property>"
-    "            <property name=\"shrink\">False</property>"
-    "          </packing>"
     "        </child>"
     "        <child>"
     "          <object class=\"GtkLabel\" id=\"label4\">"
-    "            <property name=\"visible\">True</property>"
     "            <property name=\"label\" translatable=\"yes\">This label is\n"
     "set to shrink inside\n"
     "the paned window.</property>"
@@ -285,10 +227,6 @@ static TestInterface interfaces[] = {
     "              <attribute name=\"foreground\" value=\"#ffff00000000\"/>"
     "            </attributes>"
     "          </object>"
-    "          <packing>"
-    "            <property name=\"resize\">True</property>"
-    "            <property name=\"shrink\">True</property>"
-    "          </packing>"
     "        </child>"
     "      </object>"
     "    </child>"
@@ -309,20 +247,18 @@ static TestInterface interfaces[] = {
     "    <child>"
     "      <object class=\"GtkPaned\" id=\"hpaned1\">"
     "        <property name=\"orientation\">horizontal</property>"
-    "        <property name=\"visible\">True</property>"
     "        <property name=\"can_focus\">True</property>"
+    "        <property name=\"resize-child1\">False</property>"
+    "        <property name=\"shrink-child1\">False</property>"
     "        <child>"
     "          <object class=\"GtkBox\" id=\"vbox1\">"
     "            <property name=\"orientation\">vertical</property>"
-    "            <property name=\"visible\">True</property>"
     "            <child>"
     "              <object class=\"GtkBox\" id=\"hbox1\">"
     "                <property name=\"orientation\">horizontal</property>"
-    "                <property name=\"visible\">True</property>"
     "                <property name=\"spacing\">6</property>"
     "                <child>"
     "                  <object class=\"GtkLabel\" id=\"label1\">"
-    "                    <property name=\"visible\">True</property>"
     "                    <property name=\"label\" translatable=\"yes\">The first 2 labels require 10 characters.</property>"
     "                    <property name=\"wrap\">True</property>"
     "                    <property name=\"width_chars\">10</property>"
@@ -331,13 +267,9 @@ static TestInterface interfaces[] = {
     "                      <attribute name=\"foreground\" value=\"#ffff00000000\"/>"
     "                    </attributes>"
     "                  </object>"
-    "                  <packing>"
-    "                    <property name=\"position\">0</property>"
-    "                  </packing>"
     "                </child>"
     "                <child>"
     "                  <object class=\"GtkLabel\" id=\"label2\">"
-    "                    <property name=\"visible\">True</property>"
     "                    <property name=\"label\" translatable=\"yes\">This label has a maximum natural width of 20 characters. The second two labels expand.</property>"
     "                    <property name=\"wrap\">True</property>"
     "                    <property name=\"width_chars\">10</property>"
@@ -347,13 +279,9 @@ static TestInterface interfaces[] = {
     "                      <attribute name=\"foreground\" value=\"#05c2a161134b\"/>"
     "                    </attributes>"
     "                  </object>"
-    "                  <packing>"
-    "                    <property name=\"position\">1</property>"
-    "                  </packing>"
     "                </child>"
     "                <child>"
     "                  <object class=\"GtkLabel\" id=\"label3\">"
-    "                    <property name=\"visible\">True</property>"
     "                    <property name=\"label\" translatable=\"yes\">This label requires a default minimum size.</property>"
     "                    <property name=\"wrap\">True</property>"
     "                    <attributes>"
@@ -361,18 +289,11 @@ static TestInterface interfaces[] = {
     "                      <attribute name=\"foreground\" value=\"#03e30758fb5f\"/>"
     "                    </attributes>"
     "                  </object>"
-    "                  <packing>"
-    "                    <property name=\"position\">2</property>"
-    "                  </packing>"
     "                </child>"
     "              </object>"
-    "              <packing>"
-    "                <property name=\"position\">0</property>"
-    "              </packing>"
     "            </child>"
     "            <child>"
     "              <object class=\"GtkLabel\" id=\"label4\">"
-    "                <property name=\"visible\">True</property>"
     "                <property name=\"label\" translatable=\"yes\">This test demonstrates how the \"width-chars\" and \"max-width-chars\"\n"
     "properties can be used to specify the minimum requested wrap width\n"
     "and the maximum natural wrap width respectively.</property>"
@@ -383,19 +304,11 @@ static TestInterface interfaces[] = {
     "                  <attribute name=\"foreground\" value=\"#05470000abaf\"/>"
     "                </attributes>"
     "              </object>"
-    "              <packing>"
-    "                <property name=\"position\">1</property>"
-    "              </packing>"
     "            </child>"
     "          </object>"
-    "          <packing>"
-    "            <property name=\"resize\">False</property>"
-    "            <property name=\"shrink\">False</property>"
-    "          </packing>"
     "        </child>"
     "        <child>"
     "          <object class=\"GtkLabel\" id=\"label5\">"
-    "            <property name=\"visible\">True</property>"
     "            <property name=\"label\" translatable=\"yes\">Some static\n"
     "text that shrinks.\n"
     "\n"
@@ -407,10 +320,6 @@ static TestInterface interfaces[] = {
     "              <attribute name=\"foreground\" value=\"#ffff00000000\"/>"
     "            </attributes>"
     "          </object>"
-    "          <packing>"
-    "            <property name=\"resize\">True</property>"
-    "            <property name=\"shrink\">True</property>"
-    "          </packing>"
     "        </child>"
     "      </object>"
     "    </child>"
@@ -432,15 +341,14 @@ static TestInterface interfaces[] = {
     "    <child>"
     "      <object class=\"GtkPaned\" id=\"hpaned1\">"
     "        <property name=\"orientation\">horizontal</property>"
-    "        <property name=\"visible\">True</property>"
     "        <property name=\"can_focus\">True</property>"
+    "        <property name=\"resize-child1\">False</property>"
+    "        <property name=\"shrink-child1\">False</property>"
     "        <child>"
     "          <object class=\"GtkExpander\" id=\"expander1\">"
-    "            <property name=\"visible\">True</property>"
     "            <property name=\"can_focus\">True</property>"
     "            <child>"
     "              <object class=\"GtkLabel\" id=\"label2\">"
-    "                <property name=\"visible\">True</property>"
     "                <property name=\"label\" translatable=\"yes\">More wrapping text to fill the largish content area in the expander </property>"
     "                <property name=\"wrap\">True</property>"
     "                <property name=\"width_chars\">10</property>"
@@ -452,7 +360,6 @@ static TestInterface interfaces[] = {
     "            </child>"
     "            <child type=\"label\">"
     "              <object class=\"GtkLabel\" id=\"label1\">"
-    "                <property name=\"visible\">True</property>"
     "                <property name=\"label\" translatable=\"yes\">Here is some expander text that wraps</property>"
     "                <property name=\"wrap\">True</property>"
     "                <property name=\"width_chars\">10</property>"
@@ -463,14 +370,9 @@ static TestInterface interfaces[] = {
     "              </object>"
     "            </child>"
     "          </object>"
-    "          <packing>"
-    "            <property name=\"resize\">False</property>"
-    "            <property name=\"shrink\">False</property>"
-    "          </packing>"
     "        </child>"
     "        <child>"
     "          <object class=\"GtkLabel\" id=\"label3\">"
-    "            <property name=\"visible\">True</property>"
     "            <property name=\"label\" translatable=\"yes\">static\n"
     "text\n"
     "here</property>"
@@ -478,10 +380,6 @@ static TestInterface interfaces[] = {
     "              <attribute name=\"foreground\" value=\"red\"/>"
     "            </attributes>"
     "          </object>"
-    "          <packing>"
-    "            <property name=\"resize\">True</property>"
-    "            <property name=\"shrink\">True</property>"
-    "          </packing>"
     "        </child>"
     "      </object>"
     "    </child>"
@@ -503,18 +401,15 @@ static TestInterface interfaces[] = {
     "    <property name=\"default_height\">150</property>"
     "    <child>"
     "      <object class=\"GtkFrame\" id=\"frame1\">"
-    "        <property name=\"visible\">True</property>"
     "        <property name=\"label_xalign\">0</property>"
     "        <child>"
     "          <object class=\"GtkLabel\" id=\"label2\">"
-    "            <property name=\"visible\">True</property>"
     "            <property name=\"margin_start\">12</property>"
     "            <property name=\"label\" translatable=\"yes\">some content</property>"
     "          </object>"
     "        </child>"
     "        <child type=\"label\">"
     "          <object class=\"GtkLabel\" id=\"label1\">"
-    "            <property name=\"visible\">True</property>"
     "            <property name=\"label\" translatable=\"yes\">A frame label that's a little long and wraps</property>"
     "            <property name=\"use_markup\">True</property>"
     "            <property name=\"wrap\">True</property>"
@@ -539,34 +434,28 @@ static TestInterface interfaces[] = {
     "    <child>"
     "      <object class=\"GtkPaned\" id=\"hpaned1\">"
     "        <property name=\"orientation\">horizontal</property>"
-    "        <property name=\"visible\">True</property>"
     "        <property name=\"can_focus\">True</property>"
+    "        <property name=\"shrink-child1\">False</property>"
+    "        <property name=\"resize-child2\">False</property>"
     "        <child>"
     "          <object class=\"GtkBox\" id=\"vbox1\">"
     "            <property name=\"orientation\">vertical</property>"
-    "            <property name=\"visible\">True</property>"
     "            <property name=\"spacing\">5</property>"
     "            <child>"
     "              <object class=\"GtkBox\" id=\"hbox1\">"
     "                <property name=\"orientation\">horizontal</property>"
-    "                <property name=\"visible\">True</property>"
     "                <property name=\"spacing\">5</property>"
     "                <child>"
     "                  <object class=\"GtkLabel\" id=\"label1\">"
-    "                    <property name=\"visible\">True</property>"
     "                    <property name=\"label\" translatable=\"yes\">this combo box</property>"
     "                    <attributes>"
     "                      <attribute name=\"weight\" value=\"bold\"/>"
     "                      <attribute name=\"foreground\" value=\"#b3460000eb1c\"/>"
     "                    </attributes>"
     "                  </object>"
-    "                  <packing>"
-    "                    <property name=\"position\">0</property>"
-    "                  </packing>"
     "                </child>"
     "                <child>"
     "                  <object class=\"GtkLabel\" id=\"label2\">"
-    "                    <property name=\"visible\">True</property>"
     "                    <property name=\"label\" translatable=\"yes\">contains some wrapping locations</property>"
     "                    <property name=\"ellipsize\">end</property>"
     "                    <property name=\"width_chars\">10</property>"
@@ -575,13 +464,9 @@ static TestInterface interfaces[] = {
     "                      <attribute name=\"foreground\" value=\"#b3460000eb1c\"/>"
     "                    </attributes>"
     "                  </object>"
-    "                  <packing>"
-    "                    <property name=\"position\">1</property>"
-    "                  </packing>"
     "                </child>"
     "                <child>"
     "                  <object class=\"GtkComboBox\" id=\"combobox1\">"
-    "                    <property name=\"visible\">True</property>"
     "                    <property name=\"model\">liststore1</property>"
     "                    <property name=\"active\">0</property>"
     "                    <child>"
@@ -602,22 +487,14 @@ static TestInterface interfaces[] = {
     "                      </attributes>"
     "                    </child>"
     "                  </object>"
-    "                  <packing>"
-    "                    <property name=\"position\">2</property>"
-    "                  </packing>"
     "                </child>"
     "              </object>"
-    "              <packing>"
-    "                <property name=\"position\">0</property>"
-    "              </packing>"
     "            </child>"
     "            <child>"
     "              <object class=\"GtkFrame\" id=\"frame1\">"
-    "                <property name=\"visible\">True</property>"
     "                <property name=\"label_xalign\">0</property>"
     "                <child>"
     "                  <object class=\"GtkLabel\" id=\"label3\">"
-    "                    <property name=\"visible\">True</property>"
     "                    <property name=\"label\" translatable=\"yes\">This test shows combo boxes\n"
     "requesting and allocating space\n"
     "for its backing content using\n"
@@ -634,31 +511,22 @@ static TestInterface interfaces[] = {
     "                  </object>"
     "                </child>"
     "              </object>"
-    "              <packing>"
-    "                <property name=\"position\">1</property>"
-    "              </packing>"
     "            </child>"
     "            <child>"
     "              <object class=\"GtkBox\" id=\"hbox2\">"
     "                <property name=\"orientation\">horizontal</property>"
-    "                <property name=\"visible\">True</property>"
     "                <property name=\"spacing\">5</property>"
     "                <child>"
     "                  <object class=\"GtkLabel\" id=\"label4\">"
-    "                    <property name=\"visible\">True</property>"
     "                    <property name=\"label\" translatable=\"yes\">this combo box</property>"
     "                    <attributes>"
     "                      <attribute name=\"weight\" value=\"bold\"/>"
     "                      <attribute name=\"foreground\" value=\"#ffffa5a50000\"/>"
     "                    </attributes>"
     "                  </object>"
-    "                  <packing>"
-    "                    <property name=\"position\">0</property>"
-    "                  </packing>"
     "                </child>"
     "                <child>"
     "                  <object class=\"GtkLabel\" id=\"label5\">"
-    "                    <property name=\"visible\">True</property>"
     "                    <property name=\"label\" translatable=\"yes\">contains some ellipsizing locations</property>"
     "                    <property name=\"ellipsize\">end</property>"
     "                    <property name=\"width_chars\">10</property>"
@@ -667,13 +535,9 @@ static TestInterface interfaces[] = {
     "                      <attribute name=\"foreground\" value=\"#ffffa5a50000\"/>"
     "                    </attributes>"
     "                  </object>"
-    "                  <packing>"
-    "                    <property name=\"position\">1</property>"
-    "                  </packing>"
     "                </child>"
     "                <child>"
     "                  <object class=\"GtkComboBox\" id=\"combobox2\">"
-    "                    <property name=\"visible\">True</property>"
     "                    <property name=\"model\">liststore1</property>"
     "                    <property name=\"active\">0</property>"
     "                    <child>"
@@ -694,24 +558,13 @@ static TestInterface interfaces[] = {
     "                      </attributes>"
     "                    </child>"
     "                  </object>"
-    "                  <packing>"
-    "                    <property name=\"position\">2</property>"
-    "                  </packing>"
     "                </child>"
     "              </object>"
-    "              <packing>"
-    "                <property name=\"position\">2</property>"
-    "              </packing>"
     "            </child>"
     "          </object>"
-    "          <packing>"
-    "            <property name=\"resize\">True</property>"
-    "            <property name=\"shrink\">False</property>"
-    "          </packing>"
     "        </child>"
     "        <child>"
     "          <object class=\"GtkLabel\" id=\"label6\">"
-    "            <property name=\"visible\">True</property>"
     "            <property name=\"label\" translatable=\"yes\">Some static\n"
     "text here\n"
     "that shrinks.</property>"
@@ -720,10 +573,6 @@ static TestInterface interfaces[] = {
     "              <attribute name=\"foreground\" value=\"#ffff00000000\"/>"
     "            </attributes>"
     "          </object>"
-    "          <packing>"
-    "            <property name=\"resize\">False</property>"
-    "            <property name=\"shrink\">True</property>"
-    "          </packing>"
     "        </child>"
     "      </object>"
     "    </child>"