[gtk+/wip/baedert/box] Remove GtkAlignment



commit dd4ee09c868ef1d6d313f0afc8003bacdb476e18
Author: Timm Bäder <mail baedert org>
Date:   Sat Oct 15 17:43:56 2016 +0200

    Remove GtkAlignment

 docs/reference/gtk/gtk3-sections.txt          |   21 -
 docs/tools/widgets.c                          |  198 +++---
 gtk/a11y/gtkbuttonaccessible.c                |    4 -
 gtk/a11y/gtkwidgetaccessible.c                |   14 +-
 gtk/deprecated/Makefile.inc                   |    2 -
 gtk/deprecated/gtkalignment.c                 |  884 -------------------------
 gtk/deprecated/gtkalignment.h                 |  107 ---
 gtk/gtk.h                                     |    1 -
 gtk/gtktoolitemgroup.c                        |   50 +-
 gtk/gtktreeviewcolumn.c                       |   33 +-
 tests/testadjustsize.c                        |   32 -
 tests/testheightforwidth.c                    |   11 +-
 testsuite/gtk/builder.c                       |    1 -
 testsuite/gtk/notify.c                        |    5 -
 testsuite/reftests/Makefile.am                |    3 -
 testsuite/reftests/alignment-props.css        |    8 -
 testsuite/reftests/alignment-props.ref.ui     |  181 -----
 testsuite/reftests/alignment-props.ui         |  137 ----
 testsuite/reftests/inherit-and-initial.ref.ui |   16 +-
 testsuite/reftests/inherit-and-initial.ui     |   16 +-
 20 files changed, 147 insertions(+), 1577 deletions(-)
---
diff --git a/docs/reference/gtk/gtk3-sections.txt b/docs/reference/gtk/gtk3-sections.txt
index aa726c7..fdb5077 100644
--- a/docs/reference/gtk/gtk3-sections.txt
+++ b/docs/reference/gtk/gtk3-sections.txt
@@ -332,27 +332,6 @@ gtk_adjustment_get_type
 </SECTION>
 
 <SECTION>
-<FILE>gtkalignment</FILE>
-<TITLE>GtkAlignment</TITLE>
-GtkAlignment
-GtkAlignmentClass
-gtk_alignment_new
-gtk_alignment_set
-gtk_alignment_get_padding
-gtk_alignment_set_padding
-<SUBSECTION Standard>
-GTK_ALIGNMENT
-GTK_IS_ALIGNMENT
-GTK_TYPE_ALIGNMENT
-GTK_ALIGNMENT_CLASS
-GTK_IS_ALIGNMENT_CLASS
-GTK_ALIGNMENT_GET_CLASS
-<SUBSECTION Private>
-gtk_alignment_get_type
-GtkAlignmentPrivate
-</SECTION>
-
-<SECTION>
 <FILE>gtkassistant</FILE>
 <TITLE>GtkAssistant</TITLE>
 GtkAssistant
diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index f57472f..5c2a7a2 100644
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -69,20 +69,18 @@ static WidgetInfo *
 create_button (void)
 {
   GtkWidget *widget;
-  GtkWidget *align;
 
   widget = gtk_button_new_with_mnemonic ("_Button");
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
+  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
 
-  return new_widget_info ("button", align, SMALL);
+  return new_widget_info ("button", widget, SMALL);
 }
 
 static WidgetInfo *
 create_switch (void)
 {
   GtkWidget *widget;
-  GtkWidget *align;
   GtkWidget *sw;
 
   widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
@@ -92,51 +90,48 @@ create_switch (void)
   sw = gtk_switch_new ();
   gtk_box_pack_start (GTK_BOX (widget), sw, TRUE, TRUE);
 
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
+  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
 
-  return new_widget_info ("switch", align, SMALL);
+  return new_widget_info ("switch", widget, SMALL);
 }
 
 static WidgetInfo *
 create_toggle_button (void)
 {
   GtkWidget *widget;
-  GtkWidget *align;
 
   widget = gtk_toggle_button_new_with_mnemonic ("_Toggle Button");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
+  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
 
-  return new_widget_info ("toggle-button", align, SMALL);
+  return new_widget_info ("toggle-button", widget, SMALL);
 }
 
 static WidgetInfo *
 create_check_button (void)
 {
   GtkWidget *widget;
-  GtkWidget *align;
 
   widget = gtk_check_button_new_with_mnemonic ("_Check Button");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
+  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
 
-  return new_widget_info ("check-button", align, SMALL);
+  return new_widget_info ("check-button", widget, SMALL);
 }
 
 static WidgetInfo *
 create_link_button (void)
 {
   GtkWidget *widget;
-  GtkWidget *align;
 
   widget = gtk_link_button_new_with_label ("http://www.gtk.org";, "Link Button");
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
+  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
 
-  return new_widget_info ("link-button", align, SMALL);
+  return new_widget_info ("link-button", widget, SMALL);
 }
 
 static WidgetInfo *
