Merge branch 'scrolled-window-api' into 'master'

scrolledwindow: Don't take adjustments in new()

See merge request GNOME/gtk!2146

42 files changed, 66 insertions, 64 deletions

diff --git a/tests/listmodel.c b/tests/listmodel.c
index aaaabab9d1..09adaa601f 100644
--- a/tests/listmodel.c
+++ b/tests/listmodel.c
@@ -193,7 +193,7 @@ main (int argc, char *argv[])
   window = gtk_window_new ();
   grid = gtk_grid_new ();
   gtk_window_set_child (GTK_WINDOW (window), grid);
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_AUTOMATIC,
                                   GTK_POLICY_AUTOMATIC);
@@ -205,7 +205,7 @@ main (int argc, char *argv[])
   gtk_list_box_bind_model (GTK_LIST_BOX (box), G_LIST_MODEL (store), create_widget, NULL, NULL);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), box);
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_AUTOMATIC,
                                   GTK_POLICY_AUTOMATIC);
diff --git a/tests/overlayscroll.c b/tests/overlayscroll.c
index 0eb0582b6f..9a447b5c63 100644
--- a/tests/overlayscroll.c
+++ b/tests/overlayscroll.c
@@ -72,7 +72,7 @@ main (int argc, char *argv[])
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 20);
   gtk_window_set_child (GTK_WINDOW (window), box);
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_NEVER,
                                   GTK_POLICY_AUTOMATIC);
diff --git a/tests/scrolling-performance.c b/tests/scrolling-performance.c
index abae772b25..3d5b165623 100644
--- a/tests/scrolling-performance.c
+++ b/tests/scrolling-performance.c
@@ -128,7 +128,7 @@ main (int argc, char **argv)
   frame_stats_ensure (GTK_WINDOW (window));
   gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
 
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  scrolled_window = gtk_scrolled_window_new ();
   gtk_window_set_child (GTK_WINDOW (window), scrolled_window);
 
   viewport = gtk_viewport_new (NULL, NULL);
diff --git a/tests/syncscroll.c b/tests/syncscroll.c
index ffbfc209ca..05338c7607 100644
--- a/tests/syncscroll.c
+++ b/tests/syncscroll.c
@@ -28,7 +28,7 @@ main (int argc, char *argv[])
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
   gtk_window_set_child (GTK_WINDOW (win), box);
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_NEVER,
                                   GTK_POLICY_EXTERNAL);
@@ -40,7 +40,8 @@ main (int argc, char *argv[])
 
   adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (sw));
 
-  sw = gtk_scrolled_window_new (NULL, adj);
+  sw = gtk_scrolled_window_new ();
+  gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (sw), adj);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_NEVER,
                                   GTK_POLICY_EXTERNAL);
@@ -50,7 +51,8 @@ main (int argc, char *argv[])
   fill_text_view (tv, "Middle");
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
 
-  sw = gtk_scrolled_window_new (NULL, adj);
+  sw = gtk_scrolled_window_new ();
+  gtk_scrolled_window_set_vadjustment (GTK_SCROLLED_WINDOW (sw), adj);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_NEVER,
                                   GTK_POLICY_EXTERNAL);
diff --git a/tests/testaccel.c b/tests/testaccel.c
index fedefd4781..9ff403507d 100644
--- a/tests/testaccel.c
+++ b/tests/testaccel.c
@@ -70,7 +70,7 @@ key_test (void)
   window = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_widget_set_vexpand (sw, TRUE);
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
   gtk_window_set_child (GTK_WINDOW (window), box);
diff --git a/tests/testcellrenderertext.c b/tests/testcellrenderertext.c
index ca558dc51a..1f72ccf9db 100644
--- a/tests/testcellrenderertext.c
+++ b/tests/testcellrenderertext.c
@@ -173,7 +173,7 @@ create_tree (gboolean rtl)
   GtkCellRenderer *renderer;
   GdkPixbuf *pixbuf;
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
   gtk_widget_set_direction (sw, rtl ? GTK_TEXT_DIR_RTL : GTK_TEXT_DIR_LTR);
 
