tests: Stop using gtk_widget_show/hide

104 files changed, 200 insertions, 205 deletions

diff --git a/tests/animated-resizing.c b/tests/animated-resizing.c
index bf7a0b68c4..77f21ea9a8 100644
--- a/tests/animated-resizing.c
+++ b/tests/animated-resizing.c
@@ -218,7 +218,7 @@ main(int argc, char **argv)
                     G_CALLBACK (on_map), NULL);
   on_frame (0.);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/animated-revealing.c b/tests/animated-revealing.c
index 5e5f666a53..424c04ad8b 100644
--- a/tests/animated-revealing.c
+++ b/tests/animated-revealing.c
@@ -80,7 +80,7 @@ main(int argc, char **argv)
         }
     }
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/listmodel.c b/tests/listmodel.c
index b4a2864dbf..32a4b28335 100644
--- a/tests/listmodel.c
+++ b/tests/listmodel.c
@@ -225,7 +225,7 @@ main (int argc, char *argv[])
   g_signal_connect (button, "clicked", G_CALLBACK (remove_some), store);
   gtk_grid_attach (GTK_GRID (grid), button, 0, 2, 1, 1);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/motion-compression.c b/tests/motion-compression.c
index b0b1a8edbb..dc918988d0 100644
--- a/tests/motion-compression.c
+++ b/tests/motion-compression.c
@@ -85,7 +85,7 @@ main (int argc, char **argv)
   g_signal_connect (window, "destroy",
                     G_CALLBACK (quit_cb), &done);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
   while (!done)
     g_main_context_iteration (NULL, TRUE); 
 
diff --git a/tests/overlayscroll.c b/tests/overlayscroll.c
index bf6783989b..1dd36b0e24 100644
--- a/tests/overlayscroll.c
+++ b/tests/overlayscroll.c
@@ -105,7 +105,7 @@ main (int argc, char *argv[])
   sb2 = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, adj);
   gtk_box_append (GTK_BOX (box), sb2);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/scrolling-performance.c b/tests/scrolling-performance.c
index f386c911b7..b813356415 100644
--- a/tests/scrolling-performance.c
+++ b/tests/scrolling-performance.c
@@ -150,7 +150,7 @@ main (int argc, char **argv)
                                 NULL,
                                 NULL);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
   g_signal_connect (window, "destroy",
                     G_CALLBACK (quit_cb), &done);
 
diff --git a/tests/showrendernode.c b/tests/showrendernode.c
index 9d145e6a82..c23d49b75b 100644
--- a/tests/showrendernode.c
+++ b/tests/showrendernode.c
@@ -283,7 +283,7 @@ main (int argc, char **argv)
                                MAX (500, node_bounds.size.height));
 
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/simple.c b/tests/simple.c
index 062afdc9fa..a3068ee5a9 100644
--- a/tests/simple.c
+++ b/tests/simple.c
@@ -59,7 +59,7 @@ main (int argc, char *argv[])
 
   gtk_window_set_child (GTK_WINDOW (window), button);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/syncscroll.c b/tests/syncscroll.c
index 5d724dca64..9e4a0020de 100644
--- a/tests/syncscroll.c
+++ b/tests/syncscroll.c
@@ -66,7 +66,7 @@ main (int argc, char *argv[])
 
   gtk_box_append (GTK_BOX (box), sb);
 
-  gtk_widget_show (win);
+  gtk_window_present (GTK_WINDOW (win));
 
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testaccel.c b/tests/testaccel.c
index 9dd7abbfb4..b8008a7f53 100644
--- a/tests/testaccel.c
+++ b/tests/testaccel.c
@@ -127,7 +127,7 @@ main (int argc, char **argv)
 
   dialog = key_test ();
 
-  gtk_widget_show (dialog);
+  gtk_window_present (GTK_WINDOW (dialog));
 
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c
index 6b0997d4fc..27101ed490 100644
--- a/tests/testadjustsize.c
+++ b/tests/testadjustsize.c
@@ -96,7 +96,7 @@ open_test_window (void)
       gtk_grid_attach (GTK_GRID (grid), test_widgets[i], i % 3, i / 3, 1, 1);
     }
 
-  gtk_widget_show (test_window);
+  gtk_window_present (GTK_WINDOW (test_window));
 }
 
 static void
@@ -163,7 +163,7 @@ open_control_window (void)
   gtk_box_append (GTK_BOX (box), toggle);
 
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 #define TEST_WIDGET(outer) (gtk_overlay_get_child (GTK_OVERLAY (gtk_overlay_get_child (GTK_OVERLAY (outer)))))
@@ -268,7 +268,7 @@ open_alignment_window (void)
         }
     }
 
-  gtk_widget_show (test_window);
+  gtk_window_present (GTK_WINDOW (test_window));
 }
 
 static GtkWidget*
@@ -318,7 +318,7 @@ open_margin_window (void)
       gtk_box_append (GTK_BOX (box), child);
     }
 
-  gtk_widget_show (test_window);
+  gtk_window_present (GTK_WINDOW (test_window));
 }
 
 static void
diff --git a/tests/testappchooser.c b/tests/testappchooser.c
index 09a856d561..c2d6f587d1 100644
--- a/tests/testappchooser.c
+++ b/tests/testappchooser.c
@@ -124,7 +124,7 @@ display_dialog (void)
   if (dialog == NULL)
     prepare_dialog ();
 
-  gtk_widget_show (dialog);
+  gtk_window_present (GTK_WINDOW (dialog));
 }
 
 static void
@@ -253,7 +253,7 @@ main (int argc, char **argv)
 
   gtk_window_set_child (GTK_WINDOW (toplevel), grid);
 
-  gtk_widget_show (toplevel);
+  gtk_window_present (GTK_WINDOW (toplevel));
   g_signal_connect (toplevel, "destroy", G_CALLBACK (quit_cb), &done);
 
   while (!done)
diff --git a/tests/testappchooserbutton.c b/tests/testappchooserbutton.c
index 1ffc062d4a..3172588206 100644
--- a/tests/testappchooserbutton.c
+++ b/tests/testappchooserbutton.c
@@ -147,7 +147,7 @@ main (int argc,
   gtk_app_chooser_button_set_active_custom_item (GTK_APP_CHOOSER_BUTTON (button),
                                                  CUSTOM_ITEM);
 #endif
-  gtk_widget_show (toplevel);
+  gtk_window_present (GTK_WINDOW (toplevel));
 
   g_signal_connect (toplevel, "destroy", G_CALLBACK (quit_cb), &done);
 
diff --git a/tests/testassistant.c b/tests/testassistant.c
index b478128842..b7404a7423 100644
--- a/tests/testassistant.c
+++ b/tests/testassistant.c
@@ -178,7 +178,7 @@ create_simple_assistant (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (assistant))
-    gtk_widget_show (assistant);
+    gtk_window_present (GTK_WINDOW (assistant));
   else
     {
       gtk_window_destroy (GTK_WINDOW (assistant));
@@ -710,7 +710,7 @@ main (int argc, char *argv[])
       gtk_box_append (GTK_BOX (box), button);
     }
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testbaseline.c b/tests/testbaseline.c
index 06f362c56f..9e5751e603 100644
--- a/tests/testbaseline.c
+++ b/tests/testbaseline.c
@@ -401,7 +401,7 @@ main (int    argc,
 	}
     }
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testblur.c b/tests/testblur.c
index 618862cf1c..a1eb5f1858 100644
--- a/tests/testblur.c
+++ b/tests/testblur.c
@@ -126,7 +126,7 @@ main (int argc, char **argv)
   gtk_box_append (GTK_BOX (blur_box), scale);
   gtk_window_set_child (GTK_WINDOW (window), blur_box);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testborderdrawing.c b/tests/testborderdrawing.c