@@ -222,29 +217,27 @@ static WidgetInfo *
 create_entry (void)
 {
   GtkWidget *widget;
-  GtkWidget *align;
 
   widget = gtk_entry_new ();
+  gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
   gtk_entry_set_text (GTK_ENTRY (widget), "Entry");
   gtk_editable_set_position (GTK_EDITABLE (widget), -1);
-  align = gtk_alignment_new (0.5, 0.5, 1.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
 
-  return  new_widget_info ("entry", align, SMALL);
+  return  new_widget_info ("entry", widget, SMALL);
 }
 
 static WidgetInfo *
 create_search_entry (void)
 {
   GtkWidget *widget;
-  GtkWidget *align;
 
   widget = gtk_search_entry_new ();
+  gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
   gtk_entry_set_placeholder_text (GTK_ENTRY (widget), "Search...");
-  align = gtk_alignment_new (0.5, 0.5, 1.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
 
-  return  new_widget_info ("search-entry", align, SMALL);
+  return  new_widget_info ("search-entry", widget, SMALL);
 }
 
 static WidgetInfo *
@@ -252,7 +245,6 @@ create_radio (void)
 {
   GtkWidget *widget;
   GtkWidget *radio;
-  GtkWidget *align;
 
   widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   radio = gtk_radio_button_new_with_mnemonic (NULL, "Radio Button _One");
@@ -261,23 +253,22 @@ create_radio (void)
   gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE);
   radio = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (radio), "Radio Button T_hree");
   gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE);
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
+  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
 
-  return new_widget_info ("radio-group", align, MEDIUM);
+  return new_widget_info ("radio-group", widget, MEDIUM);
 }
 
 static WidgetInfo *
 create_label (void)
 {
   GtkWidget *widget;
-  GtkWidget *align;
 
   widget = gtk_label_new ("Label");
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
+  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
 
-  return new_widget_info ("label", align, SMALL);
+  return new_widget_info ("label", widget, SMALL);
 }
 
 static WidgetInfo *
@@ -312,7 +303,6 @@ static WidgetInfo *
 create_combo_box_entry (void)
 {
   GtkWidget *widget;
-  GtkWidget *align;
   GtkWidget *child;
   GtkTreeModel *model;
 
@@ -326,17 +316,16 @@ create_combo_box_entry (void)
 
   child = gtk_bin_get_child (GTK_BIN (widget));
   gtk_entry_set_text (GTK_ENTRY (child), "Combo Box Entry");
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
+  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
 
-  return new_widget_info ("combo-box-entry", align, SMALL);
+  return new_widget_info ("combo-box-entry", widget, SMALL);
 }
 
 static WidgetInfo *
 create_combo_box (void)
 {
   GtkWidget *widget;
-  GtkWidget *align;
   GtkCellRenderer *cell;
   GtkListStore *store;
 
@@ -351,33 +340,31 @@ create_combo_box (void)
   gtk_combo_box_set_model (GTK_COMBO_BOX (widget), GTK_TREE_MODEL (store));
 
   gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
+  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
 
-  return new_widget_info ("combo-box", align, SMALL);
+  return new_widget_info ("combo-box", widget, SMALL);
 }
 
 static WidgetInfo *
 create_combo_box_text (void)
 {
   GtkWidget *widget;
-  GtkWidget *align;
 
   widget = gtk_combo_box_text_new ();
 
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Combo Box Text");
   gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
+  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
 
-  return new_widget_info ("combo-box-text", align, SMALL);
+  return new_widget_info ("combo-box-text", widget, SMALL);
 }
 
 static WidgetInfo *
 create_info_bar (void)
 {
   GtkWidget *widget;
-  GtkWidget *align;
   WidgetInfo *info;
 
   widget = gtk_info_bar_new ();
@@ -386,10 +373,10 @@ create_info_bar (void)
   gtk_container_add (GTK_CONTAINER (gtk_info_bar_get_content_area (GTK_INFO_BAR (widget))),
                      gtk_label_new ("Info Bar"));
 
-  align = gtk_alignment_new (0.5, 0, 1.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
+  gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
 
-  info = new_widget_info ("info-bar", align, SMALL);
+  info = new_widget_info ("info-bar", widget, SMALL);
 
   return info;
 }
@@ -542,7 +529,6 @@ create_icon_view (void)
 {
   GtkWidget *widget;
   GtkWidget *vbox;
-  GtkWidget *align;
   GtkWidget *icon_view;
   GtkListStore *list_store;
   GtkTreeIter iter;
@@ -568,9 +554,7 @@ create_icon_view (void)
   gtk_container_add (GTK_CONTAINER (widget), icon_view);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  align = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
-  gtk_box_pack_start (GTK_BOX (vbox), align, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Icon View"),
                      FALSE, FALSE);
@@ -586,17 +570,16 @@ create_color_button (void)
 {
   GtkWidget *vbox;
   GtkWidget *picker;
-  GtkWidget *align;
   GdkRGBA color;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   color.red = 0x1e<<8;  /* Go Gagne! */
   color.green = 0x90<<8;
   color.blue = 0xff<<8;
   picker = gtk_color_button_new_with_rgba (&color);
-  gtk_container_add (GTK_CONTAINER (align), picker);
-  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
+  gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
+  gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Color Button"),
                      FALSE, FALSE);
@@ -609,13 +592,12 @@ create_font_button (void)
 {
   GtkWidget *vbox;
   GtkWidget *picker;
-  GtkWidget *align;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   picker = gtk_font_button_new_with_font ("Sans Serif 10");
-  gtk_container_add (GTK_CONTAINER (align), picker);
-  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
+  gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
+  gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Font Button"),
                      FALSE, FALSE);
@@ -629,17 +611,16 @@ create_file_button (void)
   GtkWidget *vbox;
   GtkWidget *vbox2;
   GtkWidget *picker;
-  GtkWidget *align;
   char *path;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   picker = gtk_file_chooser_button_new ("File Chooser Button",
                                        GTK_FILE_CHOOSER_ACTION_OPEN);
   gtk_widget_set_size_request (picker, 150, -1);
-  gtk_container_add (GTK_CONTAINER (align), picker);
-  gtk_box_pack_start (GTK_BOX (vbox2), align, FALSE, FALSE);
+  gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
+  gtk_box_pack_start (GTK_BOX (vbox2), picker, FALSE, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox2),
                      gtk_label_new ("File Button (Files)"),
                      FALSE, FALSE);
@@ -651,15 +632,15 @@ create_file_button (void)
                      FALSE, FALSE);
 
   vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   picker = gtk_file_chooser_button_new ("File Chooser Button",
                                        GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
   gtk_widget_set_size_request (picker, 150, -1);
   path = g_build_filename (g_get_home_dir (), "Documents", NULL);
   gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (picker), path);
   g_free (path);