diff --git a/tests/testclipboard2.c b/tests/testclipboard2.c
index 40c91b2b72..ed80ffde30 100644
--- a/tests/testclipboard2.c
+++ b/tests/testclipboard2.c
@@ -248,7 +248,7 @@ get_formats_list (GdkClipboard *clipboard)
 {
   GtkWidget *sw, *list;
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
 
   list = gtk_list_box_new ();
   g_signal_connect_object (clipboard, "notify::formats", G_CALLBACK (clipboard_formats_change_cb), list, 0);
diff --git a/tests/testcolumnview.c b/tests/testcolumnview.c
index 6b0b3cbad9..51acea59ff 100644
--- a/tests/testcolumnview.c
+++ b/tests/testcolumnview.c
@@ -709,7 +709,7 @@ main (int argc, char *argv[])
   search_entry = gtk_search_entry_new ();
   gtk_box_append (GTK_BOX (vbox), search_entry);
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_widget_set_hexpand (sw, TRUE);
   gtk_widget_set_vexpand (sw, TRUE);
   gtk_search_entry_set_key_capture_widget (GTK_SEARCH_ENTRY (search_entry), sw);
diff --git a/tests/testcombochange.c b/tests/testcombochange.c
index a4a6ec9b56..01bac3379a 100644
--- a/tests/testcombochange.c
+++ b/tests/testcombochange.c
@@ -227,7 +227,7 @@ main (int argc, char **argv)
   gtk_widget_set_margin_start (combo, 12);
   gtk_box_append (GTK_BOX (combo_vbox), combo);
 
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  scrolled_window = gtk_scrolled_window_new ();
   gtk_widget_set_hexpand (scrolled_window, TRUE);
   gtk_box_append (GTK_BOX (hbox), scrolled_window);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
diff --git a/tests/testflowbox.c b/tests/testflowbox.c
index ece3a969f1..6fef5fa2f4 100644
--- a/tests/testflowbox.c
+++ b/tests/testflowbox.c
@@ -375,7 +375,7 @@ create_window (void)
   gtk_window_set_child (GTK_WINDOW (window), hbox);
   gtk_box_append (GTK_BOX (hbox), vbox);
 
-  swindow = gtk_scrolled_window_new (NULL, NULL);
+  swindow = gtk_scrolled_window_new ();
   gtk_widget_set_hexpand (swindow, TRUE);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
                                   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
diff --git a/tests/testgrid.c b/tests/testgrid.c
index 15948f0063..97c52cb609 100644
--- a/tests/testgrid.c
+++ b/tests/testgrid.c
@@ -262,7 +262,7 @@ scrolling (void)
 
   window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Scrolling");
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   viewport = gtk_viewport_new (NULL, NULL);
   grid = gtk_grid_new ();
 
diff --git a/tests/testgrouping.c b/tests/testgrouping.c
index 01bfc3b3f5..9863f5da4b 100644
--- a/tests/testgrouping.c
+++ b/tests/testgrouping.c
@@ -125,7 +125,7 @@ main (int argc, char **argv)
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
   gtk_window_set_default_size (GTK_WINDOW (window), 320, 480);
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_window_set_child (GTK_WINDOW (window), sw);
 
   tv = gtk_tree_view_new_with_model (model);
diff --git a/tests/testgtk.c b/tests/testgtk.c
index c33fa708da..28bd0db358 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -1520,7 +1520,7 @@ create_listbox (GtkWidget *widget)
       hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_window_set_child (GTK_WINDOW (window), hbox);
 
-      scrolled = gtk_scrolled_window_new (NULL, NULL);
+      scrolled = gtk_scrolled_window_new ();
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
       gtk_box_append (GTK_BOX (hbox), scrolled);
 
@@ -1948,7 +1948,7 @@ create_scrolled_windows (GtkWidget *widget)
 
       gtk_window_set_title (GTK_WINDOW (window), "dialog");
 
-      scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+      scrolled_window = gtk_scrolled_window_new ();
       gtk_widget_set_hexpand (scrolled_window, TRUE);
       gtk_widget_set_vexpand (scrolled_window, TRUE);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
@@ -5935,7 +5935,7 @@ create_main_window (void)
   gtk_box_append (GTK_BOX (box1), label);
   gtk_widget_set_name (label, "testgtk-version-label");
 
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  scrolled_window = gtk_scrolled_window_new ();
   gtk_widget_set_margin_top (scrolled_window, 10);
   gtk_widget_set_margin_bottom (scrolled_window, 10);
   gtk_widget_set_margin_start (scrolled_window, 10);
diff --git a/tests/testheaderbar.c b/tests/testheaderbar.c
index 6326e54cc0..9ee5613006 100644
--- a/tests/testheaderbar.c
+++ b/tests/testheaderbar.c
@@ -103,7 +103,7 @@ create_headerbar_overlay (GtkApplication *app)
   gtk_overlay_add_overlay (GTK_OVERLAY (overlay), header);
   load_css (header, "headerbar { background: alpha(shade(@theme_bg_color, .9), .8); }");
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
   gtk_widget_set_size_request (sw, 300, 250);
   gtk_overlay_set_child (GTK_OVERLAY (overlay), sw);
diff --git a/tests/testiconview.c b/tests/testiconview.c
index 61e1a324f1..4fb6723ead 100644
--- a/tests/testiconview.c
+++ b/tests/testiconview.c
@@ -521,14 +521,14 @@ main (gint argc, gchar **argv)
 					GDK_ACTION_MOVE);
   gdk_content_formats_unref (targets);
 
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  scrolled_window = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), icon_list);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
   				  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
   gtk_paned_set_start_child (GTK_PANED (paned), scrolled_window);
 
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  scrolled_window = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), tv);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
   				  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -577,7 +577,7 @@ main (gint argc, gchar **argv)
 
   icon_list = gtk_icon_view_new ();
 
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  scrolled_window = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), icon_list);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
                                   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
