Drop the margin property

Replace it with margin-start, -end, -top, -bottom throughout.

24 files changed, 174 insertions, 44 deletions

diff --git a/tests/gdkgears.c b/tests/gdkgears.c
index dcb31ee209..e16b24b7a9 100644
--- a/tests/gdkgears.c
+++ b/tests/gdkgears.c
@@ -135,7 +135,11 @@ main (int argc, char *argv[])
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
   overlay = gtk_overlay_new ();
-  g_object_set (overlay, "margin", 12, NULL);
+  gtk_widget_set_margin_start (overlay, 12);
+  gtk_widget_set_margin_end (overlay, 12);
+  gtk_widget_set_margin_top (overlay, 12);
+  gtk_widget_set_margin_bottom (overlay, 12);
+
   gtk_container_add (GTK_CONTAINER (window), overlay);
   gtk_widget_show (overlay);
 
diff --git a/tests/popover2.ui b/tests/popover2.ui
index 3a97c1fca2..bca652fa38 100644
--- a/tests/popover2.ui
+++ b/tests/popover2.ui
@@ -158,7 +158,10 @@
       <object class="GtkBox">
         <property name="name">submenu1</property>
         <property name="orientation">vertical</property>
-        <property name="margin">10</property>
+        <property name="margin-start">10</property>
+        <property name="margin-end">10</property>
+        <property name="margin-top">10</property>
+        <property name="margin-bottom">10</property>
         <child>
           <object class="GtkBox">
             <property name="orientation">vertical</property>
@@ -355,7 +358,10 @@
       <object class="GtkBox">
         <property name="name">submenu2</property>
         <property name="orientation">vertical</property>
-        <property name="margin">10</property>
+        <property name="margin-start">10</property>
+        <property name="margin-end">10</property>
+        <property name="margin-top">10</property>
+        <property name="margin-bottom">10</property>
         <child>
           <object class="GtkModelButton">
             <property name="action-name">top.action7</property>
@@ -382,7 +388,10 @@
       <object class="GtkBox">
         <property name="name">subsubmenu</property>
         <property name="orientation">vertical</property>
-        <property name="margin">10</property>
+        <property name="margin-start">10</property>
+        <property name="margin-end">10</property>
+        <property name="margin-top">10</property>
+        <property name="margin-bottom">10</property>
         <child>
           <object class="GtkModelButton">
             <property name="action-name">action8</property>
diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c
index 2b145c2a29..c286b6e13f 100644
--- a/tests/testadjustsize.c
+++ b/tests/testadjustsize.c
@@ -296,8 +296,7 @@ open_margin_window (void)
     "margin-start",
     "margin-end",
     "margin-top",
-    "margin-bottom",
-    "margin"
+    "margin-bottom"
   };
 
   test_window = gtk_window_new ();
diff --git a/tests/testborderdrawing.c b/tests/testborderdrawing.c
index a9b0b2cd8e..f193ee9e3f 100644
--- a/tests/testborderdrawing.c
+++ b/tests/testborderdrawing.c
@@ -110,7 +110,10 @@ main (int argc, char **argv)
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 40);
   top = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 40);
   bottom = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 40);
-  g_object_set (box, "margin", 40, NULL);
+  gtk_widget_set_margin_start (box, 40);
+  gtk_widget_set_margin_end (box, 40);
+  gtk_widget_set_margin_top (box, 40);
+  gtk_widget_set_margin_bottom (box, 40);
 
   w = gtk_button_new ();
   gtk_widget_set_valign (w, GTK_ALIGN_CENTER);
diff --git a/tests/testbox.c b/tests/testbox.c
index ccb6a827ac..db28fdd4e1 100644
--- a/tests/testbox.c
+++ b/tests/testbox.c
@@ -20,7 +20,10 @@ edit_widget (GtkWidget *button)
 
       grid = gtk_grid_new ();
       g_object_set (grid,
-                    "margin", 20,
+                    "margin-start", 20,
+                    "margin-end", 20,
+                    "margin-top", 20,
+                    "margin-bottom", 20,
                     "row-spacing", 10,
                     "column-spacing", 10,
                     NULL);