-  gtk_container_add (GTK_CONTAINER (align), picker);
-  gtk_box_pack_start (GTK_BOX (vbox2), align, FALSE, FALSE);
+  gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
+  gtk_box_pack_start (GTK_BOX (vbox2), picker, FALSE, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox2),
                      gtk_label_new ("File Button (Select Folder)"),
                      FALSE, FALSE);
@@ -885,7 +866,7 @@ create_toolpalette (void)
 static WidgetInfo *
 create_menubar (void)
 {
-  GtkWidget *widget, *vbox, *align, *item;
+  GtkWidget *widget, *vbox, *item;
 
   widget = gtk_menu_bar_new ();
 
@@ -899,9 +880,9 @@ create_menubar (void)
   gtk_menu_shell_append (GTK_MENU_SHELL (widget), item);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  align = gtk_alignment_new (0.5, 0.5, 1.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
-  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
+  gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Menu Bar"),
                      FALSE, FALSE);
@@ -973,15 +954,14 @@ create_progressbar (void)
 {
   GtkWidget *vbox;
   GtkWidget *widget;
-  GtkWidget *align;
 
   widget = gtk_progress_bar_new ();
   gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR (widget), 0.5);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  align = gtk_alignment_new (0.5, 0.5, 1.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
-  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
+  gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Progress Bar"),
                      FALSE, FALSE);
@@ -1026,15 +1006,15 @@ static WidgetInfo *
 create_scrollbar (void)
 {
   GtkWidget *widget;
-  GtkWidget *vbox, *align;
+  GtkWidget *vbox;
 
   widget = gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, NULL);
   gtk_widget_set_size_request (widget, 100, -1);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  align = gtk_alignment_new (0.5, 0.5, 1.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
-  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
+  gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Scrollbar"),
                      FALSE, FALSE);
@@ -1046,14 +1026,14 @@ static WidgetInfo *
 create_spinbutton (void)
 {
   GtkWidget *widget;
-  GtkWidget *vbox, *align;
+  GtkWidget *vbox;
 
   widget = gtk_spin_button_new_with_range (0.0, 100.0, 1.0);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
-  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
+  gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Spin Button"),
                      FALSE, FALSE);
@@ -1066,20 +1046,17 @@ create_statusbar (void)
 {
   WidgetInfo *info;
   GtkWidget *widget;
-  GtkWidget *vbox, *align;
+  GtkWidget *vbox;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), gtk_label_new ("Status Bar"));
   gtk_box_pack_start (GTK_BOX (vbox),
-                     align,
-                     FALSE, FALSE);
+                      gtk_label_new ("Status Bar"),
+                      FALSE, FALSE);
   widget = gtk_statusbar_new ();