diff --git a/tests/testkineticscrolling.c b/tests/testkineticscrolling.c
index 8d64fb5686..ba72529584 100644
--- a/tests/testkineticscrolling.c
+++ b/tests/testkineticscrolling.c
@@ -64,7 +64,7 @@ kinetic_scrolling (void)
       g_free (button_label);
     }
 
-  swindow = gtk_scrolled_window_new (NULL, NULL);
+  swindow = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_kinetic_scrolling (GTK_SCROLLED_WINDOW (swindow), TRUE);
   gtk_scrolled_window_set_capture_button_press (GTK_SCROLLED_WINDOW (swindow), TRUE);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), button_grid);
@@ -102,7 +102,7 @@ kinetic_scrolling (void)
   gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), GTK_TREE_MODEL (store));
   g_object_unref (store);
 
-  swindow = gtk_scrolled_window_new (NULL, NULL);
+  swindow = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_kinetic_scrolling (GTK_SCROLLED_WINDOW (swindow), TRUE);
   gtk_scrolled_window_set_capture_button_press (GTK_SCROLLED_WINDOW (swindow), TRUE);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), treeview);
@@ -112,7 +112,7 @@ kinetic_scrolling (void)
   gtk_widget_set_vexpand (swindow, TRUE);
 
   textview = gtk_text_view_new ();
-  swindow = gtk_scrolled_window_new (NULL, NULL);
+  swindow = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_kinetic_scrolling (GTK_SCROLLED_WINDOW (swindow), TRUE);
   gtk_scrolled_window_set_capture_button_press (GTK_SCROLLED_WINDOW (swindow), TRUE);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), textview);
diff --git a/tests/testlist.c b/tests/testlist.c
index da44389d98..b781c28980 100644
--- a/tests/testlist.c
+++ b/tests/testlist.c
@@ -282,7 +282,7 @@ main (int argc, char *argv[])
   g_signal_connect (check, "toggled", G_CALLBACK (single_click_clicked), list);
   gtk_box_append (GTK_BOX (vbox), check);
 
-  scrolled = gtk_scrolled_window_new (NULL, NULL);
+  scrolled = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), list);
   gtk_box_append (GTK_BOX (hbox), scrolled);
diff --git a/tests/testlist2.c b/tests/testlist2.c
index a425428b34..11229c557a 100644
--- a/tests/testlist2.c
+++ b/tests/testlist2.c
@@ -121,7 +121,7 @@ int main (int argc, char *argv[])
   list = gtk_list_box_new ();
   gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE);
   gtk_list_box_set_header_func (GTK_LIST_BOX (list), add_separator, NULL, NULL);
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_window_set_child (GTK_WINDOW (window), sw);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), list);
 