index e78f324940..661d2481c9 100644
--- a/tests/testborderdrawing.c
+++ b/tests/testborderdrawing.c
@@ -166,7 +166,7 @@ main (int argc, char **argv)
   gtk_box_append (GTK_BOX (box), bottom);
   gtk_window_set_child (GTK_WINDOW (window), box);
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index 387731d5a9..b4edcac895 100644
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -314,7 +314,7 @@ create_calendar(void)
 
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 0);
   g_signal_connect (window, "close-request", G_CALLBACK (quit_cb), &done);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testcellarea.c b/tests/testcellarea.c
index 212988b610..66341d7ccc 100644
--- a/tests/testcellarea.c
+++ b/tests/testcellarea.c
@@ -249,7 +249,7 @@ simple_cell_area (void)
 
   gtk_window_set_child (GTK_WINDOW (window), hbox);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 /*******************************************************
@@ -455,7 +455,7 @@ focus_cell_area (void)
 
   gtk_window_set_child (GTK_WINDOW (window), hbox);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 
@@ -579,7 +579,7 @@ background_area (void)
   g_signal_connect (G_OBJECT (widget), "value-changed",
                     G_CALLBACK (item_padding_changed), iconview);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 
diff --git a/tests/testcellrenderertext.c b/tests/testcellrenderertext.c
index fd40a75188..5c5fd814a6 100644
--- a/tests/testcellrenderertext.c
+++ b/tests/testcellrenderertext.c
@@ -295,7 +295,7 @@ main (int argc, char **argv)
   gtk_widget_set_vexpand (tree, TRUE);
   gtk_box_append (GTK_BOX (vbox), tree);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testcenterbox.c b/tests/testcenterbox.c
index 0b420baea4..f32f443dc3 100644
--- a/tests/testcenterbox.c
+++ b/tests/testcenterbox.c
@@ -42,7 +42,7 @@ main (int argc, char *argv[])
 
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testclipboard2.c b/tests/testclipboard2.c
index ed80ffde30..32df2cba95 100644
--- a/tests/testclipboard2.c
+++ b/tests/testclipboard2.c
@@ -452,7 +452,7 @@ main (int argc, char **argv)
                      get_window_contents (gtk_widget_get_display (window),
                                           alt_display));
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testcolumnview.c b/tests/testcolumnview.c
index 4f5a365f85..6b85251b50 100644
--- a/tests/testcolumnview.c
+++ b/tests/testcolumnview.c
@@ -775,7 +775,7 @@ main (int argc, char *argv[])
 
   g_object_unref (scope);
 
-  gtk_widget_show (win);
+  gtk_window_present (GTK_WINDOW (win));
 
   toplevels = gtk_window_get_toplevels ();
   while (g_list_model_get_n_items (toplevels))
diff --git a/tests/testcombo.c b/tests/testcombo.c
index 6cfb010bec..063a66ba56 100644
--- a/tests/testcombo.c
+++ b/tests/testcombo.c
@@ -1103,7 +1103,6 @@ main (int argc, char **argv)
         gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 0);
 
         tmp = gtk_cell_view_new ();
-        gtk_widget_show (tmp);
         gtk_cell_view_set_model (GTK_CELL_VIEW (tmp), model);
 
         renderer = gtk_cell_renderer_text_new ();
@@ -1298,7 +1297,7 @@ main (int argc, char **argv)
         gtk_combo_box_set_active (GTK_COMBO_BOX (combobox), 53);
         gtk_frame_set_child (GTK_FRAME (tmp), combobox);
 
-        gtk_widget_show (window);
+        gtk_window_present (GTK_WINDOW (window));
 
         while (!done)
           g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testcombochange.c b/tests/testcombochange.c
index 0833e98b47..95f316be2d 100644
--- a/tests/testcombochange.c
+++ b/tests/testcombochange.c
@@ -257,7 +257,7 @@ main (int argc, char **argv)
   gtk_widget_set_hexpand (close_button, TRUE);
   gtk_box_append (GTK_BOX (content_area), close_button);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   GMainLoop *loop = g_main_loop_new (NULL, FALSE);
 
diff --git a/tests/testdatatable.c b/tests/testdatatable.c
index bb9f86dc4f..72de5829e4 100644
--- a/tests/testdatatable.c
+++ b/tests/testdatatable.c
@@ -286,7 +286,7 @@ main (int argc, char **argv)
                                     NULL);
     }
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
   g_signal_connect (window, "destroy",
                     G_CALLBACK (quit_cb), &done);
 
diff --git a/tests/testdnd.c b/tests/testdnd.c
index 471ab2cab9..66e3c3c94a 100644
--- a/tests/testdnd.c
+++ b/tests/testdnd.c
@@ -386,7 +386,7 @@ popdown_cb (gpointer data)
 {
   popdown_timer = 0;
 
-  gtk_widget_hide (popup_window);
+  gtk_widget_set_visible (popup_window, FALSE);
   popped_up = FALSE;
 
   return FALSE;
@@ -465,7 +465,7 @@ popup_cb (gpointer data)
 	      }
 	  gtk_window_set_child (GTK_WINDOW (popup_window), grid);
 	}
-      gtk_widget_show (popup_window);
+      gtk_widget_set_visible (popup_window, TRUE);
       popped_up = TRUE;
     }
 
@@ -588,7 +588,7 @@ main (int argc, char **argv)
   gtk_widget_set_vexpand (button, TRUE);
   gtk_grid_attach (GTK_GRID (grid), button, 0, 1, 1, 1);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testdnd2.c b/tests/testdnd2.c
index 591d12fe53..c4b5ffa0ea 100644
--- a/tests/testdnd2.c
+++ b/tests/testdnd2.c
@@ -429,7 +429,7 @@ main (int argc, char *Argv[])
 
   gtk_grid_attach (GTK_GRID (grid), make_image ("dialog-information", CENTER), 1, 3, 1, 1);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
 
diff --git a/tests/testellipsise.c b/tests/testellipsise.c
index e497dd3805..76b4cef6fc 100644
--- a/tests/testellipsise.c
+++ b/tests/testellipsise.c
@@ -153,7 +153,7 @@ main (int argc, char *argv[])
 
   g_signal_connect (combo, "changed", G_CALLBACK (combo_changed_cb), label);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c
index 8f0253b73b..a29930b59f 100644
--- a/tests/testentrycompletion.c
+++ b/tests/testentrycompletion.c
@@ -411,7 +411,7 @@ main (int argc, char *argv[])
 
   gtk_box_append (GTK_BOX (vbox), entry);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testentryicons.c b/tests/testentryicons.c
index a39b1c573f..25d640f758 100644
--- a/tests/testentryicons.c
+++ b/tests/testentryicons.c
@@ -300,7 +300,7 @@ main (int argc, char **argv)
   provider = gtk_css_provider_new ();
   gtk_css_provider_load_from_data (provider, cssdata, -1);
   gtk_style_context_add_provider_for_display (gdk_display_get_default (), GTK_STYLE_PROVIDER (provider), 800);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testexpand.c b/tests/testexpand.c
index 03b18bebc3..9929c8a3d2 100644
--- a/tests/testexpand.c
+++ b/tests/testexpand.c
@@ -102,7 +102,7 @@ create_box_window (void)
                      gtk_label_new ("VBox 3 Bottom"));
 
   gtk_window_set_child (GTK_WINDOW (window), box1);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 static void
@@ -154,7 +154,7 @@ create_grid_window (void)
   gtk_grid_attach (GTK_GRID (grid), colorbox, 1, 2, 1, 1); 
 
   gtk_window_set_child (GTK_WINDOW (window), grid);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 int
diff --git a/tests/testfilechooser.c b/tests/testfilechooser.c
index 65f15e49d6..b112c22e5b 100644
--- a/tests/testfilechooser.c
+++ b/tests/testfilechooser.c
@@ -105,7 +105,7 @@ set_current_folder (GtkFileChooser *chooser,
 				       GTK_BUTTONS_CLOSE,
 				       "Could not set the folder to %s",
 				       name);
-      gtk_widget_show (dialog);
+      gtk_window_present (GTK_WINDOW (dialog));
       g_signal_connect (dialog, "response",
                         G_CALLBACK (gtk_window_destroy),
                         NULL);
@@ -142,7 +142,7 @@ set_filename (GtkFileChooser *chooser,
 				       GTK_BUTTONS_CLOSE,
 				       "Could not select %s",
 				       name);
-      gtk_widget_show (dialog);
+      gtk_window_present (GTK_WINDOW (dialog));
       g_signal_connect (dialog, "response",
                         G_CALLBACK (gtk_window_destroy),
                         NULL);
@@ -203,8 +203,8 @@ static void
 unmap_and_remap_cb (GtkButton *button,
 		    GtkFileChooser *chooser)
 {
-  gtk_widget_hide (GTK_WIDGET (chooser));
-  gtk_widget_show (GTK_WIDGET (chooser));
+  gtk_widget_set_visible (GTK_WIDGET (chooser), FALSE);
+  gtk_widget_set_visible (GTK_WIDGET (chooser), TRUE);
 }
 
 static void
@@ -367,8 +367,7 @@ main (int argc, char **argv)
   if (initial_folder)
     set_current_folder (GTK_FILE_CHOOSER (dialog), initial_folder);
 
-  /* show_all() to reveal bugs in composite widget handling */
-  gtk_widget_show (dialog);
+  gtk_window_present (GTK_WINDOW (dialog));
 
   /* Extra controls for manipulating the test environment
    */
