Remove various deprecated GtkOrientable subclasses

1 files changed, 30 insertions, 28 deletions

diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index fa54f96480..96a37e6371 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -91,7 +91,7 @@ test_parser (void)
   g_error_free (error);
 
   error = NULL;
-  gtk_builder_add_from_string (builder, "<interface><object class=\"GtkVBox\" id=\"a\"><object class=\"GtkBox\" id=\"b\"/></object></interface>", -1, &error);
+  gtk_builder_add_from_string (builder, "<interface><object class=\"GtkBox\" id=\"a\"><object class=\"GtkBox\" id=\"b\"/></object></interface>", -1, &error);
   g_assert_error (error, GTK_BUILDER_ERROR, GTK_BUILDER_ERROR_INVALID_TAG);
   g_error_free (error);
 
@@ -439,7 +439,8 @@ test_sizegroup (void)
     "  </object>"
     "  <object class=\"GtkWindow\" id=\"window1\">"
     "    <child>"
-    "      <object class=\"GtkVBox\" id=\"vbox1\">"
+    "      <object class=\"GtkBox\" id=\"vbox1\">"
+    "        <property name=\"orientation\">vertical</property>"
     "        <child>"
     "          <object class=\"GtkRadioButton\" id=\"radio1\"/>"
     "        </child>"
@@ -476,7 +477,8 @@ test_sizegroup (void)
     "  </object>"
     "  <object class=\"GtkWindow\" id=\"window1\">"
     "    <child>"
-    "      <object class=\"GtkVBox\" id=\"vbox1\">"
+    "      <object class=\"GtkBox\" id=\"vbox1\">"
+    "        <property name=\"orientation\">vertical</property>"
     "        <child>"
     "          <object class=\"GtkRadioButton\" id=\"radio1\"/>"
     "        </child>"
@@ -722,11 +724,6 @@ test_types (void)
     "  <object class=\"GtkEventBox\" id=\"eventbox\"/>"
     "  <object class=\"GtkEntry\" id=\"entry\"/>"
     "  <object class=\"GtkFontButton\" id=\"fontbutton\"/>"
-    "  <object class=\"GtkHButtonBox\" id=\"hbuttonbox\"/>"
-    "  <object class=\"GtkHPaned\" id=\"hpaned\"/>"
-    "  <object class=\"GtkHScale\" id=\"hscale\"/>"
-    "  <object class=\"GtkHScrollbar\" id=\"hscrollbar\"/>"
-    "  <object class=\"GtkHSeparator\" id=\"hseparator\"/>"
     "  <object class=\"GtkImage\" id=\"image\"/>"
     "  <object class=\"GtkLabel\" id=\"label\"/>"
     "  <object class=\"GtkListStore\" id=\"liststore\"/>"
@@ -745,13 +742,7 @@ test_types (void)
     "  <object class=\"GtkTreeStore\" id=\"treestore\"/>"
     "  <object class=\"GtkTreeView\" id=\"treeview\"/>"
     "  <object class=\"GtkTable\" id=\"table\"/>"
-    "  <object class=\"GtkVBox\" id=\"vbox\"/>"
-    "  <object class=\"GtkVButtonBox\" id=\"vbuttonbox\"/>"
-    "  <object class=\"GtkVScrollbar\" id=\"vscrollbar\"/>"
-    "  <object class=\"GtkVSeparator\" id=\"vseparator\"/>"
     "  <object class=\"GtkViewport\" id=\"viewport\"/>"
-    "  <object class=\"GtkVPaned\" id=\"vpaned\"/>"
-    "  <object class=\"GtkVScale\" id=\"vscale\"/>"
     "  <object class=\"GtkWindow\" id=\"window\"/>"
     "  <object class=\"GtkUIManager\" id=\"uimanager\"/>"
     "</interface>";
@@ -929,7 +920,8 @@ test_object_properties (void)
     "<interface>"
     "  <object class=\"GtkWindow\" id=\"window1\">"
     "    <child>"
-    "      <object class=\"GtkVBox\" id=\"vbox\">"
+    "      <object class=\"GtkBox\" id=\"vbox\">"
+    "        <property name=\"orientation\">vertical</property>"
     "        <property name=\"border-width\">10</property>"
     "        <child>"
     "          <object class=\"GtkLabel\" id=\"label1\">"
@@ -985,11 +977,13 @@ test_children (void)
     "  <object class=\"GtkDialog\" id=\"dialog1\">"
     "    <property name=\"use_header_bar\">1</property>"
     "    <child internal-child=\"vbox\">"
-    "      <object class=\"GtkVBox\" id=\"dialog1-vbox\">"
+    "      <object class=\"GtkBox\" id=\"dialog1-vbox\">"
+    "        <property name=\"orientation\">vertical</property>"
     "        <property name=\"border-width\">10</property>"
     "          <child internal-child=\"action_area\">"
-    "            <object class=\"GtkHButtonBox\" id=\"dialog1-action_area\">"
+    "            <object class=\"GtkButtonBox\" id=\"dialog1-action_area\">"
     "              <property name=\"border-width\">20</property>"
+    "              <property name=\"orientation\">horizontal</property>"
     "            </object>"
     "          </child>"
     "      </object>"