@@ -102,13 +105,19 @@ main (int argc, char *argv[])
   g_object_bind_property (box, "homogeneous",
                           check, "active",
                           G_BINDING_BIDIRECTIONAL|G_BINDING_SYNC_CREATE);
-  g_object_set (check, "margin", 10, NULL);
+  gtk_widget_set_margin_start (check, 10);
+  gtk_widget_set_margin_end (check, 10);
+  gtk_widget_set_margin_top (check, 10);
+  gtk_widget_set_margin_bottom (check, 10);
   gtk_widget_set_halign (check, GTK_ALIGN_CENTER);
   gtk_widget_show (check);
   gtk_container_add (GTK_CONTAINER (vbox), check);
 
   b = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-  g_object_set (b, "margin", 10, NULL);
+  gtk_widget_set_margin_start (b, 10);
+  gtk_widget_set_margin_end (b, 10);
+  gtk_widget_set_margin_top (b, 10);
+  gtk_widget_set_margin_bottom (b, 10);
   gtk_widget_set_halign (b, GTK_ALIGN_CENTER);
   label = gtk_label_new ("Spacing:");
   gtk_widget_set_halign (label, GTK_ALIGN_END);
diff --git a/tests/testdialog.c b/tests/testdialog.c
index c627f73f2d..d53874e3b6 100644
--- a/tests/testdialog.c
+++ b/tests/testdialog.c
@@ -95,7 +95,10 @@ add_content (GtkWidget *dialog)
   GtkWidget *label;
 
   label = gtk_label_new ("content");
-  g_object_set (label, "margin", 50, NULL);
+  gtk_widget_set_margin_start (label, 50);
+  gtk_widget_set_margin_end (label, 50);
+  gtk_widget_set_margin_top (label, 50);
+  gtk_widget_set_margin_bottom (label, 50);
   gtk_widget_show (label);
 
   gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), label);
diff --git a/tests/testdnd2.c b/tests/testdnd2.c
index 4438e3a1d4..17b1abcbbb 100644
--- a/tests/testdnd2.c
+++ b/tests/testdnd2.c
@@ -408,7 +408,10 @@ main (int argc, char *Argv[])
 
   grid = gtk_grid_new ();
   g_object_set (grid,
-                "margin", 20,
+                "margin-start", 20,
+                "margin-end", 20,
+                "margin-top", 20,
+                "margin-bottom", 20,
                 "row-spacing", 20,
                 "column-spacing", 20,
                 NULL);
diff --git a/tests/testentryicons.c b/tests/testentryicons.c
index 14d3cb6b5d..9c571a1168 100644
--- a/tests/testentryicons.c
+++ b/tests/testentryicons.c
@@ -114,7 +114,10 @@ main (int argc, char **argv)
   gtk_container_add (GTK_CONTAINER (window), grid);
   gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
   gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