diff --git a/tests/testflowbox.c b/tests/testflowbox.c
index b672179321..20efb47b86 100644
--- a/tests/testflowbox.c
+++ b/tests/testflowbox.c
@@ -617,7 +617,7 @@ main (int argc, char *argv[])
 
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testfontchooserdialog.c b/tests/testfontchooserdialog.c
index 78b70969c7..72388c1845 100644
--- a/tests/testfontchooserdialog.c
+++ b/tests/testfontchooserdialog.c
@@ -163,7 +163,7 @@ main (int argc, char *argv[])
   g_signal_connect (toggle, "notify::active", G_CALLBACK (level_changed), font_button);
   gtk_box_append (GTK_BOX (box), toggle);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   g_signal_connect (font_button, "notify::font",
                     G_CALLBACK (notify_font_cb), NULL);
diff --git a/tests/testfontoptions.c b/tests/testfontoptions.c
index 85d95e1ce1..dd348a91d2 100644
--- a/tests/testfontoptions.c
+++ b/tests/testfontoptions.c
@@ -85,7 +85,7 @@ main (int argc, char *argv[])
   gtk_combo_box_set_active (GTK_COMBO_BOX (subpixel), 0);
   gtk_combo_box_set_active (GTK_COMBO_BOX (hintstyle), 0);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testframe.c b/tests/testframe.c
index d2345b7dd5..c2215db182 100644
--- a/tests/testframe.c
+++ b/tests/testframe.c
@@ -100,7 +100,7 @@ int main (int argc, char **argv)
   g_signal_connect (widget, "value-changed", G_CALLBACK (spin_xalign_cb), frame);
   gtk_grid_attach (grid, widget, 1, 0, 1, 1);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testfullscreen.c b/tests/testfullscreen.c
index 3adc82310f..ac266aee39 100644
--- a/tests/testfullscreen.c
+++ b/tests/testfullscreen.c
@@ -82,7 +82,7 @@ main (int argc, char *argv[])
   g_signal_connect (button, "clicked", G_CALLBACK (remove_fullscreen_cb), NULL);
   gtk_box_append (GTK_BOX (vbox), button);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testgaction.c b/tests/testgaction.c
index ef02e39f18..b85c107684 100644
--- a/tests/testgaction.c
+++ b/tests/testgaction.c
@@ -195,7 +195,7 @@ int main (int argc, char **argv)
 
   gtk_window_set_child (GTK_WINDOW (window), box);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
   return 0;
diff --git a/tests/testglarea.c b/tests/testglarea.c
index 5c8ab927f9..5805836d2c 100644
--- a/tests/testglarea.c
+++ b/tests/testglarea.c
@@ -444,7 +444,7 @@ main (int argc, char *argv[])
   gtk_box_append (GTK_BOX (box), button);
   g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_window_destroy), window);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testglblending.c b/tests/testglblending.c
index 01fb874bed..89c9faee73 100644
--- a/tests/testglblending.c
+++ b/tests/testglblending.c
@@ -85,7 +85,7 @@ main (int argc, char *argv[])
   gtk_widget_set_size_request (spinner, 50, 50);
   gtk_fixed_put (GTK_FIXED (fixed), spinner, 110, 150);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testgmenu.c b/tests/testgmenu.c
index 009b2b29dd..421682623c 100644
--- a/tests/testgmenu.c
+++ b/tests/testgmenu.c
@@ -693,7 +693,7 @@ main (int argc, char *argv[])
       gtk_box_append (GTK_BOX (box), button);
     }
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testgrid.c b/tests/testgrid.c
index a311bb69dc..3a5bb92819 100644
--- a/tests/testgrid.c
+++ b/tests/testgrid.c
@@ -85,7 +85,7 @@ simple_grid (void)
   g_assert (gtk_grid_get_child_at (GTK_GRID (grid), -1, 0) == test6);
   g_assert (gtk_grid_get_child_at (GTK_GRID (grid), -1, 1) == test6);
   g_assert (gtk_grid_get_child_at (GTK_GRID (grid), -1, 2) == NULL);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 static void
@@ -131,7 +131,7 @@ text_grid (void)
   gtk_label_set_width_chars (GTK_LABEL (label), 10);
   gtk_grid_attach (GTK_GRID (grid), label, 1, 1, 1, 1);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 static void
@@ -196,7 +196,7 @@ box_comparison (void)
   gtk_box_append (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL));
   gtk_box_append (GTK_BOX (vbox), gtk_label_new ("Below"));
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 static void
@@ -224,7 +224,7 @@ empty_line (void)
   gtk_grid_attach (GTK_GRID (grid), test_widget ("(10, 0)", "green"), 10, 0, 1, 1);
   gtk_grid_attach (GTK_GRID (grid), test_widget ("(10, 1)", "magenta"), 10, 1, 1, 1);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 static void
@@ -248,7 +248,7 @@ empty_grid (void)
   gtk_widget_set_hexpand (child, TRUE);
   gtk_widget_set_vexpand (child, TRUE);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
   gtk_widget_hide (child);
 }
 
@@ -297,7 +297,7 @@ scrolling (void)
       g_free (color);
     }
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 static void
@@ -406,7 +406,7 @@ insert (void)
   g_signal_connect (button, "clicked", G_CALLBACK (insert_cb), window);
   gtk_grid_attach (GTK_GRID (g), button, 0, 2, 2, 1);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 static void
@@ -455,7 +455,7 @@ spanning_grid (void)
   c = test_widget ("7", "cyan");
   gtk_grid_attach (GTK_GRID (g), c, 1, 0, 1, 1);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 int
diff --git a/tests/testgridbaseline.c b/tests/testgridbaseline.c
index e96b5fd612..052d67a168 100644
--- a/tests/testgridbaseline.c
+++ b/tests/testgridbaseline.c
@@ -52,7 +52,7 @@ main (int argc, char *argv[])
   gtk_grid_attach (GTK_GRID (grid), label3, 0, 1, 1, 1);
   gtk_grid_attach (GTK_GRID (grid), label4, 1, 1, 1, 1);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
   return 0;