@@ -1414,9 +1408,11 @@ test_dialog (void)
     "<interface>"
     "  <object class=\"GtkDialog\" id=\"dialog1\">"
     "    <child internal-child=\"vbox\">"
-    "      <object class=\"GtkVBox\" id=\"dialog1-vbox\">"
+    "      <object class=\"GtkBox\" id=\"dialog1-vbox\">"
+    "        <property name=\"orientation\">vertical</property>"
     "          <child internal-child=\"action_area\">"
-    "            <object class=\"GtkHButtonBox\" id=\"dialog1-action_area\">"
+    "            <object class=\"GtkButtonBox\" id=\"dialog1-action_area\">"
+    "              <property name=\"orientation\">horizontal</property>"
     "              <child>"
     "                <object class=\"GtkButton\" id=\"button_cancel\"/>"
     "              </child>"
@@ -1457,7 +1453,8 @@ test_message_dialog (void)
     "<interface>"
     "  <object class=\"GtkMessageDialog\" id=\"dialog1\">"
     "    <child internal-child=\"message_area\">"
-    "      <object class=\"GtkVBox\" id=\"dialog-message-area\">"
+    "      <object class=\"GtkBox\" id=\"dialog-message-area\">"
+    "        <property name=\"orientation\">vertical</property>"
     "        <child>"
     "          <object class=\"GtkExpander\" id=\"expander\"/>"
     "        </child>"
@@ -1564,7 +1561,8 @@ test_widget (void)
     "<interface>"
     "  <object class=\"GtkWindow\" id=\"window1\">"
     "    <child>"
-    "      <object class=\"GtkVBox\" id=\"vbox1\">"
+    "      <object class=\"GtkBox\" id=\"vbox1\">"
+    "        <property name=\"orientation\">vertical</property>"
     "        <child>"
     "          <object class=\"GtkLabel\" id=\"label1\">"
     "            <child internal-child=\"accessible\">"
@@ -1830,7 +1828,8 @@ test_reference_counting (void)
     "</interface>";
   const gchar buffer2[] =
     "<interface>"
-    "  <object class=\"GtkVBox\" id=\"vbox1\">"
+    "  <object class=\"GtkBox\" id=\"vbox1\">"
+    "        <property name=\"orientation\">vertical</property>"
     "    <child>"
     "      <object class=\"GtkLabel\" id=\"label1\"/>"
     "      <packing>"
@@ -2080,7 +2079,8 @@ test_add_objects (void)
     "<interface>"
     "  <object class=\"GtkWindow\" id=\"window\">"
     "    <child>"
-    "      <object class=\"GtkVBox\" id=\"mainbox\">"
+    "      <object class=\"GtkBox\" id=\"mainbox\">"
+    "        <property name=\"orientation\">vertical</property>"
     "        <property name=\"visible\">True</property>"
     "        <child>"
     "          <object class=\"GtkLabel\" id=\"label1\">"
@@ -2249,7 +2249,7 @@ test_menus (void)
     "      <group name=\"accelgroup1\"/>"
     "    </accel-groups>"
     "    <child>"
-    "      <object class=\"GtkVBox\" id=\"vbox1\">"
+    "      <object class=\"GtkBox\" id=\"vbox1\">"
     "        <property name=\"visible\">True</property>"
     "        <property name=\"orientation\">vertical</property>"
     "        <child>"
@@ -2288,7 +2288,7 @@ test_menus (void)
     "      <group name=\"accelgroup1\"/>"
     "    </accel-groups>"
     "    <child>"
-    "      <object class=\"GtkVBox\" id=\"vbox1\">"
+    "      <object class=\"GtkBox\" id=\"vbox1\">"
     "        <property name=\"visible\">True</property>"
     "        <property name=\"orientation\">vertical</property>"
     "        <child>"
@@ -2408,7 +2408,8 @@ test_message_area (void)
     "      </object>"
     "    </child>"
     "    <child internal-child=\"action_area\">"
-    "      <object class=\"GtkVButtonBox\" id=\"actionarea1\">"
+    "      <object class=\"GtkButtonBox\" id=\"actionarea1\">"
+    "       <property name=\"orientation\">vertical</property>"
     "        <child>"
     "          <object class=\"GtkButton\" id=\"button_ok\">"
     "            <property name=\"label\">gtk-ok</property>"
@@ -2650,7 +2651,8 @@ test_no_ids (void)
     "      </object>"
     "    </child>"
     "    <child internal-child=\"action_area\">"
-    "      <object class=\"GtkVButtonBox\">"
+    "      <object class=\"GtkButtonBox\">"
+    "       <property name=\"orientation\">vertical</property>"
     "        <child>"
     "          <object class=\"GtkButton\" id=\"button_ok\">"
     "            <property name=\"label\">gtk-ok</property>"
@@ -2681,7 +2683,7 @@ test_property_bindings (void)
     "<interface>"
     "  <object class=\"GtkWindow\" id=\"window\">"
     "    <child>"
-    "      <object class=\"GtkVBox\" id=\"vbox\">"
+    "      <object class=\"GtkBox\" id=\"vbox\">"
     "        <property name=\"visible\">True</property>"
     "        <property name=\"orientation\">vertical</property>"
     "        <child>"