-  align = gtk_alignment_new (0.5, 1.0, 1.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
+  gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
   gtk_statusbar_push (GTK_STATUSBAR (widget), 0, "Hold on...");
 
-  gtk_box_pack_end (GTK_BOX (vbox), align, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), widget, FALSE, FALSE);
 
   info = new_widget_info ("statusbar", vbox, SMALL);
 
@@ -1116,15 +1093,15 @@ static WidgetInfo *
 create_image (void)
 {
   GtkWidget *widget;
-  GtkWidget *align, *vbox;
+  GtkWidget *vbox;
 
   widget = gtk_image_new_from_icon_name ("applications-graphics",
                                          GTK_ICON_SIZE_DIALOG);
+  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
-  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Image"),
                      FALSE, FALSE);
@@ -1136,16 +1113,16 @@ static WidgetInfo *
 create_spinner (void)
 {
   GtkWidget *widget;
-  GtkWidget *align, *vbox;
+  GtkWidget *vbox;
 
   widget = gtk_spinner_new ();
   gtk_widget_set_size_request (widget, 24, 24);
   gtk_spinner_start (GTK_SPINNER (widget));
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
-  gtk_container_add (GTK_CONTAINER (align), widget);
-  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
+  gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Spinner"),
                      FALSE, FALSE);
@@ -1210,13 +1187,13 @@ static WidgetInfo *
 create_appchooserbutton (void)
 {
   GtkWidget *picker;
-  GtkWidget *align, *vbox;
+  GtkWidget *vbox;
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
   picker = gtk_app_chooser_button_new ("text/plain");
-  gtk_container_add (GTK_CONTAINER (align), picker);
-  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
+  gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
+  gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                       gtk_label_new ("Application Button"),
                       FALSE, FALSE);