diff --git a/tests/testgrouping.c b/tests/testgrouping.c
index 323ebe4796..16b87557da 100644
--- a/tests/testgrouping.c
+++ b/tests/testgrouping.c
@@ -159,7 +159,7 @@ main (int argc, char **argv)
 					   NULL);
   gtk_tree_view_insert_column (GTK_TREE_VIEW (tv), column, 0);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 7974620f2a..5ab0fee4e9 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -244,7 +244,7 @@ create_alpha_window (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -257,10 +257,7 @@ static void
 button_window (GtkWidget *widget,
               GtkWidget *button)
 {
-  if (!gtk_widget_get_visible (button))
-    gtk_widget_show (button);
-  else
-    gtk_widget_hide (button);
+  gtk_widget_set_visible (button, !gtk_widget_get_visible (button));
 }
 
 static void
@@ -339,7 +336,7 @@ create_buttons (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -396,7 +393,7 @@ create_toggle_buttons (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -514,7 +511,7 @@ create_check_buttons (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -595,7 +592,7 @@ create_radio_buttons (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -791,7 +788,7 @@ create_statusbar (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -1063,7 +1060,7 @@ static void create_labels (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -1184,7 +1181,7 @@ create_rotated_text (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -1265,7 +1262,7 @@ create_pixbuf (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -1355,7 +1352,7 @@ create_tooltips (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -1413,7 +1410,7 @@ create_image (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -1575,7 +1572,7 @@ create_listbox (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -1609,7 +1606,7 @@ cmw_color (GtkWidget *widget, GtkWidget *parent)
                       G_CALLBACK (gtk_window_destroy), NULL);
     
     /* wait until destroy calls gtk_main_quit */
-    gtk_widget_show (csd);    
+    gtk_window_present (GTK_WINDOW (csd));
     while (!done)
       g_main_context_iteration (NULL, TRUE);
 }
@@ -1689,7 +1686,7 @@ create_modal_window (GtkWidget *widget)
                     G_CALLBACK (cmw_file), window);
 
   /* Show widgets */
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   /* wait until dialog get destroyed */
   while (!done)
@@ -1891,7 +1888,7 @@ create_scrolled_windows (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -2079,7 +2076,7 @@ create_entry (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -2114,7 +2111,7 @@ create_expander (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -2685,7 +2682,7 @@ create_spins (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -2993,7 +2990,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
 				window);
       gtk_box_append (GTK_BOX (hbox), button);
 
-      gtk_widget_show (window);
+      gtk_window_present (GTK_WINDOW (window));
 
       gtk_editable_set_text (GTK_EDITABLE (entry), "arrow");
     }
@@ -3039,7 +3036,7 @@ create_color_selection (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -3166,7 +3163,7 @@ create_flipping (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -3209,7 +3206,7 @@ create_font_selection (GtkWidget *widget)
     }
   
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -3418,7 +3415,7 @@ create_display_screen (GtkWidget *widget)
 		    G_CALLBACK (screen_display_destroy_diag), window);
   g_signal_connect (applyb, "clicked", 
 		    G_CALLBACK (screen_display_check), scr_dpy_data);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 /*
@@ -3525,7 +3522,7 @@ create_range_controls (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -3899,7 +3896,7 @@ create_notebook (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -4049,7 +4046,7 @@ create_panes (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -4524,7 +4521,7 @@ create_wmhints (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -4761,7 +4758,7 @@ create_surface_states (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -4976,7 +4973,7 @@ create_window_sizing (GtkWidget *widget)
    */
   
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -5372,7 +5369,7 @@ create_timeout_test (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -5728,7 +5725,7 @@ create_native_dialogs (GtkWidget *widget)
     }
 
   if (!gtk_widget_get_visible (window))
-    gtk_widget_show (window);
+    gtk_window_present (GTK_WINDOW (window));
   else
     gtk_window_destroy (GTK_WINDOW (window));
 }
@@ -5887,7 +5884,7 @@ create_main_window (void)
   gtk_box_append (GTK_BOX (box2), button);
   gtk_window_set_default_widget (GTK_WINDOW (window), button);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 static char *
diff --git a/tests/testheaderbar.c b/tests/testheaderbar.c
index fc7ffa5cda..497dc0c870 100644
--- a/tests/testheaderbar.c
+++ b/tests/testheaderbar.c
@@ -41,7 +41,7 @@ create_regular (GtkApplication *app)
   gtk_label_set_wrap (GTK_LABEL (label), TRUE);
   gtk_window_set_child (GTK_WINDOW (window), label);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 static void
@@ -59,7 +59,7 @@ create_headerbar_as_titlebar (GtkApplication *app)
   gtk_label_set_wrap (GTK_LABEL (label), TRUE);
   gtk_window_set_child (GTK_WINDOW (window), label);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 static void
@@ -82,7 +82,7 @@ create_headerbar_inside_window (GtkApplication *app)
   gtk_widget_set_vexpand (label, TRUE);
   gtk_box_append (GTK_BOX (box), label);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 static void
@@ -130,7 +130,7 @@ create_headerbar_overlay (GtkApplication *app)
   gtk_widget_set_vexpand (label, TRUE);
   gtk_box_append (GTK_BOX (box), label);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 static void
@@ -174,7 +174,7 @@ create_hiding_headerbar (GtkApplication *app)
   label = gtk_label_new ("Show headerbar");
   gtk_box_append (GTK_BOX (hbox), label);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 static void
@@ -209,7 +209,7 @@ create_fake_headerbar (GtkApplication *app)
   gtk_widget_set_vexpand (label, TRUE);
   gtk_box_append (GTK_BOX (box), label);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 /* split headerbar  */
@@ -414,7 +414,7 @@ on_bookmark_clicked (GtkButton *button, gpointer data)
   g_signal_connect (chooser, "response",
                     G_CALLBACK (gtk_window_destroy), NULL);
 
-  gtk_widget_show (chooser);
+  gtk_window_present (GTK_WINDOW (chooser));
 }
 
 static void
@@ -522,7 +522,7 @@ create_technorama (GtkApplication *app)
   gtk_action_bar_pack_end (GTK_ACTION_BAR (footer), button);
   g_signal_connect (button, "clicked", G_CALLBACK (toggle_fullscreen), window);
   gtk_box_append (GTK_BOX (box), footer);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 struct {
@@ -571,7 +571,7 @@ app_activate_cb (GtkApplication *app)
       gtk_box_append (GTK_BOX (box), btn);
     }
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 int
diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c
index a6b79357fc..c66f593495 100644
--- a/tests/testheightforwidth.c
+++ b/tests/testheightforwidth.c
@@ -647,7 +647,7 @@ test_clicked (GtkWidget     *button,
       g_object_unref (builder);
     }
 
-  gtk_widget_show (interface->window);
+  gtk_window_present (GTK_WINDOW (interface->window));
 }
 
 
@@ -705,7 +705,7 @@ main (int argc, char *argv[])
 
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testhover.c b/tests/testhover.c
index e493155eef..a139919221 100644
--- a/tests/testhover.c
+++ b/tests/testhover.c
@@ -117,7 +117,7 @@ test1 (void)
 
   gtk_box_append (GTK_BOX (box), gtk_image_new_from_icon_name ("start-here"));
 
-  gtk_widget_show (win);
+  gtk_window_present (GTK_WINDOW (win));
 
   g_signal_connect (win, "destroy", G_CALLBACK (quit_cb), NULL);
 }
@@ -129,8 +129,8 @@ enter2_cb (GtkEventController *controller)
 {
   GtkWidget *box = gtk_event_controller_get_widget (controller);
 
-  gtk_widget_hide (gtk_widget_get_first_child (box));
-  gtk_widget_show (gtk_widget_get_last_child (box));
+  gtk_widget_set_visible (gtk_widget_get_first_child (box), FALSE);
+  gtk_widget_set_visible (gtk_widget_get_last_child (box), TRUE);
 }
 
 static void
@@ -138,8 +138,8 @@ leave2_cb (GtkEventController *controller)
 {
   GtkWidget *box = gtk_event_controller_get_widget (controller);
 
-  gtk_widget_show (gtk_widget_get_first_child (box));
-  gtk_widget_hide (gtk_widget_get_last_child (box));
+  gtk_widget_set_visible (gtk_widget_get_first_child (box), TRUE);
+  gtk_widget_set_visible (gtk_widget_get_last_child (box), FALSE);
 }
 
 static void
@@ -161,9 +161,9 @@ test2 (void)
 
   gtk_box_append (GTK_BOX (box), gtk_image_new_from_icon_name ("start-here"));
   gtk_box_append (GTK_BOX (box), gtk_label_new ("HOVER!"));
-  gtk_widget_hide (gtk_widget_get_last_child (box));
+  gtk_widget_set_visible (gtk_widget_get_last_child (box), FALSE);
 
-  gtk_widget_show (win);
+  gtk_window_present (GTK_WINDOW (win));
 
   g_signal_connect (win, "destroy", G_CALLBACK (quit_cb), NULL);
 }
@@ -207,7 +207,7 @@ test3 (void)
   gtk_stack_add_named (GTK_STACK (stack), gtk_label_new ("HOVER!"), "enter");
   gtk_stack_set_visible_child_name (GTK_STACK (stack), "leave");
 
-  gtk_widget_show (win);
+  gtk_window_present (GTK_WINDOW (win));
 
   g_signal_connect (win, "destroy", G_CALLBACK (quit_cb), NULL);
 }
@@ -252,7 +252,7 @@ test4 (void)
   gtk_fixed_put (GTK_FIXED (fixed), gtk_image_new_from_icon_name ("start-here"), 0, 0);
   gtk_fixed_put (GTK_FIXED (fixed), gtk_label_new ("HOVER!"), -1000, -1000);
 
-  gtk_widget_show (win);
+  gtk_window_present (GTK_WINDOW (win));
 
   g_signal_connect (win, "destroy", G_CALLBACK (quit_cb), NULL);
 }
diff --git a/tests/testiconview-keynav.c b/tests/testiconview-keynav.c
index 254ed6542e..bf0b7828b9 100644
--- a/tests/testiconview-keynav.c
+++ b/tests/testiconview-keynav.c
@@ -261,7 +261,7 @@ main (int argc, char *argv[])
   gtk_box_append (GTK_BOX (vbox), views.header2);
   gtk_box_append (GTK_BOX (vbox), views.view2);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testiconview.c b/tests/testiconview.c
index b638127cab..26f54455c8 100644
--- a/tests/testiconview.c
+++ b/tests/testiconview.c
@@ -585,7 +585,7 @@ main (int argc, char **argv)
                                   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
   gtk_paned_set_end_child (GTK_PANED (paned), scrolled_window);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testinfobar.c b/tests/testinfobar.c
index cd751a1748..6c5ac54d6d 100644
--- a/tests/testinfobar.c
+++ b/tests/testinfobar.c
@@ -14,7 +14,7 @@ on_info_bar_response (GtkInfoBar *info_bar,
   switch (response_id)
   {
   case GTK_RESPONSE_CLOSE:
-    gtk_widget_hide (GTK_WIDGET (info_bar));
+    gtk_widget_set_visible (GTK_WIDGET (info_bar), FALSE);
     break;
 
   case RESPONSE_UNREVEAL:
diff --git a/tests/testinhibitshortcuts.c b/tests/testinhibitshortcuts.c
index 62d59047c5..3c818ef9a5 100644
--- a/tests/testinhibitshortcuts.c
+++ b/tests/testinhibitshortcuts.c
@@ -96,7 +96,7 @@ main (int argc, char *argv[])
   g_signal_connect (G_OBJECT (surface), "notify::shortcuts-inhibited",
                     G_CALLBACK (on_shortcuts_inhibit_change), button);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testkineticscrolling.c b/tests/testkineticscrolling.c
index 9ce50288c8..5096db646c 100644
--- a/tests/testkineticscrolling.c
+++ b/tests/testkineticscrolling.c
@@ -122,7 +122,7 @@ kinetic_scrolling (void)
 
   gtk_window_set_child (GTK_WINDOW (window), grid);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 int
diff --git a/tests/testlevelbar.c b/tests/testlevelbar.c
index 2886d66f7c..e3ace27e3d 100644
--- a/tests/testlevelbar.c
+++ b/tests/testlevelbar.c
@@ -106,7 +106,7 @@ main (int argc, char *argv[])
   gtk_box_append (GTK_BOX (box2), sw);
   g_signal_connect (sw, "notify::active", G_CALLBACK (toggle), bar);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
diff --git a/tests/testlist.c b/tests/testlist.c
index 435e2250f2..d0372dc243 100644
--- a/tests/testlist.c
+++ b/tests/testlist.c
@@ -362,7 +362,7 @@ main (int argc, char *argv[])
   gtk_box_append (GTK_BOX (vbox), button);
   g_signal_connect (button, "clicked", G_CALLBACK (visibility_clicked_cb), row3);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testlist2.c b/tests/testlist2.c
index 0a43faf29e..57c3062eee 100644
--- a/tests/testlist2.c
+++ b/tests/testlist2.c
@@ -133,7 +133,7 @@ int main (int argc, char *argv[])
     }
 
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testlist3.c b/tests/testlist3.c
index 87b8b44b62..d272c4bd5e 100644
--- a/tests/testlist3.c
+++ b/tests/testlist3.c
@@ -177,7 +177,7 @@ main (int argc, char *argv[])
       gtk_list_box_insert (GTK_LIST_BOX (list), row, -1);
     }
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testlist4.c b/tests/testlist4.c
index 5bf7910ff0..5e0263ab0b 100644
--- a/tests/testlist4.c
+++ b/tests/testlist4.c
@@ -174,7 +174,7 @@ new_window (GApplication *app)
                     G_CALLBACK (row_without_gaction_activated_cb), label);
 
   /* let the show begin */
-  gtk_widget_show (GTK_WIDGET (window));
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 static void
diff --git a/tests/testlistview-animating.c b/tests/testlistview-animating.c
index 9554f6fc97..7c25180a0f 100644
--- a/tests/testlistview-animating.c
+++ b/tests/testlistview-animating.c
@@ -178,7 +178,7 @@ main (int   argc,
   g_timeout_add (100, do_stuff, store);
   g_timeout_add_seconds (3, revert_sort, sorter);
 
-  gtk_widget_show (win);
+  gtk_window_present (GTK_WINDOW (win));
 
   toplevels = gtk_window_get_toplevels ();
   while (g_list_model_get_n_items (toplevels))
diff --git a/tests/testlistview.c b/tests/testlistview.c
index 47e54e1023..2ceb672169 100644
--- a/tests/testlistview.c
+++ b/tests/testlistview.c
@@ -647,7 +647,7 @@ main (int argc, char *argv[])
 
   g_object_unref (selectionmodel);
 
-  gtk_widget_show (win);
+  gtk_window_present (GTK_WINDOW (win));
 
   toplevels = gtk_window_get_toplevels ();
   while (g_list_model_get_n_items (toplevels))
diff --git a/tests/testlockbutton.c b/tests/testlockbutton.c
index 88665bc3b8..67bcb45853 100644
--- a/tests/testlockbutton.c
+++ b/tests/testlockbutton.c
@@ -263,8 +263,8 @@ main (int argc, char *argv[])
   gtk_box_append (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), content);
   gtk_box_append (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), button);
 
-  gtk_widget_show (window);
-  gtk_widget_show (dialog);
+  gtk_window_present (GTK_WINDOW (window));
+  gtk_window_present (GTK_WINDOW (dialog));
 
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testlogout.c b/tests/testlogout.c
index bf05fae7d1..529bd265a7 100644
--- a/tests/testlogout.c
+++ b/tests/testlogout.c
@@ -127,7 +127,7 @@ activate (GtkApplication *app,
   gtk_grid_set_row_spacing (GTK_GRID (grid), 6);
   gtk_grid_set_column_spacing (GTK_GRID (grid), 6);
 
-  gtk_widget_show (win);
+  gtk_window_present (GTK_WINDOW (win));
 
   gtk_application_add_window (app, GTK_WINDOW (win));
 }
diff --git a/tests/testmenubutton.c b/tests/testmenubutton.c
index 8fb8431a1d..52ef96bd2e 100644
--- a/tests/testmenubutton.c
+++ b/tests/testmenubutton.c
@@ -115,7 +115,7 @@ int main (int argc, char **argv)
 	gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (button), G_MENU_MODEL (menu));
 	gtk_grid_attach (GTK_GRID (grid), button, 1, row++, 1, 1);
 
-	gtk_widget_show (window);
+	gtk_window_present (GTK_WINDOW (window));
 
         while (TRUE)
                 g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testmodelbutton.c b/tests/testmodelbutton.c
index 3bf057648b..027e36a278 100644
--- a/tests/testmodelbutton.c
+++ b/tests/testmodelbutton.c
@@ -77,7 +77,7 @@ on_application_activate (GApplication *gapplication,
 
   widget = gtk_window_new ();
   gtk_box_append (GTK_BOX (widget), box);
-  gtk_widget_show (widget);
+  gtk_window_present (GTK_WINDOW (widget))
   gtk_application_add_window (GTK_APPLICATION (application), GTK_WINDOW (widget));
 }
 
diff --git a/tests/testnotebookdnd.c b/tests/testnotebookdnd.c
index 32f2b97773..85ec062af8 100644
--- a/tests/testnotebookdnd.c
+++ b/tests/testnotebookdnd.c
@@ -75,7 +75,7 @@ window_creation_function (GtkNotebook *source_notebook,
   gtk_window_set_child (GTK_WINDOW (window), notebook);
 
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   return GTK_NOTEBOOK (notebook);
 }
@@ -320,7 +320,7 @@ main (int argc, char *argv[])
 
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testoutsetshadowdrawing.c b/tests/testoutsetshadowdrawing.c
index f619d97e3d..ad79a9a25f 100644
--- a/tests/testoutsetshadowdrawing.c
+++ b/tests/testoutsetshadowdrawing.c
@@ -165,7 +165,7 @@ main (int argc, char **argv)
   gtk_box_append (GTK_BOX (box), bottom);
   gtk_window_set_child (GTK_WINDOW (window), box);
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testoverlay.c b/tests/testoverlay.c
index 5f36060f6b..83c551998f 100644
--- a/tests/testoverlay.c
+++ b/tests/testoverlay.c
@@ -538,28 +538,28 @@ main (int argc, char *argv[])
                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
   win1 = test_nonzerox ();
-  gtk_widget_show (win1);
+  gtk_window_present (GTK_WINDOW (win1));
 
   win2 = test_relative ();
-  gtk_widget_show (win2);
+  gtk_window_present (GTK_WINDOW (win2));
 
   win3 = test_fullwidth ();
-  gtk_widget_show (win3);
+  gtk_window_present (GTK_WINDOW (win3));
 
   win4 = test_scrolling ();
-  gtk_widget_show (win4);
+  gtk_window_present (GTK_WINDOW (win4));
 
   win5 = test_builder ();
-  gtk_widget_show (win5);
+  gtk_window_present (GTK_WINDOW (win5));
 
   win6 = test_chase ();
-  gtk_widget_show (win6);
+  gtk_window_present (GTK_WINDOW (win6));
 
   win7 = test_stacking ();
-  gtk_widget_show (win7);
+  gtk_window_present (GTK_WINDOW (win7));
 
   win8 = test_input_stacking ();
-  gtk_widget_show (win8);
+  gtk_window_present (GTK_WINDOW (win8));
 
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testoverlaystyleclass.c b/tests/testoverlaystyleclass.c
index 51c24ca7b1..747783972a 100644
--- a/tests/testoverlaystyleclass.c
+++ b/tests/testoverlaystyleclass.c
@@ -123,7 +123,7 @@ main (int argc, char *argv[])
 
   g_print ("\n");
 
-  gtk_widget_show (win);
+  gtk_window_present (GTK_WINDOW (win));
 
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testplacesview.c b/tests/testplacesview.c
index 50e00e99cc..86bcc6437d 100644
--- a/tests/testplacesview.c
+++ b/tests/testplacesview.c
@@ -28,7 +28,7 @@ main (int argc, char *argv[])
   view = gtk_places_view_new ();
 
   gtk_window_set_child (GTK_WINDOW (win), view);
-  gtk_widget_show (win);
+  gtk_window_present (GTK_WINDOW (win));
 
   g_signal_connect (win, "destroy", G_CALLBACK (quit_cb), &done);
 
diff --git a/tests/testpopover.c b/tests/testpopover.c
index c7bfc48fc3..863be85830 100644
--- a/tests/testpopover.c
+++ b/tests/testpopover.c
@@ -194,7 +194,7 @@ main (int argc, char *argv[])
 
 
   g_signal_connect (win, "destroy", G_CALLBACK (quit_cb), &done);
-  gtk_widget_show (win);
+  gtk_window_present (GTK_WINDOW (win));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testrevealer.c b/tests/testrevealer.c
index 0a97193587..f72e04e6e7 100644
--- a/tests/testrevealer.c
+++ b/tests/testrevealer.c
@@ -162,7 +162,7 @@ main (int argc,
   gtk_revealer_set_transition_duration (GTK_REVEALER (revealer), 2000);
   gtk_grid_attach (GTK_GRID (box), revealer, 3, 4, 1, 1);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
 
diff --git a/tests/testscale.c b/tests/testscale.c
index 2c73d30f1b..27a4bb6e8a 100644
--- a/tests/testscale.c
+++ b/tests/testscale.c
@@ -232,13 +232,13 @@ int main (int argc, char *argv[])
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
   g_signal_connect (button, "toggled", G_CALLBACK (trough), NULL);
   gtk_box_append (GTK_BOX (box2), button);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   button = gtk_toggle_button_new_with_label ("Extra");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), FALSE);
   g_signal_connect (button, "toggled", G_CALLBACK (extra), NULL);
   gtk_box_append (GTK_BOX (box2), button);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testscrolledge.c b/tests/testscrolledge.c
