GNOME.org
 

[gtk+/wip/otte/gtk4: 25/121] Remove GtkHBox

commit 38d3e61a426f88fae3965260e3b920df8986df56
Author: Timm Bäder <mail baedert org>
Date:   Mon Oct 3 19:52:23 2016 +0200

    Remove GtkHBox

 docs/reference/gtk/gtk3-sections.txt |   16 ------
 gtk/deprecated/Makefile.inc          |    2 -
 gtk/deprecated/gtkhbox.c             |   98 ----------------------------------
 gtk/deprecated/gtkhbox.h             |   68 -----------------------
 gtk/gtk-builder-tool.c               |    1 -
 gtk/gtk.h                            |    1 -
 gtk/gtkbox.c                         |    4 --
 gtk/gtkcontainer.c                   |    2 +-
 gtk/gtkgrid.c                        |    2 +-
 tests/testfontselection.c            |    2 +-
 tests/testheightforwidth.c           |   21 +++++---
 testsuite/gtk/builder.c              |    9 ++--
 testsuite/gtk/notify.c               |    1 -
 13 files changed, 22 insertions(+), 205 deletions(-)
---
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index 6ce7a69..b3155a6 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -1788,22 +1788,6 @@ gtk_hbutton_box_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gtkhbox</FILE>
-<TITLE>GtkHBox</TITLE>
-GtkHBox
-gtk_hbox_new
-<SUBSECTION Standard>
-GTK_HBOX
-GTK_IS_HBOX
-GTK_TYPE_HBOX
-GTK_HBOX_CLASS
-GTK_IS_HBOX_CLASS
-GTK_HBOX_GET_CLASS
-<SUBSECTION Private>
-gtk_hbox_get_type
-</SECTION>
-
-<SECTION>
 <FILE>gtkhpaned</FILE>
 <TITLE>GtkHPaned</TITLE>
 GtkHPaned
diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc
index 4d2ba56..4503938 100644
--- a/gtk/deprecated/Makefile.inc
+++ b/gtk/deprecated/Makefile.inc
@@ -10,7 +10,6 @@ deprecated_h_sources =                        \
        deprecated/gtkgradient.h        \
        deprecated/gtkhandlebox.h       \
        deprecated/gtkhbbox.h           \
-       deprecated/gtkhbox.h            \
        deprecated/gtkhpaned.h          \
        deprecated/gtkhscale.h          \
        deprecated/gtkhscrollbar.h      \
@@ -55,7 +54,6 @@ deprecated_c_sources =                        \
        deprecated/gtkgradient.c        \
        deprecated/gtkhandlebox.c       \
        deprecated/gtkhbbox.c           \
-       deprecated/gtkhbox.c            \
        deprecated/gtkhpaned.c          \
        deprecated/gtkhscale.c          \
        deprecated/gtkhscrollbar.c      \
diff --git a/gtk/gtk-builder-tool.c b/gtk/gtk-builder-tool.c
index 24171ab..cb5e864 100644
--- a/gtk/gtk-builder-tool.c
+++ b/gtk/gtk-builder-tool.c
@@ -195,7 +195,6 @@ needs_explicit_setting (MyParserData *data,
     { "GtkWidget", "vexpand", 0 },
     { "GtkContainer", "border-width", 0 },
     { "GtkVBox", "expand", 1 },
-    { "GtkHBox", "expand", 1 },
     { NULL, NULL, 0 }
   };
   gchar *canonical_name;
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 6a41b0d..a858454 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -255,7 +255,6 @@
 #include <gtk/deprecated/gtkgradient.h>
 #include <gtk/deprecated/gtkhandlebox.h>
 #include <gtk/deprecated/gtkhbbox.h>
-#include <gtk/deprecated/gtkhbox.h>
 #include <gtk/deprecated/gtkhpaned.h>
 #include <gtk/deprecated/gtkhsv.h>
 #include <gtk/deprecated/gtkhscale.h>
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index e39eb49..c2c34bc 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -306,10 +306,6 @@ gtk_box_class_init (GtkBoxClass *class)
    *
    * Whether the child should receive extra space when the parent grows.
    *
