GNOME.org
 

[gtk+/wip/otte/gtk4: 74/127] Remove various deprecated GtkOrientable subclasses

commit 5439afd0fefb5af87738cd874301fc47653caacc
Author: Timm Bäder <mail baedert org>
Date:   Tue Oct 4 12:50:56 2016 +0200

    Remove various deprecated GtkOrientable subclasses

 docs/reference/gtk/gtk3-sections.txt |  179 ----------------------------------
 gtk/deprecated/Makefile.inc          |   26 +-----
 gtk/deprecated/gtkhbbox.c            |   89 -----------------
 gtk/deprecated/gtkhbbox.h            |   66 -------------
 gtk/deprecated/gtkhpaned.c           |   73 --------------
 gtk/deprecated/gtkhpaned.h           |   65 ------------
 gtk/deprecated/gtkhscale.c           |  141 --------------------------
 gtk/deprecated/gtkhscale.h           |   69 -------------
 gtk/deprecated/gtkhscrollbar.c       |   88 -----------------
 gtk/deprecated/gtkhscrollbar.h       |   65 ------------
 gtk/deprecated/gtkhseparator.c       |   78 ---------------
 gtk/deprecated/gtkhseparator.h       |   65 ------------
 gtk/deprecated/gtkvbbox.c            |   87 ----------------
 gtk/deprecated/gtkvbbox.h            |   65 ------------
 gtk/deprecated/gtkvpaned.c           |   73 --------------
 gtk/deprecated/gtkvpaned.h           |   65 ------------
 gtk/deprecated/gtkvscale.c           |  138 --------------------------
 gtk/deprecated/gtkvscale.h           |   75 --------------
 gtk/deprecated/gtkvscrollbar.c       |   87 ----------------
 gtk/deprecated/gtkvscrollbar.h       |   71 -------------
 gtk/deprecated/gtkvseparator.c       |   73 --------------
 gtk/deprecated/gtkvseparator.h       |   71 -------------
 gtk/gtk.h                            |   11 --
 testsuite/gtk/builder.c              |   58 ++++++------
 24 files changed, 32 insertions(+), 1846 deletions(-)
---
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index ddf80a2..09293bd 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -1690,87 +1690,6 @@ gtk_frame_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gtkhbbox</FILE>
-<TITLE>GtkHButtonBox</TITLE>
-GtkHButtonBox
-gtk_hbutton_box_new
-<SUBSECTION Standard>
-GTK_HBUTTON_BOX
-GTK_IS_HBUTTON_BOX
-GTK_TYPE_HBUTTON_BOX
-GTK_HBUTTON_BOX_CLASS
-GTK_IS_HBUTTON_BOX_CLASS
-GTK_HBUTTON_BOX_GET_CLASS
-<SUBSECTION Private>
-gtk_hbutton_box_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkhpaned</FILE>
-<TITLE>GtkHPaned</TITLE>
-GtkHPaned
-gtk_hpaned_new
-<SUBSECTION Standard>
-GTK_HPANED
-GTK_IS_HPANED
-GTK_TYPE_HPANED
-GTK_HPANED_CLASS
-GTK_IS_HPANED_CLASS
-GTK_HPANED_GET_CLASS
-<SUBSECTION Private>
-gtk_hpaned_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkhscale</FILE>
-<TITLE>GtkHScale</TITLE>
-GtkHScale
-gtk_hscale_new
-gtk_hscale_new_with_range
-<SUBSECTION Standard>
-GTK_HSCALE
-GTK_IS_HSCALE
-GTK_TYPE_HSCALE
-GTK_HSCALE_CLASS
-GTK_IS_HSCALE_CLASS
-GTK_HSCALE_GET_CLASS
-<SUBSECTION Private>
-gtk_hscale_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkhscrollbar</FILE>
-<TITLE>GtkHScrollbar</TITLE>
-GtkHScrollbar
-gtk_hscrollbar_new
-<SUBSECTION Standard>
-GTK_HSCROLLBAR
-GTK_IS_HSCROLLBAR
-GTK_TYPE_HSCROLLBAR
-GTK_HSCROLLBAR_CLASS
-GTK_IS_HSCROLLBAR_CLASS
-GTK_HSCROLLBAR_GET_CLASS
-<SUBSECTION Private>
-gtk_hscrollbar_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkhseparator</FILE>
-<TITLE>GtkHSeparator</TITLE>
-GtkHSeparator
-gtk_hseparator_new
-<SUBSECTION Standard>
-GTK_HSEPARATOR
-GTK_IS_HSEPARATOR
-GTK_TYPE_HSEPARATOR
-GTK_HSEPARATOR_CLASS
-GTK_IS_HSEPARATOR_CLASS
-GTK_HSEPARATOR_GET_CLASS
-<SUBSECTION Private>
-gtk_hseparator_get_type
-</SECTION>
-
-<SECTION>
 <FILE>gtkiconview</FILE>
 <TITLE>GtkIconView</TITLE>
 GtkIconView