index 5661202d1a..3780845413 100644
--- a/tests/testscrolledge.c
+++ b/tests/testscrolledge.c
@@ -58,7 +58,7 @@ add_rows (gpointer data)
 {
   GtkListBox *list = data;
 
-  gtk_widget_hide (popup);
+  gtk_widget_set_visible (popup, FALSE);
   gtk_spinner_stop (GTK_SPINNER (spinner));
 
   populate_list (list);
@@ -75,7 +75,7 @@ edge_overshot (GtkScrolledWindow *sw,
   if (pos == GTK_POS_BOTTOM)
     {
       gtk_spinner_start (GTK_SPINNER (spinner));
-      gtk_widget_show (popup);
+      gtk_widget_set_visible (popup, TRUE);
 
       if (add_rows_id == 0)
         add_rows_id = g_timeout_add (2000, add_rows, list);
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
   gtk_box_append (GTK_BOX (popup), spinner);
 
   gtk_overlay_add_overlay (GTK_OVERLAY (overlay), popup);
-  gtk_widget_hide (popup);
+  gtk_widget_set_visible (popup, FALSE);
 
   sw = gtk_scrolled_window_new ();
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
@@ -133,7 +133,7 @@ main (int argc, char *argv[])
   g_signal_connect (sw, "edge-overshot", G_CALLBACK (edge_overshot), list);
   g_signal_connect (sw, "edge-reached", G_CALLBACK (edge_reached), list);
 
-  gtk_widget_show (win);
+  gtk_window_present (GTK_WINDOW (win));
 
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testscrolledwindow.c b/tests/testscrolledwindow.c
index 59ce67ac21..834e04cdb8 100644
--- a/tests/testscrolledwindow.c
+++ b/tests/testscrolledwindow.c
@@ -194,7 +194,7 @@ scrollable_policy (void)
   g_signal_connect (G_OBJECT (widget), "toggled",
                     G_CALLBACK (kinetic_scrolling_changed), swindow);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   /* Popover */
   popover = gtk_popover_new ();
diff --git a/tests/testselectionmode.c b/tests/testselectionmode.c
index 823663396a..2353befbde 100644
--- a/tests/testselectionmode.c
+++ b/tests/testselectionmode.c
@@ -114,9 +114,9 @@ selection_mode_enter (GtkButton *button, GtkBuilder *builder)
  
   gtk_widget_add_css_class (header, "selection-mode");
   gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), FALSE);
-  gtk_widget_hide (headerbutton);
-  gtk_widget_hide (selectbutton);
-  gtk_widget_show (cancelbutton);
+  gtk_widget_set_visible (headerbutton, FALSE);
+  gtk_widget_set_visible (selectbutton, FALSE);
+  gtk_widget_set_visible (cancelbutton, TRUE);
   gtk_stack_set_visible_child_name (GTK_STACK (titlestack), "selection");
 
   gtk_list_box_set_activate_on_single_click (GTK_LIST_BOX (list), FALSE);
@@ -147,9 +147,9 @@ selection_mode_leave (GtkButton *button, GtkBuilder *builder)
 
   gtk_widget_remove_css_class (header, "selection-mode");
   gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
-  gtk_widget_show (headerbutton);
-  gtk_widget_show (selectbutton);
-  gtk_widget_hide (cancelbutton);
+  gtk_widget_set_visible (headerbutton, TRUE);
+  gtk_widget_set_visible (selectbutton, TRUE);
+  gtk_widget_set_visible (cancelbutton, FALSE);
   gtk_stack_set_visible_child_name (GTK_STACK (titlestack), "title");
 
   gtk_list_box_set_activate_on_single_click (GTK_LIST_BOX (list), TRUE);
@@ -225,7 +225,7 @@ main (int argc, char *argv[])
 
   g_signal_connect (list, "selected-rows-changed", G_CALLBACK (selected_rows_changed), NULL);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
  
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testsensitive.c b/tests/testsensitive.c
index e53d80049d..04ed007c88 100644
--- a/tests/testsensitive.c
+++ b/tests/testsensitive.c
@@ -79,7 +79,7 @@ int main (int argc, char *argv[])
 
   g_object_bind_property (c, "active", w, "sensitive", G_BINDING_BIDIRECTIONAL);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testspinbutton.c b/tests/testspinbutton.c
index 0d21cf3a0b..fd2f4ca2e9 100644
--- a/tests/testspinbutton.c
+++ b/tests/testspinbutton.c
@@ -69,7 +69,7 @@ prepare_window_for_orientation (GtkOrientation orientation)
       gtk_box_append (GTK_BOX (mainbox), hbox);
     }
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
   num_windows++;
 }
 
diff --git a/tests/teststack.c b/tests/teststack.c
index fa15b56004..198e9b5f7e 100644
--- a/tests/teststack.c
+++ b/tests/teststack.c
@@ -258,7 +258,7 @@ main (int argc,
                     (GCallback)update_forward_button_sensitivity, button);
 
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
 
diff --git a/tests/testswitch.c b/tests/testswitch.c
index 015700d1f4..02b496f92b 100644
--- a/tests/testswitch.c
+++ b/tests/testswitch.c
@@ -170,7 +170,7 @@ int main (int argc, char *argv[])
   gtk_window_set_title (GTK_WINDOW (window), "GtkSwitch");
   gtk_window_set_default_size (GTK_WINDOW (window), 400, -1);
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   gtk_window_set_child (GTK_WINDOW (window), vbox);
diff --git a/tests/testtextscroll.c b/tests/testtextscroll.c
index d0787d5557..bd1cb835a4 100644
--- a/tests/testtextscroll.c
+++ b/tests/testtextscroll.c
@@ -184,7 +184,7 @@ main (int argc, char *argv[])
 
   gtk_window_set_child (GTK_WINDOW (window), box);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (1)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testtexture.c b/tests/testtexture.c
index 78c5464949..335f847fb8 100644
--- a/tests/testtexture.c
+++ b/tests/testtexture.c
@@ -145,7 +145,7 @@ main (int argc, char **argv)
 
   gtk_window_set_child (GTK_WINDOW (window), view);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testtextview.c b/tests/testtextview.c