-  g_object_set (grid, "margin", 10, NULL);
+  gtk_widget_set_margin_start (grid, 10);
+  gtk_widget_set_margin_end (grid, 10);
+  gtk_widget_set_margin_top (grid, 10);
+  gtk_widget_set_margin_bottom (grid, 10);
 
   /*
    * Open File - Sets the icon using a GIcon
@@ -274,7 +277,10 @@ main (int argc, char **argv)
   gtk_container_add (GTK_CONTAINER (box), entry);
   image = gtk_image_new_from_icon_name ("edit-find-symbolic");
   gtk_widget_set_cursor_from_name (image, "default");
-  g_object_set (image, "margin", 6, NULL);
+  gtk_widget_set_margin_start (image, 6);
+  gtk_widget_set_margin_end (image, 6);
+  gtk_widget_set_margin_top (image, 6);
+  gtk_widget_set_margin_bottom (image, 6);
   gtk_widget_set_tooltip_text (image, "Click me");
 
   GtkGesture *gesture;
@@ -283,7 +289,10 @@ main (int argc, char **argv)
   gtk_widget_add_controller (image, GTK_EVENT_CONTROLLER (gesture));
   gtk_container_add (GTK_CONTAINER (box), image);
   image = gtk_image_new_from_icon_name ("document-save-symbolic");
-  g_object_set (image, "margin", 6, NULL);
+  gtk_widget_set_margin_start (image, 6);
+  gtk_widget_set_margin_end (image, 6);
+  gtk_widget_set_margin_top (image, 6);
+  gtk_widget_set_margin_bottom (image, 6);
   gtk_container_add (GTK_CONTAINER (box), image);
   gtk_grid_attach (GTK_GRID (grid), box, 1, 7, 1, 1);
 
diff --git a/tests/testexpand.c b/tests/testexpand.c
index de69040484..4f57d09254 100644
--- a/tests/testexpand.c
+++ b/tests/testexpand.c
@@ -75,7 +75,10 @@ create_box_window (void)
   toggle = gtk_toggle_button_new_with_label ("H Expand");
   gtk_widget_set_halign (toggle, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (toggle, GTK_ALIGN_CENTER);
-  g_object_set (toggle, "margin", 5, NULL);
+  gtk_widget_set_margin_start (toggle, 5);
+  gtk_widget_set_margin_end (toggle, 5);
+  gtk_widget_set_margin_top (toggle, 5);
+  gtk_widget_set_margin_bottom (toggle, 5);
   g_signal_connect (G_OBJECT (toggle), "toggled",
                     G_CALLBACK (on_toggle_hexpand), NULL);
   gtk_container_add (GTK_CONTAINER (colorbox), toggle);
@@ -87,7 +90,10 @@ create_box_window (void)
   toggle = gtk_toggle_button_new_with_label ("V Expand");
   gtk_widget_set_halign (toggle, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (toggle, GTK_ALIGN_CENTER);
-  g_object_set (toggle, "margin", 5, NULL);
+  gtk_widget_set_margin_start (toggle, 5);
+  gtk_widget_set_margin_end (toggle, 5);
+  gtk_widget_set_margin_top (toggle, 5);
+  gtk_widget_set_margin_bottom (toggle, 5);
   g_signal_connect (G_OBJECT (toggle), "toggled",
                     G_CALLBACK (on_toggle_vexpand), NULL);
   gtk_container_add (GTK_CONTAINER (colorbox), toggle);
@@ -122,7 +128,10 @@ create_grid_window (void)
   toggle = gtk_toggle_button_new_with_label ("H Expand");
   gtk_widget_set_halign (toggle, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (toggle, GTK_ALIGN_CENTER);
-  g_object_set (toggle, "margin", 5, NULL);
+  gtk_widget_set_margin_start (toggle, 5);
+  gtk_widget_set_margin_end (toggle, 5);
+  gtk_widget_set_margin_top (toggle, 5);
+  gtk_widget_set_margin_bottom (toggle, 5);
   g_signal_connect (G_OBJECT (toggle), "toggled",
                     G_CALLBACK (on_toggle_hexpand), NULL);
   gtk_container_add (GTK_CONTAINER (colorbox), toggle);
@@ -134,7 +143,10 @@ create_grid_window (void)
   toggle = gtk_toggle_button_new_with_label ("V Expand");
   gtk_widget_set_halign (toggle, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (toggle, GTK_ALIGN_CENTER);
-  g_object_set (toggle, "margin", 5, NULL);
+  gtk_widget_set_margin_start (toggle, 5);
+  gtk_widget_set_margin_end (toggle, 5);
+  gtk_widget_set_margin_top (toggle, 5);
+  gtk_widget_set_margin_bottom (toggle, 5);
   g_signal_connect (G_OBJECT (toggle), "toggled",
                     G_CALLBACK (on_toggle_vexpand), NULL);
   gtk_container_add (GTK_CONTAINER (colorbox), toggle);
diff --git a/tests/testfilechooserbutton.c b/tests/testfilechooserbutton.c
index 7809cd06fc..2113fa65ea 100644
--- a/tests/testfilechooserbutton.c
+++ b/tests/testfilechooserbutton.c
@@ -304,7 +304,10 @@ main (int   argc,
   g_signal_connect (win, "response", G_CALLBACK (quit_cb), &done);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18);
-  g_object_set (vbox, "margin", 6, NULL);
+  gtk_widget_set_margin_start (vbox, 6);
+  gtk_widget_set_margin_end (vbox, 6);
+  gtk_widget_set_margin_top (vbox, 6);
+  gtk_widget_set_margin_bottom (vbox, 6);
   gtk_container_add (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (win))), vbox);
 
   frame = gtk_frame_new ("<b>GtkFileChooserButton</b>");
diff --git a/tests/testframe.c b/tests/testframe.c
index c943997440..e7ea521c40 100644
--- a/tests/testframe.c
+++ b/tests/testframe.c
@@ -153,7 +153,10 @@ int main (int argc, char **argv)
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
   vbox = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 5));
-  g_object_set (vbox, "margin", 12, NULL);
+  gtk_widget_set_margin_start (vbox, 12);
+  gtk_widget_set_margin_end (vbox, 12);
+  gtk_widget_set_margin_top (vbox, 12);
+  gtk_widget_set_margin_bottom (vbox, 12);
   gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (vbox));
 
   frame = GTK_FRAME (gtk_frame_new ("Test GtkFrame"));
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 3c06592a6a..77fa65e7f0 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -3415,7 +3415,10 @@ dialog_response_cb (GtkWidget *widget, gint response, gpointer unused)
           GtkWidget *label;
 
           label = gtk_label_new ("Dialog Test");
-          g_object_set (label, "margin", 10, NULL);
+          gtk_widget_set_margin_start (label, 10);
+          gtk_widget_set_margin_end (label, 10);
+          gtk_widget_set_margin_top (label, 10);
+          gtk_widget_set_margin_bottom (label, 10);
           gtk_container_add (GTK_CONTAINER (content_area),
                               label);
           gtk_widget_show (label);
@@ -5650,7 +5653,10 @@ create_timeout_test (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "Timeout Test");
 
       label = gtk_label_new ("count: 0");
-      g_object_set (label, "margin", 10, NULL);
+      gtk_widget_set_margin_start (label, 10);
+      gtk_widget_set_margin_end (label, 10);
+      gtk_widget_set_margin_top (label, 10);
+      gtk_widget_set_margin_bottom (label, 10);
       gtk_container_add (GTK_CONTAINER (content_area), label);
       gtk_widget_show (label);
 
diff --git a/tests/testheaderbar.c b/tests/testheaderbar.c
index 5cd92fb0f7..386475d216 100644
--- a/tests/testheaderbar.c
+++ b/tests/testheaderbar.c
@@ -96,7 +96,10 @@ change_header (GtkButton *button, gpointer data)
       header = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
       gtk_style_context_add_class (gtk_widget_get_style_context (header), "titlebar");
       gtk_style_context_add_class (gtk_widget_get_style_context (header), "header-bar");
-      g_object_set (header, "margin", 10, NULL);
+      gtk_widget_set_margin_start (header, 10);
+      gtk_widget_set_margin_end (header, 10);
+      gtk_widget_set_margin_top (header, 10);
+      gtk_widget_set_margin_bottom (header, 10);
       label = gtk_label_new ("Label");
       gtk_container_add (GTK_CONTAINER (header), label);
       widget = gtk_level_bar_new ();
diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c
index 6239831960..ae4ae9cc13 100644
--- a/tests/testheightforwidth.c
+++ b/tests/testheightforwidth.c
@@ -811,7 +811,10 @@ create_window (void)
   window = gtk_window_new ();
   vbox   = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 
-  g_object_set (vbox, "margin", 8, NULL);
+  gtk_widget_set_margin_start (vbox, 8);
+  gtk_widget_set_margin_end (vbox, 8);
+  gtk_widget_set_margin_top (vbox, 8);
+  gtk_widget_set_margin_bottom (vbox, 8);
 
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
diff --git a/tests/testlevelbar.c b/tests/testlevelbar.c
index ffe6710784..0d9cb34d44 100644
--- a/tests/testlevelbar.c
+++ b/tests/testlevelbar.c
@@ -92,7 +92,10 @@ main (int argc, char *argv[])
   window = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (window), 500, 100);
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-  g_object_set (box, "margin", 20, NULL);
+  gtk_widget_set_margin_start (box, 20);
+  gtk_widget_set_margin_end (box, 20);
+  gtk_widget_set_margin_top (box, 20);
+  gtk_widget_set_margin_bottom (box, 20);
   bar = create_level_bar ();
   gtk_container_add (GTK_CONTAINER (window), box);
   gtk_container_add (GTK_CONTAINER (box), bar);
diff --git a/tests/testlist3.c b/tests/testlist3.c
index 72dcc2db28..1e2825de2b 100644
--- a/tests/testlist3.c
+++ b/tests/testlist3.c
@@ -158,7 +158,10 @@ main (int argc, char *argv[])
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_add (GTK_CONTAINER (window), hbox);
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-  g_object_set (vbox, "margin", 12, NULL);
+  gtk_widget_set_margin_start (vbox, 12);
+  gtk_widget_set_margin_end (vbox, 12);
+  gtk_widget_set_margin_top (vbox, 12);
+  gtk_widget_set_margin_bottom (vbox, 12);
   gtk_container_add (GTK_CONTAINER (hbox), vbox);
 
   list = gtk_list_box_new ();
diff --git a/tests/testlogout.c b/tests/testlogout.c
index f0435cad7d..e028c0d0fd 100644
--- a/tests/testlogout.c
+++ b/tests/testlogout.c
@@ -82,7 +82,10 @@ activate (GtkApplication *app,
   win = gtk_window_new ();
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-  g_object_set (box, "margin", 12, NULL);
+  gtk_widget_set_margin_start (box, 12);
+  gtk_widget_set_margin_end (box, 12);
+  gtk_widget_set_margin_top (box, 12);
+  gtk_widget_set_margin_bottom (box, 12);
   gtk_container_add (GTK_CONTAINER (win), box);
 
   grid = gtk_grid_new ();
diff --git a/tests/testoutsetshadowdrawing.c b/tests/testoutsetshadowdrawing.c
index 6f221375cc..3b27b9c8a1 100644
--- a/tests/testoutsetshadowdrawing.c
+++ b/tests/testoutsetshadowdrawing.c
@@ -108,7 +108,10 @@ main (int argc, char **argv)
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 120);
   top = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 120);
   bottom = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 120);
-  g_object_set (box, "margin", 120, NULL);
+  gtk_widget_set_margin_start (box, 120);
+  gtk_widget_set_margin_end (box, 120);
+  gtk_widget_set_margin_top (box, 120);
+  gtk_widget_set_margin_bottom (box, 120);
 
   w = gtk_button_new ();
   gtk_widget_set_valign (w, GTK_ALIGN_CENTER);
diff --git a/tests/testoverlay.c b/tests/testoverlay.c
index ea84ab96d2..62823b4122 100644
--- a/tests/testoverlay.c
+++ b/tests/testoverlay.c
@@ -45,7 +45,11 @@ test_nonzerox (void)
   gtk_window_set_title (GTK_WINDOW (win), "Non-zero X");
 
   grid = gtk_grid_new ();
-  g_object_set (grid, "margin", 5, NULL);
+  gtk_widget_set_margin_start (grid, 5);
+  gtk_widget_set_margin_end (grid, 5);
+  gtk_widget_set_margin_top (grid, 5);
+  gtk_widget_set_margin_bottom (grid, 5);
+
   gtk_container_add (GTK_CONTAINER (win), grid);
   gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Above"), 1, 0, 1, 1);
   gtk_grid_attach (GTK_GRID (grid), gtk_label_new ("Below"), 1, 2, 1, 1);
@@ -64,14 +68,22 @@ test_nonzerox (void)
   child = gtk_label_new ("I'm the overlay");
   gtk_widget_set_halign (child, GTK_ALIGN_START);
   gtk_widget_set_valign (child, GTK_ALIGN_START);
-  g_object_set (child, "margin", 3, NULL);
+  gtk_widget_set_margin_start (child, 3);
+  gtk_widget_set_margin_end (child, 3);
+  gtk_widget_set_margin_top (child, 3);
+  gtk_widget_set_margin_bottom (child, 3);
+
   gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child);
 
   child = gtk_label_new ("No, I'm the overlay");
   gtk_widget_set_halign (child, GTK_ALIGN_END);
   gtk_widget_set_valign (child, GTK_ALIGN_END);
   gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child);
-  g_object_set (child, "margin", 3, NULL);
+  gtk_widget_set_margin_start (child, 3);
+  gtk_widget_set_margin_end (child, 3);
+  gtk_widget_set_margin_top (child, 3);
+  gtk_widget_set_margin_bottom (child, 3);
+
 
   return win;
 }
@@ -135,7 +147,10 @@ test_relative (void)
 
   text = gtk_text_view_new ();
   gtk_widget_set_size_request (text, 200, 200);
-  g_object_set (text, "margin", 5, NULL);
+  gtk_widget_set_margin_start (text, 5);
+  gtk_widget_set_margin_end (text, 5);
+  gtk_widget_set_margin_top (text, 5);
+  gtk_widget_set_margin_bottom (text, 5);
   gtk_widget_set_hexpand (text, TRUE);
   gtk_widget_set_vexpand (text, TRUE);
   gtk_grid_attach (GTK_GRID (grid), text, 1, 1, 1, 1);
@@ -146,13 +161,19 @@ test_relative (void)
   gtk_widget_set_halign (child, GTK_ALIGN_START);
   gtk_widget_set_valign (child, GTK_ALIGN_START);
   gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child);
-  g_object_set (child, "margin", 1, NULL);
+  gtk_widget_set_margin_start (child, 1);
+  gtk_widget_set_margin_end (child, 1);
+  gtk_widget_set_margin_top (child, 1);
+  gtk_widget_set_margin_bottom (child, 1);
 
   child = gtk_label_new ("Bottom right overlay");
   gtk_widget_set_halign (child, GTK_ALIGN_END);
   gtk_widget_set_valign (child, GTK_ALIGN_END);
   gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child);
-  g_object_set (child, "margin", 1, NULL);
+  gtk_widget_set_margin_start (child, 1);
+  gtk_widget_set_margin_end (child, 1);
+  gtk_widget_set_margin_top (child, 1);
+  gtk_widget_set_margin_bottom (child, 1);
 
   return win;
 }
@@ -182,7 +203,10 @@ test_fullwidth (void)
   gtk_widget_set_halign (child, GTK_ALIGN_FILL);
   gtk_widget_set_valign (child, GTK_ALIGN_START);
   gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child);
-  g_object_set (child, "margin", 4, NULL);
+  gtk_widget_set_margin_start (child, 4);
+  gtk_widget_set_margin_end (child, 4);
+  gtk_widget_set_margin_top (child, 4);
+  gtk_widget_set_margin_bottom (child, 4);
 
   return win;
 }
@@ -230,7 +254,10 @@ test_scrolling (void)
   gtk_widget_set_halign (child, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (child, GTK_ALIGN_END);
   gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child);
-  g_object_set (child, "margin", 4, NULL);
+  gtk_widget_set_margin_start (child, 4);
+  gtk_widget_set_margin_end (child, 4);
+  gtk_widget_set_margin_top (child, 4);
+  gtk_widget_set_margin_bottom (child, 4);
 
   return win;
 }
@@ -373,7 +400,10 @@ test_chase (void)
   gtk_widget_set_halign (child, GTK_ALIGN_START);
   gtk_widget_set_valign (child, GTK_ALIGN_END);
   gtk_overlay_add_overlay (GTK_OVERLAY (overlay), child);
-  g_object_set (child, "margin", 4, NULL);
+  gtk_widget_set_margin_start (child, 4);
+  gtk_widget_set_margin_end (child, 4);
+  gtk_widget_set_margin_top (child, 4);
+  gtk_widget_set_margin_bottom (child, 4);
 
   controller = gtk_event_controller_motion_new ();
   g_signal_connect (controller, "enter", G_CALLBACK (on_enter), overlay);
diff --git a/tests/testpopover.c b/tests/testpopover.c
index 310280fec6..a18c5f4459 100644
--- a/tests/testpopover.c
+++ b/tests/testpopover.c
@@ -123,7 +123,10 @@ main (int argc, char *argv[])
   popover2 = (GtkWidget *)gtk_builder_get_object (builder, "popover");
   gtk_menu_button_set_popover (GTK_MENU_BUTTON (button2), popover2);
 
-  g_object_set (box, "margin", 10, NULL);
+  gtk_widget_set_margin_start (box, 10);
+  gtk_widget_set_margin_end (box, 10);
+  gtk_widget_set_margin_top (box, 10);
+  gtk_widget_set_margin_bottom (box, 10);
   gtk_overlay_add_overlay (GTK_OVERLAY (overlay), box);
 
   label = gtk_label_new ("Popover hexpand");
diff --git a/tests/testscrolledge.c b/tests/testscrolledge.c
index 2d76eb8f0d..23663bf520 100644
--- a/tests/testscrolledge.c
+++ b/tests/testscrolledge.c
@@ -40,7 +40,10 @@ populate_list (GtkListBox *list)
       label = gtk_label_new (text);
       g_free (text);
 
-      g_object_set (label, "margin", 10, NULL);
+      gtk_widget_set_margin_start (label, 10);
+      gtk_widget_set_margin_end (label, 10);
+      gtk_widget_set_margin_top (label, 10);
+      gtk_widget_set_margin_bottom (label, 10);
       gtk_widget_set_halign (label, GTK_ALIGN_START);
       gtk_container_add (GTK_CONTAINER (row), label);
       gtk_container_add (GTK_CONTAINER (list), row);
@@ -105,7 +108,10 @@ main (int argc, char *argv[])
   popup = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
   gtk_widget_set_halign (popup, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (popup, GTK_ALIGN_END);
-  g_object_set (popup, "margin", 40, NULL);
+  gtk_widget_set_margin_start (popup, 40);
+  gtk_widget_set_margin_end (popup, 40);
+  gtk_widget_set_margin_top (popup, 40);
+  gtk_widget_set_margin_bottom (popup, 40);
   label = gtk_label_new ("Getting more rows...");
   spinner = gtk_spinner_new ();
   gtk_container_add (GTK_CONTAINER (popup), label);
diff --git a/tests/testselectionmode.c b/tests/testselectionmode.c
index f496409e30..53fc020dc4 100644
--- a/tests/testselectionmode.c
+++ b/tests/testselectionmode.c
@@ -21,7 +21,10 @@ selectable_row_init (SelectableRow *row)
   row->revealer = gtk_revealer_new ();
   gtk_revealer_set_transition_type (GTK_REVEALER (row->revealer), GTK_REVEALER_TRANSITION_TYPE_SLIDE_RIGHT);
   row->check = gtk_check_button_new ();
-  g_object_set (row->check, "margin", 10, NULL);
+  gtk_widget_set_margin_start (row->check, 10);
+  gtk_widget_set_margin_end (row->check, 10);
+  gtk_widget_set_margin_top (row->check, 10);
+  gtk_widget_set_margin_bottom (row->check, 10);
 
   gtk_widget_show (row->box);
   gtk_widget_show (row->check);
diff --git a/tests/testsplitheaders.ui b/tests/testsplitheaders.ui
index 512c22fdca..631194c35a 100644
--- a/tests/testsplitheaders.ui
+++ b/tests/testsplitheaders.ui
@@ -85,7 +85,10 @@
             <property name="vscrollbar-policy">always</property>
             <child>
               <object class="GtkGrid">
-                <property name="margin">20</property>
+                <property name="margin-start">20</property>
+                <property name="margin-end">20</property>
+                <property name="margin-top">20</property>
+                <property name="margin-bottom">20</property>
                 <property name="row-spacing">10</property>
                 <property name="column-spacing">10</property>
                 <child>
diff --git a/tests/testtoolbar2.c b/tests/testtoolbar2.c
index f17880c44e..1007b77150 100644
--- a/tests/testtoolbar2.c
+++ b/tests/testtoolbar2.c
@@ -21,7 +21,11 @@ int main (int argc, char *argv[])
   gtk_widget_set_vexpand (view, TRUE);
   gtk_container_add (GTK_CONTAINER (box), view);
   box3 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  g_object_set (box3, "margin", 10, NULL);
+  gtk_widget_set_margin_start (box3, 10);
+  gtk_widget_set_margin_end (box3, 10);
+  gtk_widget_set_margin_top (box3, 10);
+  gtk_widget_set_margin_bottom (box3, 10);
+
   gtk_style_context_add_class (gtk_widget_get_style_context (box3), GTK_STYLE_CLASS_LINKED);
   button = gtk_button_new_from_icon_name ("document-new-symbolic");
   gtk_container_add (GTK_CONTAINER (box3), button);