-   * Note that the default value for this property is %FALSE for GtkBox,
-   * but #GtkHBox, #GtkVBox and other subclasses use the old default
-   * of %TRUE.
-   *
    * Note that the #GtkWidget:halign, #GtkWidget:valign, #GtkWidget:hexpand
    * and #GtkWidget:vexpand properties are the preferred way to influence
    * child size allocation in containers.
diff --git a/gtk/gtkcontainer.c b/gtk/gtkcontainer.c
index 55feadf..d90370b 100644
--- a/gtk/gtkcontainer.c
+++ b/gtk/gtkcontainer.c
@@ -87,7 +87,7 @@
  *
  * The second type of container can have more than one child; its purpose is to
  * manage layout. This means that these containers assign
- * sizes and positions to their children. For example, a #GtkHBox arranges its
+ * sizes and positions to their children. For example, a horizontal #GtkBox arranges its
  * children in a horizontal row, and a #GtkGrid arranges the widgets it contains
  * in a two-dimensional grid.
  *
diff --git a/gtk/gtkgrid.c b/gtk/gtkgrid.c
index 5fed33f..357dbb1 100644
--- a/gtk/gtkgrid.c
+++ b/gtk/gtkgrid.c
@@ -36,7 +36,7 @@
  * SECTION:gtkgrid
  * @Short_description: Pack widgets in a rows and columns
  * @Title: GtkGrid
- * @See_also: #GtkTable, #GtkHBox, #GtkVBox
+ * @See_also: #GtkTable, #GtkVBox
  *
  * GtkGrid is a container which arranges its child widgets in
  * rows and columns. It is a very similar to #GtkTable and #GtkBox,
diff --git a/tests/testfontselection.c b/tests/testfontselection.c
index 8c87b2c..fc384d6 100644
--- a/tests/testfontselection.c
+++ b/tests/testfontselection.c
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
 
   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
   gtk_widget_set_size_request (window, 600, 600);
-  hbox = gtk_hbox_new (FALSE, 6);
+  hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_add (GTK_CONTAINER (window), hbox);
 
 #ifndef GTK_DISABLE_DEPRECATED
diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c
index fe47ed3..ba3fd01 100644
--- a/tests/testheightforwidth.c
+++ b/tests/testheightforwidth.c
@@ -43,7 +43,8 @@ TestInterface interfaces[] = {
     "    <property name=\"default_width\">450</property>"
     "    <property name=\"default_height\">50</property>"
     "    <child>"
-    "      <object class=\"GtkHBox\" id=\"hbox5\">"
+    "      <object class=\"GtkBox\" id=\"hbox5\">"
+    "        <property name\"orientation\"horizontal</property>"
     "        <property name=\"visible\">True</property>"
     "        <child>"
     "          <object class=\"GtkLabel\" id=\"label9\">"
@@ -211,7 +212,8 @@ TestInterface interfaces[] = {
     "          <object class=\"GtkVBox\" id=\"vbox1\">"
     "            <property name=\"visible\">True</property>"
     "            <child>"
-    "              <object class=\"GtkHBox\" id=\"hbox1\">"
+    "              <object class=\"GtkBox\" id=\"hbox1\">"
+    "                <property name\"orientation\"horizontal</property>"
     "                <property name=\"visible\">True</property>"
     "                <child>"
     "                  <object class=\"GtkButton\" id=\"button1\">"
@@ -313,7 +315,8 @@ TestInterface interfaces[] = {
     "        <property name=\"visible\">True</property>"
     "        <property name=\"can_focus\">True</property>"
     "        <child>"
-    "          <object class=\"GtkHBox\" id=\"hbox1\">"
+    "          <object class=\"GtkBox\" id=\"hbox1\">"
+    "            <property name\"orientation\"horizontal</property>"
     "            <property name=\"visible\">True</property>"
     "            <child>"
     "              <object class=\"GtkLabel\" id=\"label1\">"
@@ -364,7 +367,8 @@ TestInterface interfaces[] = {
     "          </packing>"
     "        </child>"
     "        <child>"
-    "          <object class=\"GtkHBox\" id=\"hbox2\">"
+    "          <object class=\"GtkBox\" id=\"hbox2\">"
+    "            <property name\"orientation\"horizontal</property>"
     "            <property name=\"visible\">True</property>"
     "            <child>"
     "              <object class=\"GtkFrame\" id=\"frame2\">"
@@ -438,7 +442,8 @@ TestInterface interfaces[] = {
     "          <object class=\"GtkVBox\" id=\"vbox1\">"
     "            <property name=\"visible\">True</property>"
     "            <child>"
-    "              <object class=\"GtkHBox\" id=\"hbox1\">"
+    "              <object class=\"GtkBox\" id=\"hbox1\">"
+    "                <property name\"orientation\"horizontal</property>"
     "                <property name=\"visible\">True</property>"
     "                <property name=\"spacing\">6</property>"
     "                <child>"
@@ -676,7 +681,8 @@ TestInterface interfaces[] = {
     "            <property name=\"visible\">True</property>"
     "            <property name=\"spacing\">5</property>"
     "            <child>"
-    "              <object class=\"GtkHBox\" id=\"hbox1\">"
+    "              <object class=\"GtkBox\" id=\"hbox1\">"
+    "                <property name\"orientation\"horizontal</property>"
     "                <property name=\"visible\">True</property>"
     "                <property name=\"spacing\">5</property>"
     "                <child>"
@@ -777,7 +783,8 @@ TestInterface interfaces[] = {
     "              </packing>"
     "            </child>"
     "            <child>"
-    "              <object class=\"GtkHBox\" id=\"hbox2\">"
+    "              <object class=\"GtkBox\" id=\"hbox2\">"
+    "                <property name\"orientation\"horizontal</property>"
     "                <property name=\"visible\">True</property>"
     "                <property name=\"spacing\">5</property>"
     "                <child>"
diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 9aad57a..61228ee 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=\"GtkHBox\" id=\"b\"/></object></interface>", -1, &error);
+  gtk_builder_add_from_string (builder, "<interface><object class=\"GtkVBox\" 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);
 
@@ -724,7 +724,6 @@ test_types (void)
     "  <object class=\"GtkEntry\" id=\"entry\"/>"
     "  <object class=\"GtkFontButton\" id=\"fontbutton\"/>"
     "  <object class=\"GtkHButtonBox\" id=\"hbuttonbox\"/>"
-    "  <object class=\"GtkHBox\" id=\"hbox\"/>"
     "  <object class=\"GtkHPaned\" id=\"hpaned\"/>"
     "  <object class=\"GtkHScale\" id=\"hscale\"/>"
     "  <object class=\"GtkHScrollbar\" id=\"hscrollbar\"/>"
@@ -2428,7 +2427,8 @@ test_message_area (void)
     "<interface>"
     "  <object class=\"GtkInfoBar\" id=\"infobar1\">"
     "    <child internal-child=\"content_area\">"
-    "      <object class=\"GtkHBox\" id=\"contentarea1\">"
+    "      <object class=\"GtkBox\" id=\"contentarea1\">"
+    "        <property name=\"orientation\">horizontal</property>"
     "        <child>"
     "          <object class=\"GtkLabel\" id=\"content\">"
     "            <property name=\"label\" translatable=\"yes\">Message</property>"
@@ -2670,7 +2670,8 @@ test_no_ids (void)
     "<interface>"
     "  <object class=\"GtkInfoBar\">"
     "    <child internal-child=\"content_area\">"
-    "      <object class=\"GtkHBox\">"
+    "      <object class=\"GtkBox\">"
+    "        <property name=\"orientation\">horizontal</property>"
     "        <child>"
     "          <object class=\"GtkLabel\">"
     "            <property name=\"label\" translatable=\"yes\">Message</property>"
diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c
index 4c186b9..4d297d4 100644
--- a/testsuite/gtk/notify.c
+++ b/testsuite/gtk/notify.c
@@ -374,7 +374,6 @@ test_type (gconstpointer data)
       g_str_equal (g_type_name (type), "GtkVScrollbar") ||
       g_str_equal (g_type_name (type), "GtkHSeparator") ||
       g_str_equal (g_type_name (type), "GtkVSeparator") ||
-      g_str_equal (g_type_name (type), "GtkHBox") ||
       g_str_equal (g_type_name (type), "GtkVBox") ||
       g_str_equal (g_type_name (type), "GtkArrow") ||
       g_str_equal (g_type_name (type), "GtkNumerableIcon") ||
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]