index ae7d65ec06..cb893d5ea0 100644
--- a/tests/testtextview.c
+++ b/tests/testtextview.c
@@ -201,7 +201,7 @@ main (int argc, char **argv)
   gtk_text_view_add_child_at_anchor (GTK_TEXT_VIEW (textview),
                                      button2, anchor);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testtextview2.c b/tests/testtextview2.c
index 16353ac366..df06849e33 100644
--- a/tests/testtextview2.c
+++ b/tests/testtextview2.c
@@ -242,7 +242,7 @@ main (int argc, char *argv[])
   g_signal_connect (button, "notify::active", G_CALLBACK (toggle_cursor), NULL);
   gtk_box_append (GTK_BOX (box2), button);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testtooltips.c b/tests/testtooltips.c
index c312ce69b1..f8c512d3ce 100644
--- a/tests/testtooltips.c
+++ b/tests/testtooltips.c
@@ -447,7 +447,7 @@ main (int argc, char *argv[])
   gtk_box_append (GTK_BOX (box), button);
 
   /* Done! */
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testtransform.c b/tests/testtransform.c
index e14de24ce3..19990038c6 100644
--- a/tests/testtransform.c
+++ b/tests/testtransform.c
@@ -84,7 +84,7 @@ main (int argc, char *argv[])
 
   gtk_window_set_child (GTK_WINDOW (window), fixed2);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testtreechanging.c b/tests/testtreechanging.c
index 7845fd8fa1..fe930b3676 100644
--- a/tests/testtreechanging.c
+++ b/tests/testtreechanging.c
@@ -519,7 +519,7 @@ main (int    argc,
     add (GTK_TREE_VIEW (treeview));
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), treeview);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   g_idle_add (dance, treeview);
   
diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c
index 4fc4fb7410..decb99f185 100644
--- a/tests/testtreecolumns.c
+++ b/tests/testtreecolumns.c
@@ -766,7 +766,7 @@ main (int argc, char *argv[])
   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);
+  gtk_window_present (GTK_WINDOW (window));
 
   window = gtk_window_new ();
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done); 
@@ -775,7 +775,7 @@ main (int argc, char *argv[])
   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);
+  gtk_window_present (GTK_WINDOW (window));
 
   /* Set up the main window */
   window = gtk_window_new ();
@@ -912,7 +912,7 @@ main (int argc, char *argv[])
   g_signal_connect (button, "clicked", G_CALLBACK (add_clicked), left_tree_model);
   gtk_box_append (GTK_BOX (hbox), button);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testtreecolumnsizing.c b/tests/testtreecolumnsizing.c