@@ -5109,38 +5028,6 @@ gtk_list_store_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gtkvbbox</FILE>
-<TITLE>GtkVButtonBox</TITLE>
-GtkVButtonBox
-gtk_vbutton_box_new
-<SUBSECTION Standard>
-GTK_VBUTTON_BOX
-GTK_IS_VBUTTON_BOX
-GTK_TYPE_VBUTTON_BOX
-GTK_VBUTTON_BOX_CLASS
-GTK_IS_VBUTTON_BOX_CLASS
-GTK_VBUTTON_BOX_GET_CLASS
-<SUBSECTION Private>
-gtk_vbutton_box_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkvbox</FILE>
-<TITLE>GtkVBox</TITLE>
-GtkVBox
-gtk_vbox_new
-<SUBSECTION Standard>
-GTK_VBOX
-GTK_IS_VBOX
-GTK_TYPE_VBOX
-GTK_VBOX_CLASS
-GTK_IS_VBOX_CLASS
-GTK_VBOX_GET_CLASS
-<SUBSECTION Private>
-gtk_vbox_get_type
-</SECTION>
-
-<SECTION>
 <FILE>gtkviewport</FILE>
 <TITLE>GtkViewport</TITLE>
 GtkViewport
@@ -5183,72 +5070,6 @@ gtk_volume_button_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gtkvpaned</FILE>
-<TITLE>GtkVPaned</TITLE>
-GtkVPaned
-gtk_vpaned_new
-<SUBSECTION Standard>
-GTK_VPANED
-GTK_IS_VPANED
-GTK_TYPE_VPANED
-GTK_VPANED_CLASS
-GTK_IS_VPANED_CLASS
-GTK_VPANED_GET_CLASS
-<SUBSECTION Private>
-gtk_vpaned_get_type
-GtkPanedPrivate
-</SECTION>
-
-<SECTION>
-<FILE>gtkvscale</FILE>
-<TITLE>GtkVScale</TITLE>
-GtkVScale
-gtk_vscale_new
-gtk_vscale_new_with_range
-<SUBSECTION Standard>
-GTK_VSCALE
-GTK_IS_VSCALE
-GTK_TYPE_VSCALE
-GTK_VSCALE_CLASS
-GTK_IS_VSCALE_CLASS
-GTK_VSCALE_GET_CLASS
-<SUBSECTION Private>
-gtk_vscale_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkvscrollbar</FILE>
-<TITLE>GtkVScrollbar</TITLE>
-GtkVScrollbar
-gtk_vscrollbar_new
-<SUBSECTION Standard>
-GTK_VSCROLLBAR
-GTK_IS_VSCROLLBAR
-GTK_TYPE_VSCROLLBAR
-GTK_VSCROLLBAR_CLASS
-GTK_IS_VSCROLLBAR_CLASS
-GTK_VSCROLLBAR_GET_CLASS
-<SUBSECTION Private>
-gtk_vscrollbar_get_type
-</SECTION>
-
-<SECTION>
-<FILE>gtkvseparator</FILE>
-<TITLE>GtkVSeparator</TITLE>
-GtkVSeparator
-gtk_vseparator_new
-<SUBSECTION Standard>
-GTK_VSEPARATOR
-GTK_IS_VSEPARATOR
-GTK_TYPE_VSEPARATOR
-GTK_VSEPARATOR_CLASS
-GTK_IS_VSEPARATOR_CLASS
-GTK_VSEPARATOR_GET_CLASS
-<SUBSECTION Private>
-gtk_vseparator_get_type
-</SECTION>
-
-<SECTION>
 <FILE>gtkwidget</FILE>
 <TITLE>GtkWidget</TITLE>
 GtkWidget
diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc
index ac9af6e..d0755d4 100644
--- a/gtk/deprecated/Makefile.inc
+++ b/gtk/deprecated/Makefile.inc
@@ -4,11 +4,6 @@ deprecated_h_sources =                         \
        deprecated/gtkactiongroup.h     \
        deprecated/gtkalignment.h       \
        deprecated/gtkgradient.h        \
-       deprecated/gtkhbbox.h           \
-       deprecated/gtkhpaned.h          \
-       deprecated/gtkhscale.h          \
-       deprecated/gtkhscrollbar.h      \
-       deprecated/gtkhseparator.h      \
        deprecated/gtkhsv.h             \
        deprecated/gtkiconfactory.h     \
        deprecated/gtkradioaction.h     \
@@ -19,13 +14,7 @@ deprecated_h_sources =                       \
        deprecated/gtktable.h           \
        deprecated/gtkthemingengine.h   \
        deprecated/gtktoggleaction.h    \
-       deprecated/gtkuimanager.h       \
-       deprecated/gtkvbbox.h           \
-       deprecated/gtkvbox.h            \
-       deprecated/gtkvscale.h          \
-       deprecated/gtkvscrollbar.h      \
-       deprecated/gtkvseparator.h      \
-       deprecated/gtkvpaned.h
+       deprecated/gtkuimanager.h
 
 deprecated_private_h_sources =                 \
        deprecated/gtkgradientprivate.h         \
@@ -39,11 +28,6 @@ deprecated_c_sources =                       \
        deprecated/gtkactiongroup.c     \
        deprecated/gtkalignment.c       \
        deprecated/gtkgradient.c        \
-       deprecated/gtkhbbox.c           \
-       deprecated/gtkhpaned.c          \
-       deprecated/gtkhscale.c          \
-       deprecated/gtkhscrollbar.c      \
-       deprecated/gtkhseparator.c      \
        deprecated/gtkhsv.c             \
        deprecated/gtkiconfactory.c     \
        deprecated/gtkradioaction.c     \
@@ -54,10 +38,4 @@ deprecated_c_sources =                       \
        deprecated/gtktable.c           \
        deprecated/gtkthemingengine.c   \
        deprecated/gtktoggleaction.c    \
-       deprecated/gtkuimanager.c       \
-       deprecated/gtkvbbox.c           \
-       deprecated/gtkvbox.c            \
-       deprecated/gtkvscale.c          \
-       deprecated/gtkvscrollbar.c      \
-       deprecated/gtkvseparator.c      \
-       deprecated/gtkvpaned.c
+       deprecated/gtkuimanager.c
diff --git a/gtk/gtk.h b/gtk/gtk.h
index be4d72e..d4d8829 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -249,12 +249,7 @@
 #include <gtk/deprecated/gtkactiongroup.h>
 #include <gtk/deprecated/gtkalignment.h>
 #include <gtk/deprecated/gtkgradient.h>
-#include <gtk/deprecated/gtkhbbox.h>
-#include <gtk/deprecated/gtkhpaned.h>
 #include <gtk/deprecated/gtkhsv.h>
-#include <gtk/deprecated/gtkhscale.h>
-#include <gtk/deprecated/gtkhscrollbar.h>
-#include <gtk/deprecated/gtkhseparator.h>
 #include <gtk/deprecated/gtkiconfactory.h>
 #include <gtk/deprecated/gtkradioaction.h>
 #include <gtk/deprecated/gtkrecentaction.h>
@@ -265,12 +260,6 @@
 #include <gtk/deprecated/gtkthemingengine.h>
 #include <gtk/deprecated/gtktoggleaction.h>
 #include <gtk/deprecated/gtkuimanager.h>
-#include <gtk/deprecated/gtkvbbox.h>
-#include <gtk/deprecated/gtkvbox.h>
-#include <gtk/deprecated/gtkvpaned.h>
-#include <gtk/deprecated/gtkvscale.h>
-#include <gtk/deprecated/gtkvscrollbar.h>
-#include <gtk/deprecated/gtkvseparator.h>
 #endif /* GTK_DISABLE_DEPRECATED */
 
 #include <gtk/gtk-autocleanups.h>
diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index fa54f96..96a37e6 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>"
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]