diff --git a/tests/testlist3.c b/tests/testlist3.c
index 80ab08a58d..f3f6b3b0dd 100644
--- a/tests/testlist3.c
+++ b/tests/testlist3.c
@@ -154,7 +154,7 @@ main (int argc, char *argv[])
   g_signal_connect (list, "selected-rows-changed", G_CALLBACK (on_selected_children_changed), NULL);
   g_signal_connect (gtk_widget_get_accessible (list), "selection-changed", G_CALLBACK (a11y_selection_changed), NULL);
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_widget_set_hexpand (sw, TRUE);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS);
   gtk_box_append (GTK_BOX (hbox), sw);
diff --git a/tests/testlist4.c b/tests/testlist4.c
index bae109f989..ce0500d24e 100644
--- a/tests/testlist4.c
+++ b/tests/testlist4.c
@@ -102,7 +102,7 @@ new_window (GApplication *app)
   /* widget creation */
   grid = gtk_grid_new ();
   gtk_window_set_child (GTK_WINDOW (window), grid);
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_widget_set_hexpand (GTK_WIDGET (sw), true);
   gtk_widget_set_vexpand (GTK_WIDGET (sw), true);
   gtk_grid_attach (GTK_GRID (grid), sw, 0, 0, 1, 1);
diff --git a/tests/testlistdnd.c b/tests/testlistdnd.c
index afabfba4c6..2d8f7f4b7e 100644
--- a/tests/testlistdnd.c
+++ b/tests/testlistdnd.c
@@ -338,7 +338,7 @@ main (int argc, char *argv[])
   gtk_box_append (GTK_BOX (box), stack);
 
   /* grid */
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
   gtk_stack_add_titled (GTK_STACK (stack), sw, "grid", "GtkGridView");
 
@@ -361,7 +361,7 @@ main (int argc, char *argv[])
   g_object_unref (factory);
 
   /* list */
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
   gtk_stack_add_titled (GTK_STACK (stack), sw, "list", "GtkListView");
 
@@ -381,7 +381,7 @@ main (int argc, char *argv[])
   g_object_unref (factory);
 
   /* columnview */
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
   gtk_stack_add_titled (GTK_STACK (stack), sw, "column", "GtkColumnView");
 
@@ -411,7 +411,7 @@ main (int argc, char *argv[])
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), cv);
 
   /* tree */
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (sw), TRUE);
   gtk_stack_add_titled (GTK_STACK (stack), sw, "tree", "Tree");
 
diff --git a/tests/testlistview-animating.c b/tests/testlistview-animating.c
index 2d68d6b160..a69cb9a6fd 100644
--- a/tests/testlistview-animating.c
+++ b/tests/testlistview-animating.c
@@ -140,7 +140,7 @@ main (int   argc,
   label = gtk_label_new ("GtkListView");
   gtk_box_append (GTK_BOX (vbox), label);
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_widget_set_hexpand (sw, TRUE);
   gtk_widget_set_vexpand (sw, TRUE);
   gtk_box_append (GTK_BOX (vbox), sw);
@@ -157,7 +157,7 @@ main (int   argc,
   label = gtk_label_new ("GtkListBox");
   gtk_box_append (GTK_BOX (vbox), label);
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_widget_set_hexpand (sw, TRUE);
   gtk_widget_set_vexpand (sw, TRUE);
   gtk_box_append (GTK_BOX (vbox), sw);
diff --git a/tests/testlistview.c b/tests/testlistview.c
index 927e3a1fd3..0d33349d58 100644
--- a/tests/testlistview.c
+++ b/tests/testlistview.c
@@ -613,7 +613,7 @@ main (int argc, char *argv[])
   search_entry = gtk_search_entry_new ();
   gtk_box_append (GTK_BOX (vbox), search_entry);
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_widget_set_vexpand (sw, TRUE);
   gtk_search_entry_set_key_capture_widget (GTK_SEARCH_ENTRY (search_entry), sw);
   gtk_box_append (GTK_BOX (vbox), sw);
diff --git a/tests/testoverlay.c b/tests/testoverlay.c
index 4929a75166..7c175cfbbe 100644
--- a/tests/testoverlay.c
+++ b/tests/testoverlay.c
@@ -229,7 +229,7 @@ test_scrolling (void)
   overlay = gtk_overlay_new ();
   gtk_window_set_child (GTK_WINDOW (win), overlay);
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_min_content_width (GTK_SCROLLED_WINDOW (sw), 200);
   gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 200);
   gtk_overlay_set_child (GTK_OVERLAY (overlay), sw);
@@ -378,7 +378,7 @@ test_chase (void)
   overlay = gtk_overlay_new ();
   gtk_window_set_child (GTK_WINDOW (win), overlay);
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_min_content_width (GTK_SCROLLED_WINDOW (sw), 200);
   gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (sw), 200);
   gtk_overlay_set_child (GTK_OVERLAY (overlay), sw);