@@ -1296,15 +1273,14 @@ create_placessidebar (void)
 {
   GtkWidget *bar;
   GtkWidget *vbox;
-  GtkWidget *align;
 
   bar = gtk_places_sidebar_new ();
   gtk_widget_set_size_request (bar, 150, 300);
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  align = gtk_alignment_new (0.5, 0.5, 0.0, 0.0);
+  gtk_widget_set_halign (bar, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (bar, GTK_ALIGN_CENTER);
 
-  gtk_container_add (GTK_CONTAINER (align), bar);
-  gtk_box_pack_start (GTK_BOX (vbox), align, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                       gtk_label_new ("Places Sidebar"),
                       FALSE, FALSE);
diff --git a/gtk/a11y/gtkbuttonaccessible.c b/gtk/a11y/gtkbuttonaccessible.c
index 90fb259..b17db64 100644
--- a/gtk/a11y/gtkbuttonaccessible.c
+++ b/gtk/a11y/gtkbuttonaccessible.c
@@ -100,10 +100,6 @@ get_label_from_button (GtkWidget *button)
   GtkWidget *child;
 
   child = gtk_bin_get_child (GTK_BIN (button));
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  if (GTK_IS_ALIGNMENT (child))
-    child = gtk_bin_get_child (GTK_BIN (child));
-G_GNUC_END_IGNORE_DEPRECATIONS
 
   if (GTK_IS_CONTAINER (child))
     child = find_label_child (GTK_CONTAINER (child));
diff --git a/gtk/a11y/gtkwidgetaccessible.c b/gtk/a11y/gtkwidgetaccessible.c
index ffa42a2..e3b9ee8 100644
--- a/gtk/a11y/gtkwidgetaccessible.c
+++ b/gtk/a11y/gtkwidgetaccessible.c
@@ -281,18 +281,12 @@ gtk_widget_accessible_ref_relation_set (AtkObject *obj)
               GtkWidget *temp_widget;
 
               temp_widget = gtk_widget_get_parent (widget);
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-              if (GTK_IS_ALIGNMENT (temp_widget))
+              if (GTK_IS_BOX (temp_widget))
                 {
-                  temp_widget = gtk_widget_get_parent (temp_widget);
-                  if (GTK_IS_BOX (temp_widget))
-                    {
-                      label = find_label (temp_widget);
-                      if (!label)
-                        label = find_label (gtk_widget_get_parent (temp_widget));
-                    }
+                  label = find_label (temp_widget);
+                  if (!label)
+                    label = find_label (gtk_widget_get_parent (temp_widget));
                 }
-G_GNUC_END_IGNORE_DEPRECATIONS
             }
           else if (GTK_IS_COMBO_BOX (widget))
             /*
diff --git a/gtk/deprecated/Makefile.inc b/gtk/deprecated/Makefile.inc
index 371be26..fdc44f0 100644
--- a/gtk/deprecated/Makefile.inc
+++ b/gtk/deprecated/Makefile.inc
@@ -2,7 +2,6 @@ deprecated_h_sources =                  \
        deprecated/gtkactivatable.h     \
        deprecated/gtkaction.h          \
        deprecated/gtkactiongroup.h     \
-       deprecated/gtkalignment.h       \
        deprecated/gtkgradient.h        \
        deprecated/gtkradioaction.h     \
        deprecated/gtkrecentaction.h    \
@@ -19,7 +18,6 @@ deprecated_c_sources =                        \
        deprecated/gtkactivatable.c     \
        deprecated/gtkaction.c          \
        deprecated/gtkactiongroup.c     \
-       deprecated/gtkalignment.c       \
        deprecated/gtkgradient.c        \
        deprecated/gtkradioaction.c     \
        deprecated/gtkrecentaction.c    \
diff --git a/gtk/gtk.h b/gtk/gtk.h
index 610a920..5d58d62 100644
--- a/gtk/gtk.h
+++ b/gtk/gtk.h
@@ -247,7 +247,6 @@
 #include <gtk/deprecated/gtkactivatable.h>
 #include <gtk/deprecated/gtkaction.h>
 #include <gtk/deprecated/gtkactiongroup.h>
-#include <gtk/deprecated/gtkalignment.h>
 #include <gtk/deprecated/gtkgradient.h>
 #include <gtk/deprecated/gtkradioaction.h>
 #include <gtk/deprecated/gtkrecentaction.h>
diff --git a/gtk/gtktoolitemgroup.c b/gtk/gtktoolitemgroup.c
index 6dd1571..99628a2 100644
--- a/gtk/gtktoolitemgroup.c
+++ b/gtk/gtktoolitemgroup.c
@@ -125,7 +125,7 @@ G_DEFINE_TYPE_WITH_CODE (GtkToolItemGroup, gtk_tool_item_group, GTK_TYPE_CONTAIN
                                                 gtk_tool_item_group_tool_shell_init));
 
 static GtkWidget*
-gtk_tool_item_group_get_alignment (GtkToolItemGroup *group)
+gtk_tool_item_group_get_frame (GtkToolItemGroup *group)
 {
   return gtk_bin_get_child (GTK_BIN (group->priv->header));
 }
@@ -335,8 +335,8 @@ gtk_tool_item_group_header_clicked_cb (GtkButton *button,
 static void
 gtk_tool_item_group_header_adjust_style (GtkToolItemGroup *group)
 {
-  GtkWidget *alignment = gtk_tool_item_group_get_alignment (group);
-  GtkWidget *label_widget = gtk_bin_get_child (GTK_BIN (alignment));
+  GtkWidget *frame = gtk_bin_get_child (GTK_BIN (group->priv->header));
+  GtkWidget *label_widget = gtk_bin_get_child (GTK_BIN (frame));
   GtkWidget *widget = GTK_WIDGET (group);
   GtkToolItemGroupPrivate* priv = group->priv;
   gint dx = 0, dy = 0;
@@ -346,8 +346,6 @@ gtk_tool_item_group_header_adjust_style (GtkToolItemGroup *group)
                         "header-spacing", &(priv->header_spacing),
                         "expander-size", &(priv->expander_size),
                         NULL);
-  
-  gtk_widget_set_size_request (alignment, -1, priv->expander_size);
 
   switch (gtk_tool_shell_get_orientation (GTK_TOOL_SHELL (group)))
     {
@@ -375,9 +373,8 @@ gtk_tool_item_group_header_adjust_style (GtkToolItemGroup *group)
         break;
     }
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  gtk_alignment_set_padding (GTK_ALIGNMENT (alignment), dy, 0, dx, 0);
-G_GNUC_END_IGNORE_DEPRECATIONS
+  gtk_widget_set_margin_start (frame, dx);
+  gtk_widget_set_margin_top (frame, dy);
 }
 
 static void
@@ -398,7 +395,7 @@ update_arrow_state (GtkToolItemGroup *group)
 static void
 gtk_tool_item_group_init (GtkToolItemGroup *group)
 {
-  GtkWidget *alignment;
+  GtkWidget *frame;
   GtkToolItemGroupPrivate* priv;
   GtkCssNode *widget_node;
 
@@ -414,21 +411,20 @@ gtk_tool_item_group_init (GtkToolItemGroup *group)
   priv->label_widget = gtk_label_new (NULL);
   gtk_widget_set_halign (priv->label_widget, GTK_ALIGN_START);
   gtk_widget_set_valign (priv->label_widget, GTK_ALIGN_CENTER);
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
-G_GNUC_END_IGNORE_DEPRECATIONS
-  gtk_container_add (GTK_CONTAINER (alignment), priv->label_widget);
-  gtk_widget_show_all (alignment);
+  frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
+  gtk_container_add (GTK_CONTAINER (frame), priv->label_widget);
+  gtk_widget_show_all (frame);
 
   priv->header = gtk_button_new ();
   g_object_ref_sink (priv->header);
   gtk_widget_set_focus_on_click (priv->header, FALSE);
-  gtk_container_add (GTK_CONTAINER (priv->header), alignment);
+  gtk_container_add (GTK_CONTAINER (priv->header), frame);
   gtk_widget_set_parent (priv->header, GTK_WIDGET (group));
 
   gtk_tool_item_group_header_adjust_style (group);
 
-  g_signal_connect_after (alignment, "draw",
+  g_signal_connect_after (frame, "draw",
                           G_CALLBACK (gtk_tool_item_group_header_draw_cb),
                           group);
 
@@ -1773,7 +1769,7 @@ gtk_tool_item_group_set_label_widget (GtkToolItemGroup *group,
                                       GtkWidget        *label_widget)
 {
   GtkToolItemGroupPrivate* priv;
-  GtkWidget *alignment;
+  GtkWidget *frame;
 
   g_return_if_fail (GTK_IS_TOOL_ITEM_GROUP (group));
   g_return_if_fail (label_widget == NULL || GTK_IS_WIDGET (label_widget));
@@ -1784,17 +1780,17 @@ gtk_tool_item_group_set_label_widget (GtkToolItemGroup *group,
   if (priv->label_widget == label_widget)
     return;
 
-  alignment = gtk_tool_item_group_get_alignment (group);
+  frame = gtk_tool_item_group_get_frame (group);
 
   if (priv->label_widget)
     {
       gtk_widget_set_state_flags (priv->label_widget, 0, TRUE);
-      gtk_container_remove (GTK_CONTAINER (alignment), priv->label_widget);
+      gtk_container_remove (GTK_CONTAINER (frame), priv->label_widget);
     }
 
 
   if (label_widget)
-      gtk_container_add (GTK_CONTAINER (alignment), label_widget);
+      gtk_container_add (GTK_CONTAINER (frame), label_widget);
 
   priv->label_widget = label_widget;
 
@@ -1851,14 +1847,14 @@ gtk_tool_item_group_force_expose (GtkToolItemGroup *group)
 
   if (gtk_widget_get_realized (priv->header))
     {
-      GtkAllocation alignment_allocation;
-      GtkWidget *alignment = gtk_tool_item_group_get_alignment (group);
+      GtkAllocation frame_allocation;
+      GtkWidget *frame = gtk_tool_item_group_get_frame (group);
       GdkRectangle area;
 
       /* Find the header button's arrow area... */
-      gtk_widget_get_allocation (alignment, &alignment_allocation);
-      area.x = alignment_allocation.x;
-      area.y = alignment_allocation.y + (alignment_allocation.height - priv->expander_size) / 2;
+      gtk_widget_get_allocation (frame, &frame_allocation);
+      area.x = frame_allocation.x;
+      area.y = frame_allocation.y + (frame_allocation.height - priv->expander_size) / 2;
       area.height = priv->expander_size;
       area.width = priv->expander_size;
 
@@ -2032,9 +2028,9 @@ gtk_tool_item_group_get_label (GtkToolItemGroup *group)
 GtkWidget*
 gtk_tool_item_group_get_label_widget (GtkToolItemGroup *group)
 {
-  GtkWidget *alignment = gtk_tool_item_group_get_alignment (group);
+  GtkWidget *frame = gtk_tool_item_group_get_frame (group);
 
-  return gtk_bin_get_child (GTK_BIN (alignment));
+  return gtk_bin_get_child (GTK_BIN (frame));
 }
 
 /**
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 0b625f6..beed165 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -25,7 +25,6 @@
 #include "gtktreeprivate.h"
 #include "gtkcelllayout.h"
 #include "gtkbutton.h"
-#include "deprecated/gtkalignment.h"
 #include "gtklabel.h"
 #include "gtkbox.h"
 #include "gtkmarshalers.h"
@@ -130,7 +129,7 @@ struct _GtkTreeViewColumnPrivate
   GtkWidget *button;
   GtkWidget *child;
   GtkWidget *arrow;
-  GtkWidget *alignment;
+  GtkWidget *frame;
   GdkWindow *window;
   gulong property_changed_signal;
   gfloat xalign;
@@ -831,9 +830,9 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column)
                    G_CALLBACK (gtk_tree_view_column_button_clicked),
                    tree_column);
 
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  priv->alignment = gtk_alignment_new (priv->xalign, 0.5, 0.0, 0.0);
-G_GNUC_END_IGNORE_DEPRECATIONS
+  priv->frame = gtk_frame_new (NULL);
+  gtk_frame_set_shadow_type (GTK_FRAME (priv->frame), GTK_SHADOW_NONE);
+  gtk_widget_set_halign (priv->frame, GTK_ALIGN_START);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   priv->arrow = gtk_image_new_from_icon_name ("pan-down-symbolic", GTK_ICON_SIZE_BUTTON);
@@ -852,20 +851,20 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 
   if (priv->xalign <= 0.5)
     {
-      gtk_box_pack_start (GTK_BOX (hbox), priv->alignment, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), priv->frame, TRUE, TRUE);
       gtk_box_pack_start (GTK_BOX (hbox), priv->arrow, FALSE, FALSE);
     }
   else
     {
       gtk_box_pack_start (GTK_BOX (hbox), priv->arrow, FALSE, FALSE);
-      gtk_box_pack_start (GTK_BOX (hbox), priv->alignment, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), priv->frame, TRUE, TRUE);
     }
 
-  gtk_container_add (GTK_CONTAINER (priv->alignment), child);
+  gtk_container_add (GTK_CONTAINER (priv->frame), child);
   gtk_container_add (GTK_CONTAINER (priv->button), hbox);
 
   gtk_widget_show (hbox);
-  gtk_widget_show (priv->alignment);
+  gtk_widget_show (priv->frame);
 }
 
 static void 
@@ -874,7 +873,7 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
   GtkTreeViewColumnPrivate *priv = tree_column->priv;
   gint sort_column_id = -1;
   GtkWidget *hbox;
-  GtkWidget *alignment;
+  GtkWidget *frame;
   GtkWidget *arrow;
   GtkWidget *current_child;
   const gchar *icon_name = "missing-image";
@@ -886,22 +885,18 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
     model = NULL;
 
   hbox = gtk_bin_get_child (GTK_BIN (priv->button));
-  alignment = priv->alignment;
+  frame = priv->frame;
   arrow = priv->arrow;
-  current_child = gtk_bin_get_child (GTK_BIN (alignment));
+  current_child = gtk_bin_get_child (GTK_BIN (frame));
 
   /* Set up the actual button */
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  gtk_alignment_set (GTK_ALIGNMENT (alignment), priv->xalign, 0.5, 0.0, 0.0);
-G_GNUC_END_IGNORE_DEPRECATIONS
-      
   if (priv->child)
     {
       if (current_child != priv->child)
        {
-         gtk_container_remove (GTK_CONTAINER (alignment),
+          gtk_container_remove (GTK_CONTAINER (frame),
                                current_child);
-         gtk_container_add (GTK_CONTAINER (alignment),
+          gtk_container_add (GTK_CONTAINER (frame),
                             priv->child);
        }
     }
@@ -911,7 +906,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
        {
          current_child = gtk_label_new (NULL);
          gtk_widget_show (current_child);
-         gtk_container_add (GTK_CONTAINER (alignment),
+          gtk_container_add (GTK_CONTAINER (frame),
                             current_child);
        }
 
diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c
index e2cea6b..0dfa432 100644
--- a/tests/testadjustsize.c
+++ b/tests/testadjustsize.c
@@ -26,7 +26,6 @@ enum {
   TEST_WIDGET_LABEL,
   TEST_WIDGET_VERTICAL_LABEL,
   TEST_WIDGET_WRAP_LABEL,
-  TEST_WIDGET_ALIGNMENT,
   TEST_WIDGET_IMAGE,
   TEST_WIDGET_BUTTON,
   TEST_WIDGET_LAST
@@ -64,36 +63,6 @@ create_button (void)
   return gtk_button_new_with_label ("BUTTON!");
 }
 
-static gboolean
-on_draw_alignment (GtkWidget      *widget,
-                   cairo_t        *cr,
-                   void           *data)
-{
-  cairo_set_source_rgb (cr, 1.0, 0.0, 0.0);
-  cairo_paint (cr);
-
-  return FALSE;
-}
-
-static GtkWidget*
-create_alignment (void)
-{
-  GtkWidget *alignment;
-
-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
-  alignment = gtk_alignment_new (0.5, 0.5, 1.0, 1.0);
-G_GNUC_END_IGNORE_DEPRECATIONS
-
-  /* make the alignment visible */
-  gtk_widget_set_redraw_on_allocate (alignment, TRUE);
-  g_signal_connect (G_OBJECT (alignment),
-                    "draw",
-                    G_CALLBACK (on_draw_alignment),
-                    NULL);
-
-  return alignment;
-}
-
 static void
 open_test_window (void)
 {
@@ -113,7 +82,6 @@ open_test_window (void)
   test_widgets[TEST_WIDGET_VERTICAL_LABEL] = create_label (TRUE, FALSE);
   test_widgets[TEST_WIDGET_WRAP_LABEL] = create_label (FALSE, TRUE);
   test_widgets[TEST_WIDGET_BUTTON] = create_button ();
-  test_widgets[TEST_WIDGET_ALIGNMENT] = create_alignment ();
 
   grid = gtk_grid_new ();
 
diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c
index 66e9531..444a201 100644
--- a/tests/testheightforwidth.c
+++ b/tests/testheightforwidth.c
@@ -634,15 +634,10 @@ TestInterface interfaces[] = {
     "        <property name=\"visible\">True</property>"
     "        <property name=\"label_xalign\">0</property>"
     "        <child>"
-    "          <object class=\"GtkAlignment\" id=\"alignment1\">"
+    "          <object class=\"GtkLabel\" id=\"label2\">"
     "            <property name=\"visible\">True</property>"
-    "            <property name=\"left_padding\">12</property>"
-    "            <child>"
-    "              <object class=\"GtkLabel\" id=\"label2\">"
-    "                <property name=\"visible\">True</property>"
-    "                <property name=\"label\" translatable=\"yes\">some content</property>"
-    "              </object>"
-    "            </child>"
+    "            <property name=\"margin-start\">12</property>"
+    "            <property name=\"label\" translatable=\"yes\">some content</property>"
     "          </object>"
     "        </child>"
     "        <child type=\"label\">"
diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 888f9d5..0557092 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -716,7 +716,6 @@ test_types (void)
     "<interface>"
     "  <object class=\"GtkAction\" id=\"action\"/>"
     "  <object class=\"GtkActionGroup\" id=\"actiongroup\"/>"
-    "  <object class=\"GtkAlignment\" id=\"alignment\"/>"
     "  <object class=\"GtkButton\" id=\"button\"/>"
     "  <object class=\"GtkCheckButton\" id=\"checkbutton\"/>"
     "  <object class=\"GtkDialog\" id=\"dialog\"/>"
diff --git a/testsuite/gtk/notify.c b/testsuite/gtk/notify.c
index 048ef22..853385f 100644
--- a/testsuite/gtk/notify.c
+++ b/testsuite/gtk/notify.c
@@ -556,11 +556,6 @@ test_type (gconstpointer data)
            g_str_equal (pspec->name, "stock-detail")))
         continue;
 
-       if (g_str_equal (g_type_name (pspec->owner_type), "GtkArrow") ||
-          g_str_equal (g_type_name (pspec->owner_type), "GtkAlignment") ||
-          g_str_equal (g_type_name (pspec->owner_type), "GtkMisc"))
-        continue;
-
       if (g_type_is_a (pspec->owner_type, GTK_TYPE_MENU) &&
          g_str_equal (pspec->name, "tearoff-state"))
         continue;
diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am
index 10eb8b4..b434825 100644
--- a/testsuite/reftests/Makefile.am
+++ b/testsuite/reftests/Makefile.am
@@ -77,9 +77,6 @@ testdata = \
        actionbar.css \
        actionbar.ref.ui \
        actionbar.ui \
-       alignment-props.css \
-       alignment-props.ref.ui \
-       alignment-props.ui \
        animation-direction.css \
        animation-direction.ref.ui \
        animation-direction.ui \
diff --git a/testsuite/reftests/inherit-and-initial.ref.ui b/testsuite/reftests/inherit-and-initial.ref.ui
index 2a3f7a1..0c10ae5 100644
--- a/testsuite/reftests/inherit-and-initial.ref.ui
+++ b/testsuite/reftests/inherit-and-initial.ref.ui
@@ -1489,11 +1489,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment1">
+                      <object class="GtkBox">
                         <property name="name">inherit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
+                        <property name="margin-start">12</property>
                         <child>
                           <placeholder/>
                         </child>
@@ -1523,11 +1523,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">out</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment2">
+                      <object class="GtkBox">
                         <property name="name">inherit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
+                        <property name="margin-start">12</property>
                         <child>
                           <placeholder/>
                         </child>
@@ -1556,11 +1556,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                     <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment3">
+                      <object class="GtkBox">
                         <property name="name">inherit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
+                        <property name="margin-start">12</property>
                         <child>
                           <placeholder/>
                         </child>
@@ -1590,11 +1590,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">etched-out</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment4">
+                      <object class="GtkBox">
                         <property name="name">inherit</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
+                        <property name="margin-start">12</property>
                         <child>
                           <placeholder/>
                         </child>
diff --git a/testsuite/reftests/inherit-and-initial.ui b/testsuite/reftests/inherit-and-initial.ui
index f8aa6af..4175473 100644
--- a/testsuite/reftests/inherit-and-initial.ui
+++ b/testsuite/reftests/inherit-and-initial.ui
@@ -1380,10 +1380,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">in</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment1">
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
+                        <property name="margin-start">12</property>
                         <child>
                           <placeholder/>
                         </child>
@@ -1411,10 +1411,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">out</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment2">
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
+                        <property name="margin-start">12</property>
                         <child>
                           <placeholder/>
                         </child>
@@ -1441,10 +1441,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                     <property name="can_focus">False</property>
                     <property name="label_xalign">0</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment3">
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
+                        <property name="margin-start">12</property>
                         <child>
                           <placeholder/>
                         </child>
@@ -1472,10 +1472,10 @@ Suspendisse feugiat quam quis dolor accumsan cursus. </property>
                     <property name="label_xalign">0</property>
                     <property name="shadow_type">etched-out</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment4">
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="left_padding">12</property>
+                        <property name="margin-start">12</property>
                         <child>
                           <placeholder/>
                         </child>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]