index 48a08e26d7..520a4c51e0 100644
--- a/tests/testtreecolumnsizing.c
+++ b/tests/testtreecolumnsizing.c
@@ -243,7 +243,7 @@ main (int argc, char **argv)
   gtk_combo_box_set_active (GTK_COMBO_BOX (combo_box), 0);
 
   /* Done */
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testtreednd.c b/tests/testtreednd.c
index 5debefaf87..4cd34f6d77 100644
--- a/tests/testtreednd.c
+++ b/tests/testtreednd.c
@@ -128,7 +128,7 @@ main (int argc, char *argv[])
   gtk_box_append (GTK_BOX (box), get_dragsource ());
   gtk_box_append (GTK_BOX (box), get_droptarget ());
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testtreeedit.c b/tests/testtreeedit.c
index 3e70813c32..96f8b114c7 100644
--- a/tests/testtreeedit.c
+++ b/tests/testtreeedit.c
@@ -395,7 +395,7 @@ main (int argc, char **argv)
   create_control (cntl_vbox, 3, CNTL_FIXED, &callback[2]);
   create_control (cntl_vbox, 4, CNTL_FIXED, &callback[3]);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testtreeflow.c b/tests/testtreeflow.c
index 6e2474bc6a..79d37349dc 100644
--- a/tests/testtreeflow.c
+++ b/tests/testtreeflow.c
@@ -180,7 +180,7 @@ main (int argc, char *argv[])
   g_signal_connect (button, "clicked", G_CALLBACK (futz), NULL);
   g_signal_connect (button, "realize", G_CALLBACK (gtk_widget_grab_focus), NULL);
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 400);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
   g_timeout_add (1000, (GSourceFunc) futz, NULL);
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c
index ac29abf903..d97bc89537 100644
--- a/tests/testtreefocus.c
+++ b/tests/testtreefocus.c
@@ -475,7 +475,7 @@ main (int argc, char *argv[])
 		    NULL);
   gtk_window_set_default_size (GTK_WINDOW (window),
 			       650, 400);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Model");
@@ -543,7 +543,7 @@ main (int argc, char *argv[])
   gtk_window_set_default_size (GTK_WINDOW (window),
 			       650, 400);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
   while (!done)
     g_main_context_iteration (NULL, TRUE);
 
diff --git a/tests/testtreepos.c b/tests/testtreepos.c
index d3cabaab3f..559f5bd709 100644
--- a/tests/testtreepos.c
+++ b/tests/testtreepos.c
@@ -138,7 +138,7 @@ int main (int argc, char *argv[])
                     G_CALLBACK (release_event), tv);
   gtk_widget_add_controller (tv, GTK_EVENT_CONTROLLER (gesture));
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testtreesort.c b/tests/testtreesort.c
index dac2aafcb0..f5d5c3526c 100644
--- a/tests/testtreesort.c
+++ b/tests/testtreesort.c
@@ -238,7 +238,7 @@ main (int argc, char *argv[])
 
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), tree_view);
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   /**
    * Second window - GtkTreeModelSort wrapping the GtkTreeStore
@@ -303,7 +303,7 @@ main (int argc, char *argv[])
 
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window2), tree_view2);
       gtk_window_set_default_size (GTK_WINDOW (window2), 400, 400);
-      gtk_widget_show (window2);
+      gtk_window_present (GTK_WINDOW (window2));
     }
   
   /**
@@ -370,7 +370,7 @@ main (int argc, char *argv[])
 
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window3), tree_view3);
       gtk_window_set_default_size (GTK_WINDOW (window3), 400, 400);
-      gtk_widget_show (window3);
+      gtk_window_present (GTK_WINDOW (window3));
     }
 
   for (i = 0; data[i].word_1 != NULL; i++)
diff --git a/tests/testtreeview.c b/tests/testtreeview.c
index 6a828c8f90..46300a188f 100644
--- a/tests/testtreeview.c
+++ b/tests/testtreeview.c
@@ -757,7 +757,7 @@ main (int    argc,
   
   gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), tv);
   
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
   
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testverticalcells.c b/tests/testverticalcells.c
index 739e7e6068..8528f5bece 100644
--- a/tests/testverticalcells.c
+++ b/tests/testverticalcells.c
@@ -384,7 +384,7 @@ main (int argc, char **argv)
   gtk_window_set_default_size (GTK_WINDOW (window),
 			       800, 400);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
   while (!done)
     g_main_context_iteration (NULL, TRUE);
 
diff --git a/tests/testvolumebutton.c b/tests/testvolumebutton.c
index 982d5c285d..593dd6755d 100644
--- a/tests/testvolumebutton.c
+++ b/tests/testvolumebutton.c
@@ -51,7 +51,7 @@ show_error (gpointer data)
   g_signal_connect_object (G_OBJECT (dialog),
                            "response",
                            G_CALLBACK (response_cb), NULL, 0);
-  gtk_widget_show (dialog);
+  gtk_window_present (GTK_WINDOW (dialog));
 
   return G_SOURCE_REMOVE;
 }
@@ -84,7 +84,7 @@ main (int    argc,
   gtk_box_append (GTK_BOX (box), button);
   gtk_box_append (GTK_BOX (box), button2);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
   g_timeout_add (4000, (GSourceFunc) show_error, window);
 
   while (TRUE)
diff --git a/tests/testwidgetfocus.c b/tests/testwidgetfocus.c
index fa58fad2c1..25d71c7485 100644
--- a/tests/testwidgetfocus.c
+++ b/tests/testwidgetfocus.c
@@ -300,7 +300,7 @@ main(int argc, char **argv)
   gtk_window_set_child (GTK_WINDOW (window), widget);
   g_signal_connect (window, "destroy", G_CALLBACK (quit_cb), &done);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testwidgettransforms.c b/tests/testwidgettransforms.c
index 0deca31e4f..c729768589 100644
--- a/tests/testwidgettransforms.c
+++ b/tests/testwidgettransforms.c
@@ -344,7 +344,7 @@ main (int argc, char **argv)
 
   gtk_window_set_default_size ((GtkWindow *)window, 200, 200);
   g_signal_connect (window, "close-request", G_CALLBACK (quit_cb), &done);
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (!done)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testwindowdrag.c b/tests/testwindowdrag.c
index 1c25a906fa..8b60835165 100644
--- a/tests/testwindowdrag.c
+++ b/tests/testwindowdrag.c
@@ -134,7 +134,7 @@ main (int argc, char *argv[])
                    resize_button (GDK_SURFACE_EDGE_SOUTH_EAST), 
                    2, 2, 1, 1);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   while (TRUE)
     g_main_context_iteration (NULL, TRUE);
diff --git a/tests/testwindowsize.c b/tests/testwindowsize.c
index f280ba2158..e21f06e32b 100644
--- a/tests/testwindowsize.c
+++ b/tests/testwindowsize.c
@@ -83,7 +83,7 @@ show_dialog (void)
   g_signal_connect (dialog, "response",
                     G_CALLBACK (gtk_window_destroy),
                     NULL);
-  gtk_widget_show (dialog);
+  gtk_window_present (GTK_WINDOW (dialog));
 }
 
 static void
@@ -141,7 +141,7 @@ create_window (void)
   g_signal_connect (button, "clicked", G_CALLBACK (show_dialog), NULL);
   gtk_grid_attach (GTK_GRID (grid), button, 2, 4, 1, 1);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   GMainLoop *loop = g_main_loop_new (NULL, FALSE);
 
diff --git a/tests/treestoretest.c b/tests/treestoretest.c
index b7f4a622bb..19da9c595a 100644
--- a/tests/treestoretest.c
+++ b/tests/treestoretest.c
@@ -451,7 +451,7 @@ make_window (int view_type)
       iter_append (NULL, GTK_TREE_VIEW (tree_view));
     }
   /* Show it all */
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 }
 
 int
diff --git a/tests/video-timer.c b/tests/video-timer.c
index ed070e111f..1a8a04da05 100644
--- a/tests/video-timer.c
+++ b/tests/video-timer.c
@@ -404,7 +404,7 @@ main(int argc, char **argv)
   gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), on_draw, NULL, NULL);
   gtk_window_set_child (GTK_WINDOW (window), da);
 
-  gtk_widget_show (window);
+  gtk_window_present (GTK_WINDOW (window));
 
   frame_queue = g_queue_new ();
   g_mutex_init (&frame_mutex);