diff --git a/tests/testoverlaystyleclass.c b/tests/testoverlaystyleclass.c
index c77e2a94f5..47032021c7 100644
--- a/tests/testoverlaystyleclass.c
+++ b/tests/testoverlaystyleclass.c
@@ -53,7 +53,7 @@ main (int argc, char *argv[])
   gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
 
   overlay = gtk_overlay_new ();
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_ALWAYS,
                                   GTK_POLICY_ALWAYS);
diff --git a/tests/testscrolledge.c b/tests/testscrolledge.c
index 1e1c45c065..70820d66f5 100644
--- a/tests/testscrolledge.c
+++ b/tests/testscrolledge.c
@@ -120,7 +120,7 @@ main (int argc, char *argv[])
   gtk_overlay_add_overlay (GTK_OVERLAY (overlay), popup);
   gtk_widget_hide (popup);
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
   list = gtk_list_box_new ();
   gtk_list_box_set_selection_mode (GTK_LIST_BOX (list), GTK_SELECTION_NONE);
diff --git a/tests/testscrolledwindow.c b/tests/testscrolledwindow.c
index c485a3148c..ca772c12dd 100644
--- a/tests/testscrolledwindow.c
+++ b/tests/testscrolledwindow.c
@@ -90,7 +90,7 @@ scrollable_policy (void)
   gtk_widget_set_hexpand (frame, TRUE);
   gtk_box_append (GTK_BOX (hbox), frame);
 
-  swindow = gtk_scrolled_window_new (NULL, NULL);
+  swindow = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
                                   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
@@ -207,7 +207,7 @@ scrollable_policy (void)
   gtk_popover_set_child (GTK_POPOVER (popover), vbox);
 
   /* Popover's scrolled window */
-  swindow = gtk_scrolled_window_new (NULL, NULL);
+  swindow = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
                                   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
diff --git a/tests/testscrolltofocus.c b/tests/testscrolltofocus.c
index e524988a3d..2c1d442252 100644
--- a/tests/testscrolltofocus.c
+++ b/tests/testscrolltofocus.c
@@ -10,7 +10,7 @@ int main (int argc, char *argv[])
   gtk_init ();
 
   window = gtk_window_new ();
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_window_set_child (GTK_WINDOW (window), sw);
   viewport = gtk_viewport_new (gtk_scrolled_window_get_hadjustment (GTK_SCROLLED_WINDOW (sw)),
                                gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (sw)));
diff --git a/tests/teststack.c b/tests/teststack.c
index af111d1dd6..39e77ff190 100644
--- a/tests/teststack.c
+++ b/tests/teststack.c
@@ -163,7 +163,7 @@ main (gint argc,
   g_object_set (page, "needs-attention", TRUE, NULL);
 
 
-  scrolled_win = gtk_scrolled_window_new (NULL, NULL);
+  scrolled_win = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
 				  GTK_POLICY_AUTOMATIC,
 				  GTK_POLICY_AUTOMATIC);
diff --git a/tests/testtextview.c b/tests/testtextview.c
index a8aa9da101..ae7d65ec06 100644
--- a/tests/testtextview.c
+++ b/tests/testtextview.c
@@ -177,7 +177,7 @@ main (int argc, char **argv)
   gtk_init ();
 
   window   = gtk_window_new ();
-  sw       = gtk_scrolled_window_new (NULL, NULL);
+  sw       = gtk_scrolled_window_new ();
   textview = g_object_new (my_text_view_get_type (), NULL);
   buffer   = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
   button   = gtk_button_new_with_label ("Fixed Child");
diff --git a/tests/testtextview2.c b/tests/testtextview2.c
index 9d4b6c9c54..97ab974a2b 100644
--- a/tests/testtextview2.c
+++ b/tests/testtextview2.c
@@ -196,7 +196,7 @@ main (int argc, char *argv[])
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_widget_set_hexpand (sw, TRUE);
   gtk_widget_set_vexpand (sw, TRUE);
   gtk_window_set_child (GTK_WINDOW (window), box);
diff --git a/tests/testtreechanging.c b/tests/testtreechanging.c
index dab647c6fc..bbbc210828 100644
--- a/tests/testtreechanging.c
+++ b/tests/testtreechanging.c
@@ -495,7 +495,7 @@ main (int    argc,
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
   gtk_window_set_default_size (GTK_WINDOW (window), 430, 400);
 
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_widget_set_hexpand (sw, TRUE);
   gtk_widget_set_vexpand (sw, TRUE);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c
index 3612a9269d..47030f8f9b 100644
--- a/tests/testtreecolumns.c
+++ b/tests/testtreecolumns.c
@@ -761,7 +761,7 @@ main (int argc, char *argv[])
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done); 
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);
   gtk_window_set_title (GTK_WINDOW (window), "Top Window");
-  swindow = gtk_scrolled_window_new (NULL, NULL);
+  swindow = gtk_scrolled_window_new ();
   gtk_window_set_child (GTK_WINDOW (window), swindow);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), sample_tree_view_top);
   gtk_widget_show (window);
@@ -770,7 +770,7 @@ main (int argc, char *argv[])
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done); 
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);
   gtk_window_set_title (GTK_WINDOW (window), "Bottom Window");
-  swindow = gtk_scrolled_window_new (NULL, NULL);
+  swindow = gtk_scrolled_window_new ();
   gtk_window_set_child (GTK_WINDOW (window), swindow);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), sample_tree_view_bottom);
   gtk_widget_show (window);
@@ -788,7 +788,7 @@ main (int argc, char *argv[])
   /* Left Pane */
   cell = gtk_cell_renderer_text_new ();
 
-  swindow = gtk_scrolled_window_new (NULL, NULL);
+  swindow = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   left_tree_view = gtk_tree_view_new_with_model (left_tree_model);
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), left_tree_view);
@@ -845,7 +845,7 @@ main (int argc, char *argv[])
   vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
   gtk_box_append (GTK_BOX (hbox), vbox2);
 
-  swindow = gtk_scrolled_window_new (NULL, NULL);
+  swindow = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (top_right_tree_view), FALSE);
   cell = gtk_cell_renderer_text_new ();
@@ -860,7 +860,7 @@ main (int argc, char *argv[])
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (swindow), top_right_tree_view);
   gtk_box_append (GTK_BOX (vbox2), swindow);
 
-  swindow = gtk_scrolled_window_new (NULL, NULL);
+  swindow = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (bottom_right_tree_view), FALSE);
   cell = gtk_cell_renderer_text_new ();
diff --git a/tests/testtreecolumnsizing.c b/tests/testtreecolumnsizing.c
index 71a03a5016..a2932f48ea 100644
--- a/tests/testtreecolumnsizing.c
+++ b/tests/testtreecolumnsizing.c
@@ -205,7 +205,7 @@ main (int argc, char **argv)
   gtk_box_append (GTK_BOX (vbox), combo_box);
 
   /* Scrolled window and tree view */
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_AUTOMATIC,
                                   GTK_POLICY_AUTOMATIC);
diff --git a/tests/testtreeedit.c b/tests/testtreeedit.c
index 0ed30af13b..e528d50191 100644
--- a/tests/testtreeedit.c
+++ b/tests/testtreeedit.c
@@ -254,7 +254,7 @@ main (gint argc, gchar **argv)
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_window_set_child (GTK_WINDOW (window), vbox);
 
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  scrolled_window = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
 				  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
diff --git a/tests/testtreeflow.c b/tests/testtreeflow.c
index 8088e9aaef..de9e235878 100644
--- a/tests/testtreeflow.c
+++ b/tests/testtreeflow.c
@@ -150,7 +150,7 @@ main (int argc, char *argv[])
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
   gtk_box_append (GTK_BOX (vbox), gtk_label_new ("Incremental Reflow Test"));
   gtk_window_set_child (GTK_WINDOW (window), vbox);
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  scrolled_window = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
 				  GTK_POLICY_AUTOMATIC,
 				  GTK_POLICY_AUTOMATIC);
diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c
index c0aa3907ce..1f6f2d1dd8 100644
--- a/tests/testtreefocus.c
+++ b/tests/testtreefocus.c
@@ -367,7 +367,7 @@ main (int argc, char *argv[])
   gtk_box_append (GTK_BOX (vbox), gtk_label_new ("Jonathan's Holiday Card Planning Sheet"));
   gtk_window_set_child (GTK_WINDOW (window), vbox);
 
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  scrolled_window = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_widget_set_vexpand (scrolled_window, TRUE);
@@ -482,7 +482,7 @@ main (int argc, char *argv[])
   gtk_box_append (GTK_BOX (vbox), gtk_label_new ("The model revealed"));
   gtk_window_set_child (GTK_WINDOW (window), vbox);
 
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  scrolled_window = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_widget_set_vexpand (scrolled_window, TRUE);
diff --git a/tests/testtreepos.c b/tests/testtreepos.c
index c00aa96b88..e2c26e90f6 100644
--- a/tests/testtreepos.c
+++ b/tests/testtreepos.c
@@ -94,7 +94,7 @@ int main (int argc, char *argv[])
   gtk_init ();
 
   window = gtk_window_new ();
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_window_set_child (GTK_WINDOW (window), sw);
   tv = gtk_tree_view_new ();
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
diff --git a/tests/testtreesort.c b/tests/testtreesort.c
index c4d29c8ed8..a85240d06e 100644
--- a/tests/testtreesort.c
+++ b/tests/testtreesort.c
@@ -131,7 +131,7 @@ main (int argc, char *argv[])
   button = gtk_button_new_with_label ("Switch search method");
   gtk_box_append (GTK_BOX (vbox), button);
 
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  scrolled_window = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_widget_set_vexpand (scrolled_window, TRUE);
@@ -254,7 +254,7 @@ main (int argc, char *argv[])
 			  gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeStore of window 1"));
       gtk_window_set_child (GTK_WINDOW (window2), vbox2);
       
-      scrolled_window2 = gtk_scrolled_window_new (NULL, NULL);
+      scrolled_window2 = gtk_scrolled_window_new ();
       gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window2), TRUE);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window2),
 				      GTK_POLICY_AUTOMATIC,
@@ -321,7 +321,7 @@ main (int argc, char *argv[])
 			  gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort wrapping the GtkTreeModelSort of window 2"));
       gtk_window_set_child (GTK_WINDOW (window3), vbox3);
       
-      scrolled_window3 = gtk_scrolled_window_new (NULL, NULL);
+      scrolled_window3 = gtk_scrolled_window_new ();
       gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window3), TRUE);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window3),
 				      GTK_POLICY_AUTOMATIC,
diff --git a/tests/testtreeview.c b/tests/testtreeview.c
index 58f7ffe91c..f6854a74d7 100644
--- a/tests/testtreeview.c
+++ b/tests/testtreeview.c
@@ -744,7 +744,7 @@ main (int    argc,
                     G_CALLBACK (columns_selected),
                     tv);
   
-  sw = gtk_scrolled_window_new (NULL, NULL);
+  sw = gtk_scrolled_window_new ();
   gtk_widget_set_hexpand (sw, TRUE);
   gtk_widget_set_vexpand (sw, TRUE);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
diff --git a/tests/testverticalcells.c b/tests/testverticalcells.c
index e1a4ffe5cf..ed89ece29a 100644
--- a/tests/testverticalcells.c
+++ b/tests/testverticalcells.c
@@ -320,7 +320,7 @@ main (gint argc, gchar **argv)
   gtk_window_set_title (GTK_WINDOW (window), "Vertical cells in GtkTreeViewColumn example");
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  scrolled_window = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_has_frame (GTK_SCROLLED_WINDOW (scrolled_window), TRUE);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), 
 				  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
diff --git a/tests/treestoretest.c b/tests/treestoretest.c
index efb2444cee..afe871414e 100644
--- a/tests/treestoretest.c
+++ b/tests/treestoretest.c
@@ -318,7 +318,7 @@ make_window (gint view_type)
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 350);
-  scrolled_window = gtk_scrolled_window_new (NULL, NULL);
+  scrolled_window = gtk_scrolled_window_new ();
   switch (view_type)
     {
     case 0: