[gtk/drag-icon: 1/3] Drop GtkWindowType



commit ec92058221078b23b591d01d69d46237588de197
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Dec 30 01:13:02 2019 -0500

    Drop GtkWindowType
    
    GtkWindow is always a toplevel now, so we don't
    need to pass a type to the constructor anymore.
    
    Adjust all callers.

 demos/constraint-editor/constraint-editor-window.c |   4 +-
 demos/gtk-demo/clipboard.c                         |   2 +-
 demos/gtk-demo/colorsel.c                          |   2 +-
 demos/gtk-demo/combobox.c                          |   2 +-
 demos/gtk-demo/constraints.c                       |   2 +-
 demos/gtk-demo/constraints2.c                      |   2 +-
 demos/gtk-demo/constraints3.c                      |   2 +-
 demos/gtk-demo/css_accordion.c                     |   2 +-
 demos/gtk-demo/css_basics.c                        |   2 +-
 demos/gtk-demo/css_multiplebgs.c                   |   2 +-
 demos/gtk-demo/css_pixbufs.c                       |   2 +-
 demos/gtk-demo/css_shadows.c                       |   2 +-
 demos/gtk-demo/dialog.c                            |   2 +-
 demos/gtk-demo/dnd.c                               |   2 +-
 demos/gtk-demo/drawingarea.c                       |   2 +-
 demos/gtk-demo/editable_cells.c                    |   2 +-
 demos/gtk-demo/entry_completion.c                  |   2 +-
 demos/gtk-demo/entry_undo.c                        |   2 +-
 demos/gtk-demo/fixed.c                             |   2 +-
 demos/gtk-demo/flowbox.c                           |   2 +-
 demos/gtk-demo/foreigndrawing.c                    |   2 +-
 demos/gtk-demo/gestures.c                          |   2 +-
 demos/gtk-demo/glarea.c                            |   2 +-
 demos/gtk-demo/headerbar.c                         |   2 +-
 demos/gtk-demo/hypertext.c                         |   2 +-
 demos/gtk-demo/iconview.c                          |   2 +-
 demos/gtk-demo/iconview_edit.c                     |   2 +-
 demos/gtk-demo/images.c                            |   2 +-
 demos/gtk-demo/infobar.c                           |   2 +-
 demos/gtk-demo/links.c                             |   2 +-
 demos/gtk-demo/list_store.c                        |   2 +-
 demos/gtk-demo/listbox.c                           |   2 +-
 demos/gtk-demo/markup.c                            |   2 +-
 demos/gtk-demo/overlay.c                           |   2 +-
 demos/gtk-demo/overlay2.c                          |   2 +-
 demos/gtk-demo/paint.c                             |   2 +-
 demos/gtk-demo/paintable.c                         |   2 +-
 demos/gtk-demo/paintable_animated.c                |   2 +-
 demos/gtk-demo/paintable_mediastream.c             |   2 +-
 demos/gtk-demo/panes.c                             |   2 +-
 demos/gtk-demo/password_entry.c                    |   2 +-
 demos/gtk-demo/pickers.c                           |   2 +-
 demos/gtk-demo/pixbufs.c                           |   2 +-
 demos/gtk-demo/popover.c                           |   2 +-
 demos/gtk-demo/rotated_text.c                      |   2 +-
 demos/gtk-demo/search_entry.c                      |   2 +-
 demos/gtk-demo/search_entry2.c                     |   2 +-
 demos/gtk-demo/sidebar.c                           |   2 +-
 demos/gtk-demo/sizegroup.c                         |   2 +-
 demos/gtk-demo/sliding_puzzle.c                    |   2 +-
 demos/gtk-demo/tabs.c                              |   2 +-
 demos/gtk-demo/tagged_entry.c                      |   2 +-
 demos/gtk-demo/textmask.c                          |   2 +-
 demos/gtk-demo/textscroll.c                        |   2 +-
 demos/gtk-demo/textundo.c                          |   2 +-
 demos/gtk-demo/textview.c                          |   4 +-
 demos/gtk-demo/theming_style_classes.c             |   2 +-
 demos/gtk-demo/transparent.c                       |   2 +-
 demos/gtk-demo/tree_store.c                        |   2 +-
 demos/gtk-demo/video_player.c                      |   2 +-
 docs/reference/gtk/gtk4-sections.txt               |   1 -
 docs/tools/widgets.c                               |   8 +-
 gtk/a11y/gtkwindowaccessible.c                     |   7 +-
 gtk/gtkimcontextxim.c                              |   2 +-
 gtk/gtkmain.c                                      |   2 +-
 gtk/gtkprintoperation-win32.c                      |   2 +-
 gtk/gtkradiobutton.c                               |   2 +-
 gtk/gtkspinbutton.c                                |   4 +-
 gtk/gtktogglebutton.c                              |   2 +-
 gtk/gtkwindow.c                                    | 277 ++++++---------------
 gtk/gtkwindow.h                                    |  31 +--
 gtk/inspector/object-tree.c                        |   3 +-
 gtk/tools/gtk-builder-tool-preview.c               |   2 +-
 tests/animated-resizing.c                          |   2 +-
 tests/animated-revealing.c                         |   2 +-
 tests/gdkgears.c                                   |   2 +-
 tests/listmodel.c                                  |   2 +-
 tests/meson.build                                  |   1 -
 tests/motion-compression.c                         |   2 +-
 tests/overlayscroll.c                              |   2 +-
 tests/scrolling-performance.c                      |   2 +-
 tests/showrendernode.c                             |   2 +-
 tests/simple.c                                     |   2 +-
 tests/stresstest-toolbar.c                         |   2 +-
 tests/syncscroll.c                                 |   2 +-
 tests/testaccel.c                                  |   2 +-
 tests/testadjustsize.c                             |  10 +-
 tests/testappchooser.c                             |   2 +-
 tests/testappchooserbutton.c                       |   2 +-
 tests/testassistant.c                              |   2 +-
 tests/testbaseline.c                               |   2 +-
 tests/testblur.c                                   |   2 +-
 tests/testborderdrawing.c                          |   2 +-
 tests/testbox.c                                    |   2 +-
 tests/testbuttons.c                                |   2 +-
 tests/testcairo.c                                  |   2 +-
 tests/testcalendar.c                               |   2 +-
 tests/testcellarea.c                               |   6 +-
 tests/testcellrenderertext.c                       |   2 +-
 tests/testcenterbox.c                              |   2 +-
 tests/testclipboard2.c                             |   2 +-
 tests/testcombo.c                                  |   2 +-
 tests/testdialog.c                                 |   2 +-
 tests/testdnd.c                                    |   2 +-
 tests/testdnd2.c                                   |   2 +-
 tests/testellipsise.c                              |   2 +-
 tests/testemblems.c                                |   2 +-
 tests/testentrycompletion.c                        |   2 +-
 tests/testentryicons.c                             |   2 +-
 tests/testexpand.c                                 |   4 +-
 tests/testfilechooser.c                            |   2 +-
 tests/testfilechooserbutton.c                      |   2 +-
 tests/testflowbox.c                                |   2 +-
 tests/testfontchooser.c                            |   2 +-
 tests/testfontchooserdialog.c                      |   2 +-
 tests/testfontoptions.c                            |   2 +-
 tests/testframe.c                                  |   2 +-
 tests/testfullscreen.c                             |   2 +-
 tests/testgaction.c                                |   2 +-
 tests/testgiconpixbuf.c                            |   2 +-
 tests/testglarea.c                                 |   2 +-
 tests/testglblending.c                             |   2 +-
 tests/testgmenu.c                                  |   2 +-
 tests/testgrid.c                                   |  16 +-
 tests/testgridbaseline.c                           |   2 +-
 tests/testgrouping.c                               |   2 +-
 tests/testgtk.c                                    |  64 +++--
 tests/testheaderbar.c                              |   2 +-
 tests/testheightforwidth.c                         |   2 +-
 tests/testicontheme.c                              |   4 +-
 tests/testiconview-keynav.c                        |   2 +-
 tests/testiconview.c                               |   2 +-
 tests/testimage.c                                  |   2 +-
 tests/testinfobar.c                                |   2 +-
 tests/testkineticscrolling.c                       |   2 +-
 tests/testlevelbar.c                               |   2 +-
 tests/testlist.c                                   |   2 +-
 tests/testlist2.c                                  |   2 +-
 tests/testlist3.c                                  |   2 +-
 tests/testlockbutton.c                             |   2 +-
 tests/testlogout.c                                 |   2 +-
 tests/testmenubutton.c                             |   2 +-
 tests/testmodelbutton.c                            |   2 +-
 tests/testnoscreen.c                               |   2 +-
 tests/testnotebookdnd.c                            |   4 +-
 tests/testorientable.c                             |   2 +-
 tests/testoutsetshadowdrawing.c                    |   2 +-
 tests/testoverlay.c                                |  14 +-
 tests/testoverlaystyleclass.c                      |   2 +-
 tests/testpixbuf-scale.c                           |   2 +-
 tests/testplacesview.c                             |   2 +-
 tests/testpopover.c                                |   2 +-
 tests/testrevealer.c                               |   2 +-
 tests/testscale.c                                  |   2 +-
 tests/testscrolledge.c                             |   2 +-
 tests/testscrolledwindow.c                         |   2 +-
 tests/testsensitive.c                              |   2 +-
 tests/testspinbutton.c                             |   2 +-
 tests/teststack.c                                  |   2 +-
 tests/testswitch.c                                 |   2 +-
 tests/testtexture.c                                |   2 +-
 tests/testtextview.c                               |   2 +-
 tests/testtoolbar.c                                |   2 +-
 tests/testtoolbar2.c                               |   2 +-
 tests/testtooltips.c                               |   2 +-
 tests/testtreechanging.c                           |   2 +-
 tests/testtreecolumns.c                            |   6 +-
 tests/testtreecolumnsizing.c                       |   2 +-
 tests/testtreednd.c                                |   2 +-
 tests/testtreeedit.c                               |   2 +-
 tests/testtreeflow.c                               |   2 +-
 tests/testtreefocus.c                              |   4 +-
 tests/testtreelistmodel.c                          |   2 +-
 tests/testtreepos.c                                |   2 +-
 tests/testtreesort.c                               |   6 +-
 tests/testtreeview.c                               |   2 +-
 tests/testverticalcells.c                          |   2 +-
 tests/testvolumebutton.c                           |   2 +-
 tests/testwidgetfocus.c                            |   2 +-
 tests/testwidgettransforms.c                       |   2 +-
 tests/testwindowdrag.c                             |   2 +-
 tests/testwindowsize.c                             |   2 +-
 tests/treestoretest.c                              |   2 +-
 tests/video-timer.c                                |   2 +-
 tests/visuals/visuals.c                            |   2 +-
 testsuite/a11y/children.c                          |   2 +-
 testsuite/gtk/action.c                             |   4 +-
 testsuite/gtk/builder.c                            |  21 --
 testsuite/gtk/displayclose.c                       |   2 +-
 testsuite/gtk/filtermodel.c                        |   6 +-
 testsuite/gtk/focus.c                              |   2 +-
 testsuite/gtk/gestures.c                           |  30 +--
 testsuite/gtk/grid-layout.c                        |  10 +-
 testsuite/gtk/popover.c                            |   2 +-
 testsuite/gtk/propertylookuplistmodel.c            |   2 +-
 testsuite/gtk/regression-tests.c                   |   4 +-
 testsuite/gtk/treeview.c                           |   2 +-
 testsuite/gtk/window.c                             |  33 +--
 198 files changed, 356 insertions(+), 570 deletions(-)
---
diff --git a/demos/constraint-editor/constraint-editor-window.c 
b/demos/constraint-editor/constraint-editor-window.c
index 823deb3c96..48d092c9da 100644
--- a/demos/constraint-editor/constraint-editor-window.c
+++ b/demos/constraint-editor/constraint-editor-window.c
@@ -400,7 +400,7 @@ edit_constraint (ConstraintEditorWindow *win,
   ConstraintEditor *editor;
   GListModel *model;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (win));
   gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
   if (constraint)
@@ -440,7 +440,7 @@ edit_guide (ConstraintEditorWindow *win,
   GtkWidget *window;
   GuideEditor *editor;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
   gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (win));
   gtk_window_set_title (GTK_WINDOW (window), "Edit Guide");
diff --git a/demos/gtk-demo/clipboard.c b/demos/gtk-demo/clipboard.c
index d4052e2e93..9da762c667 100644
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -248,7 +248,7 @@ do_clipboard (GtkWidget *do_widget)
       };
       GActionGroup *actions;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Clipboard");
diff --git a/demos/gtk-demo/colorsel.c b/demos/gtk-demo/colorsel.c
index 5ebdfd6a12..fa19813d2e 100644
--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -69,7 +69,7 @@ do_colorsel (GtkWidget *do_widget)
       color.green = 0;
       color.alpha = 1;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Color Chooser");
diff --git a/demos/gtk-demo/combobox.c b/demos/gtk-demo/combobox.c
index bfbda60791..ddf849f6a8 100644
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -310,7 +310,7 @@ do_combobox (GtkWidget *do_widget)
 
   if (!window)
   {
-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    window = gtk_window_new ();
     gtk_window_set_display (GTK_WINDOW (window),
                             gtk_widget_get_display (do_widget));
     gtk_window_set_title (GTK_WINDOW (window), "Combo Boxes");
diff --git a/demos/gtk-demo/constraints.c b/demos/gtk-demo/constraints.c
index 1b6b00b2f5..6c6fc30dab 100644
--- a/demos/gtk-demo/constraints.c
+++ b/demos/gtk-demo/constraints.c
@@ -255,7 +255,7 @@ do_constraints (GtkWidget *do_widget)
    {
      GtkWidget *header, *box, *grid, *button;
 
-     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+     window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));
 
      header = gtk_header_bar_new ();
diff --git a/demos/gtk-demo/constraints2.c b/demos/gtk-demo/constraints2.c
index 7ec7e09520..beb9c19ba9 100644
--- a/demos/gtk-demo/constraints2.c
+++ b/demos/gtk-demo/constraints2.c
@@ -211,7 +211,7 @@ do_constraints2 (GtkWidget *do_widget)
    {
      GtkWidget *header, *box, *grid, *button;
 
-     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+     window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));
 
      header = gtk_header_bar_new ();
diff --git a/demos/gtk-demo/constraints3.c b/demos/gtk-demo/constraints3.c
index 648f38125b..ec384e88bd 100644
--- a/demos/gtk-demo/constraints3.c
+++ b/demos/gtk-demo/constraints3.c
@@ -131,7 +131,7 @@ do_constraints3 (GtkWidget *do_widget)
    {
      GtkWidget *header, *box, *grid, *button;
 
-     window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+     window = gtk_window_new ();
      gtk_window_set_display (GTK_WINDOW (window), gtk_widget_get_display (do_widget));
 
      header = gtk_header_bar_new ();
diff --git a/demos/gtk-demo/css_accordion.c b/demos/gtk-demo/css_accordion.c
index 40c664f4ed..648393a506 100644
--- a/demos/gtk-demo/css_accordion.c
+++ b/demos/gtk-demo/css_accordion.c
@@ -24,7 +24,7 @@ do_css_accordion (GtkWidget *do_widget)
       GtkWidget *container, *child;
       GtkStyleProvider *provider;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "CSS Accordion");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 600, 300);
diff --git a/demos/gtk-demo/css_basics.c b/demos/gtk-demo/css_basics.c
index 06b36483ed..83e408dd68 100644
--- a/demos/gtk-demo/css_basics.c
+++ b/demos/gtk-demo/css_basics.c
@@ -72,7 +72,7 @@ do_css_basics (GtkWidget *do_widget)
       GtkTextBuffer *text;
       GBytes *bytes;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "CSS Basics");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
diff --git a/demos/gtk-demo/css_multiplebgs.c b/demos/gtk-demo/css_multiplebgs.c
index 6475c2c31a..056b647e69 100644
--- a/demos/gtk-demo/css_multiplebgs.c
+++ b/demos/gtk-demo/css_multiplebgs.c
@@ -86,7 +86,7 @@ do_css_multiplebgs (GtkWidget *do_widget)
       GtkTextBuffer *text;
       GBytes *bytes;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Multiple Backgrounds");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
diff --git a/demos/gtk-demo/css_pixbufs.c b/demos/gtk-demo/css_pixbufs.c
index 4846102ac3..e60a7d4e87 100644
--- a/demos/gtk-demo/css_pixbufs.c
+++ b/demos/gtk-demo/css_pixbufs.c
@@ -72,7 +72,7 @@ do_css_pixbufs (GtkWidget *do_widget)
       GtkTextBuffer *text;
       GBytes *bytes;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Animated Backgrounds");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
diff --git a/demos/gtk-demo/css_shadows.c b/demos/gtk-demo/css_shadows.c
index 318141c896..4ac4f56d61 100644
--- a/demos/gtk-demo/css_shadows.c
+++ b/demos/gtk-demo/css_shadows.c
@@ -94,7 +94,7 @@ do_css_shadows (GtkWidget *do_widget)
       GtkTextBuffer *text;
       GBytes *bytes;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Shadows");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
diff --git a/demos/gtk-demo/dialog.c b/demos/gtk-demo/dialog.c
index 70294af82f..f719dc3d18 100644
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -105,7 +105,7 @@ do_dialog (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Dialogs and Message Boxes");
diff --git a/demos/gtk-demo/dnd.c b/demos/gtk-demo/dnd.c
index c768398be5..bf82ccf37a 100644
--- a/demos/gtk-demo/dnd.c
+++ b/demos/gtk-demo/dnd.c
@@ -356,7 +356,7 @@ do_dnd (GtkWidget *do_widget)
       GtkGesture *multipress;
       GtkCssProvider *provider;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Drag-and-drop");
diff --git a/demos/gtk-demo/drawingarea.c b/demos/gtk-demo/drawingarea.c
index 7c09677577..875c4b7feb 100644
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -189,7 +189,7 @@ do_drawingarea (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Drawing Area");
diff --git a/demos/gtk-demo/editable_cells.c b/demos/gtk-demo/editable_cells.c
index f3fe0a6e2c..05076594f7 100644
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -345,7 +345,7 @@ do_editable_cells (GtkWidget *do_widget)
       GtkTreeModel *items_model;
       GtkTreeModel *numbers_model;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Editable Cells");
diff --git a/demos/gtk-demo/entry_completion.c b/demos/gtk-demo/entry_completion.c
index 2f6315566d..3c35038d32 100644
--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -45,7 +45,7 @@ do_entry_completion (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Entry Completion");
diff --git a/demos/gtk-demo/entry_undo.c b/demos/gtk-demo/entry_undo.c
index e94aefd529..089bc6b13c 100644
--- a/demos/gtk-demo/entry_undo.c
+++ b/demos/gtk-demo/entry_undo.c
@@ -20,7 +20,7 @@ do_entry_undo (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Entry Undo");
diff --git a/demos/gtk-demo/fixed.c b/demos/gtk-demo/fixed.c
index 745b8c7288..95715c992a 100644
--- a/demos/gtk-demo/fixed.c
+++ b/demos/gtk-demo/fixed.c
@@ -124,7 +124,7 @@ create_demo_window (GtkWidget *do_widget)
 {
   GtkWidget *window, *sw, *fixed, *cube;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
   gtk_window_set_title (GTK_WINDOW (window), "Fixed layout");
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
diff --git a/demos/gtk-demo/flowbox.c b/demos/gtk-demo/flowbox.c
index 6d599a2c13..09acaf42f9 100644
--- a/demos/gtk-demo/flowbox.c
+++ b/demos/gtk-demo/flowbox.c
@@ -719,7 +719,7 @@ do_flowbox (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Flow Box");
diff --git a/demos/gtk-demo/foreigndrawing.c b/demos/gtk-demo/foreigndrawing.c
index d72ecfd59e..1a01952b3b 100644
--- a/demos/gtk-demo/foreigndrawing.c
+++ b/demos/gtk-demo/foreigndrawing.c
@@ -957,7 +957,7 @@ do_foreigndrawing (GtkWidget *do_widget)
       GtkWidget *box;
       GtkWidget *da;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Foreign drawing");
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
diff --git a/demos/gtk-demo/gestures.c b/demos/gtk-demo/gestures.c
index 8d53ae3434..4c4c0a3f09 100644
--- a/demos/gtk-demo/gestures.c
+++ b/demos/gtk-demo/gestures.c
@@ -143,7 +143,7 @@ do_gestures (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
       gtk_window_set_title (GTK_WINDOW (window), "Gestures");
       g_signal_connect (window, "destroy",
diff --git a/demos/gtk-demo/glarea.c b/demos/gtk-demo/glarea.c
index 21e88b63ae..8f55301ec4 100644
--- a/demos/gtk-demo/glarea.c
+++ b/demos/gtk-demo/glarea.c
@@ -389,7 +389,7 @@ create_glarea_window (GtkWidget *do_widget)
   GtkWidget *window, *box, *button, *controls;
   int i;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
   gtk_window_set_title (GTK_WINDOW (window), "OpenGL Area");
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
diff --git a/demos/gtk-demo/headerbar.c b/demos/gtk-demo/headerbar.c
index 6784ea3905..dff42be3a4 100644
--- a/demos/gtk-demo/headerbar.c
+++ b/demos/gtk-demo/headerbar.c
@@ -23,7 +23,7 @@ do_headerbar (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
diff --git a/demos/gtk-demo/hypertext.c b/demos/gtk-demo/hypertext.c
index 5b6d42befc..6ced8931af 100644
--- a/demos/gtk-demo/hypertext.c
+++ b/demos/gtk-demo/hypertext.c
@@ -232,7 +232,7 @@ do_hypertext (GtkWidget *do_widget)
       GtkTextBuffer *buffer;
       GtkEventController *controller;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Hypertext");
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
diff --git a/demos/gtk-demo/iconview.c b/demos/gtk-demo/iconview.c
index d252ef36ec..dab23b30ea 100644
--- a/demos/gtk-demo/iconview.c
+++ b/demos/gtk-demo/iconview.c
@@ -250,7 +250,7 @@ do_iconview (GtkWidget *do_widget)
       GtkWidget *tool_bar;
       GtkToolItem *home_button;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_default_size (GTK_WINDOW (window), 650, 400);
 
       gtk_window_set_display (GTK_WINDOW (window),
diff --git a/demos/gtk-demo/iconview_edit.c b/demos/gtk-demo/iconview_edit.c
index 61c24563d4..a9b4f890b7 100644
--- a/demos/gtk-demo/iconview_edit.c
+++ b/demos/gtk-demo/iconview_edit.c
@@ -106,7 +106,7 @@ do_iconview_edit (GtkWidget *do_widget)
       GtkListStore *store;
       GtkCellRenderer *renderer;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
 
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
diff --git a/demos/gtk-demo/images.c b/demos/gtk-demo/images.c
index c90de20f6d..c8e16094b1 100644
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -331,7 +331,7 @@ do_images (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Images");
diff --git a/demos/gtk-demo/infobar.c b/demos/gtk-demo/infobar.c
index a78f2d9f61..21a2f51a9b 100644
--- a/demos/gtk-demo/infobar.c
+++ b/demos/gtk-demo/infobar.c
@@ -53,7 +53,7 @@ do_infobar (GtkWidget *do_widget)
     {
       actions = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Info Bars");
diff --git a/demos/gtk-demo/links.c b/demos/gtk-demo/links.c
index 0629ebfe84..feb2aafeb6 100644
--- a/demos/gtk-demo/links.c
+++ b/demos/gtk-demo/links.c
@@ -52,7 +52,7 @@ do_links (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Links");
diff --git a/demos/gtk-demo/list_store.c b/demos/gtk-demo/list_store.c
index 4812c38efa..f0e992b87b 100644
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -255,7 +255,7 @@ do_list_store (GtkWidget *do_widget)
       GtkWidget *treeview;
 
       /* create window, etc */
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "List Store");
diff --git a/demos/gtk-demo/listbox.c b/demos/gtk-demo/listbox.c
index 4e70c2f979..6b9f3cf5d9 100644
--- a/demos/gtk-demo/listbox.c
+++ b/demos/gtk-demo/listbox.c
@@ -347,7 +347,7 @@ do_listbox (GtkWidget *do_widget)
     {
       avatar_pixbuf_other = gdk_pixbuf_new_from_resource_at_scale ("/listbox/apple-red.png", 32, 32, FALSE, 
NULL);
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "List Box");
diff --git a/demos/gtk-demo/markup.c b/demos/gtk-demo/markup.c
index a57c82fb96..a4ad195c19 100644
--- a/demos/gtk-demo/markup.c
+++ b/demos/gtk-demo/markup.c
@@ -54,7 +54,7 @@ do_markup (GtkWidget *do_widget)
       GtkWidget *header;
       GtkWidget *show_source;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
diff --git a/demos/gtk-demo/overlay.c b/demos/gtk-demo/overlay.c
index 0e2f42a0e0..a663580b3b 100644
--- a/demos/gtk-demo/overlay.c
+++ b/demos/gtk-demo/overlay.c
@@ -31,7 +31,7 @@ do_overlay (GtkWidget *do_widget)
       int i, j;
       char *text;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_default_size (GTK_WINDOW (window), 500, 510);
       gtk_window_set_title (GTK_WINDOW (window), "Interactive Overlay");
 
diff --git a/demos/gtk-demo/overlay2.c b/demos/gtk-demo/overlay2.c
index f26a10dc5f..ac2b1fafa2 100644
--- a/demos/gtk-demo/overlay2.c
+++ b/demos/gtk-demo/overlay2.c
@@ -35,7 +35,7 @@ do_overlay2 (GtkWidget *do_widget)
       GtkTextIter start, end;
       GtkAdjustment *adjustment;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_default_size (GTK_WINDOW (window), 500, 510);
       gtk_window_set_title (GTK_WINDOW (window), "Decorative Overlay");
 
diff --git a/demos/gtk-demo/paint.c b/demos/gtk-demo/paint.c
index c783bee904..fa56b15d30 100644
--- a/demos/gtk-demo/paint.c
+++ b/demos/gtk-demo/paint.c
@@ -384,7 +384,7 @@ do_paint (GtkWidget *toplevel)
     {
       GtkWidget *draw_area, *headerbar, *colorbutton;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
 
       draw_area = drawing_area_new ();
       gtk_container_add (GTK_CONTAINER (window), draw_area);
diff --git a/demos/gtk-demo/paintable.c b/demos/gtk-demo/paintable.c
index 3d20e99984..c4c31b61ca 100644
--- a/demos/gtk-demo/paintable.c
+++ b/demos/gtk-demo/paintable.c
@@ -156,7 +156,7 @@ do_paintable (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Nuclear Icon");
diff --git a/demos/gtk-demo/paintable_animated.c b/demos/gtk-demo/paintable_animated.c
index b606764ca5..e81d9d2f94 100644
--- a/demos/gtk-demo/paintable_animated.c
+++ b/demos/gtk-demo/paintable_animated.c
@@ -188,7 +188,7 @@ do_paintable_animated (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Nuclear Animation");
diff --git a/demos/gtk-demo/paintable_mediastream.c b/demos/gtk-demo/paintable_mediastream.c
index 797ccfadf5..a666b3d3e0 100644
--- a/demos/gtk-demo/paintable_mediastream.c
+++ b/demos/gtk-demo/paintable_mediastream.c
@@ -288,7 +288,7 @@ do_paintable_mediastream (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Nuclear MediaStream");
diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c
index e023cd22ba..2ed08a24fc 100644
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -146,7 +146,7 @@ do_panes (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
 
diff --git a/demos/gtk-demo/password_entry.c b/demos/gtk-demo/password_entry.c
index e92e625876..e43f650e30 100644
--- a/demos/gtk-demo/password_entry.c
+++ b/demos/gtk-demo/password_entry.c
@@ -36,7 +36,7 @@ do_password_entry (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       header = gtk_header_bar_new ();
diff --git a/demos/gtk-demo/pickers.c b/demos/gtk-demo/pickers.c
index b921afb5d2..fe739f7671 100644
--- a/demos/gtk-demo/pickers.c
+++ b/demos/gtk-demo/pickers.c
@@ -14,7 +14,7 @@ do_pickers (GtkWidget *do_widget)
 
   if (!window)
   {
-    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+    window = gtk_window_new ();
     gtk_window_set_display (GTK_WINDOW (window),
                             gtk_widget_get_display (do_widget));
     gtk_window_set_title (GTK_WINDOW (window), "Pickers");
diff --git a/demos/gtk-demo/pixbufs.c b/demos/gtk-demo/pixbufs.c
index e82dae8805..eab22a464e 100644
--- a/demos/gtk-demo/pixbufs.c
+++ b/demos/gtk-demo/pixbufs.c
@@ -174,7 +174,7 @@ do_pixbufs (GtkWidget *do_widget)
     {
       GError *error;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Pixbufs");
diff --git a/demos/gtk-demo/popover.c b/demos/gtk-demo/popover.c
index f3d8bcf5fe..a1726f8aab 100644
--- a/demos/gtk-demo/popover.c
+++ b/demos/gtk-demo/popover.c
@@ -130,7 +130,7 @@ do_popover (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Popovers");
       box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 24);
       g_object_set (box, "margin", 24, NULL);
diff --git a/demos/gtk-demo/rotated_text.c b/demos/gtk-demo/rotated_text.c
index ce286cbcc9..798fff44fd 100644
--- a/demos/gtk-demo/rotated_text.c
+++ b/demos/gtk-demo/rotated_text.c
@@ -178,7 +178,7 @@ do_rotated_text (GtkWidget *do_widget)
       PangoLayout *layout;
       PangoAttrList *attrs;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Rotated Text");
diff --git a/demos/gtk-demo/search_entry.c b/demos/gtk-demo/search_entry.c
index 3519a2534c..a8b9b03e6c 100644
--- a/demos/gtk-demo/search_entry.c
+++ b/demos/gtk-demo/search_entry.c
@@ -250,7 +250,7 @@ do_search_entry (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Search Entry");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
diff --git a/demos/gtk-demo/search_entry2.c b/demos/gtk-demo/search_entry2.c
index ea4bb62151..68a9de3faa 100644
--- a/demos/gtk-demo/search_entry2.c
+++ b/demos/gtk-demo/search_entry2.c
@@ -68,7 +68,7 @@ do_search_entry2 (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Delayed Search Entry");
       gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (do_widget));
       gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
diff --git a/demos/gtk-demo/sidebar.c b/demos/gtk-demo/sidebar.c
index 4de18c4c91..3b092eac92 100644
--- a/demos/gtk-demo/sidebar.c
+++ b/demos/gtk-demo/sidebar.c
@@ -35,7 +35,7 @@ do_sidebar (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
       gtk_widget_set_size_request (window, 500, 350);
 
diff --git a/demos/gtk-demo/sizegroup.c b/demos/gtk-demo/sizegroup.c
index 2f62825778..1eebdb519a 100644
--- a/demos/gtk-demo/sizegroup.c
+++ b/demos/gtk-demo/sizegroup.c
@@ -100,7 +100,7 @@ do_sizegroup (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),  gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Size Groups");
       gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
diff --git a/demos/gtk-demo/sliding_puzzle.c b/demos/gtk-demo/sliding_puzzle.c
index 9486004605..95cc9dc073 100644
--- a/demos/gtk-demo/sliding_puzzle.c
+++ b/demos/gtk-demo/sliding_puzzle.c
@@ -462,7 +462,7 @@ do_sliding_puzzle (GtkWidget *do_widget)
       gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header), TRUE);
       gtk_header_bar_pack_start (GTK_HEADER_BAR (header), restart);
       gtk_header_bar_pack_end (GTK_HEADER_BAR (header), tweak);
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Sliding Puzzle");
diff --git a/demos/gtk-demo/tabs.c b/demos/gtk-demo/tabs.c
index d1f78872ed..877d1e7c58 100644
--- a/demos/gtk-demo/tabs.c
+++ b/demos/gtk-demo/tabs.c
@@ -18,7 +18,7 @@ do_tabs (GtkWidget *do_widget)
       GtkTextBuffer *buffer;
       PangoTabArray *tabs;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Tabs");
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
diff --git a/demos/gtk-demo/tagged_entry.c b/demos/gtk-demo/tagged_entry.c
index 6c3ec44de8..132724bf05 100644
--- a/demos/gtk-demo/tagged_entry.c
+++ b/demos/gtk-demo/tagged_entry.c
@@ -63,7 +63,7 @@ do_tagged_entry (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       header = gtk_header_bar_new ();
diff --git a/demos/gtk-demo/textmask.c b/demos/gtk-demo/textmask.c
index 0bc18aa30c..6457be2857 100644
--- a/demos/gtk-demo/textmask.c
+++ b/demos/gtk-demo/textmask.c
@@ -59,7 +59,7 @@ do_textmask (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_resizable (GTK_WINDOW (window), TRUE);
       gtk_widget_set_size_request (window, 400, 200);
       gtk_window_set_title (GTK_WINDOW (window), "Text Mask");
diff --git a/demos/gtk-demo/textscroll.c b/demos/gtk-demo/textscroll.c
index 66be4a9fcc..08afc0ede5 100644
--- a/demos/gtk-demo/textscroll.c
+++ b/demos/gtk-demo/textscroll.c
@@ -180,7 +180,7 @@ do_textscroll (GtkWidget *do_widget)
     {
       GtkWidget *hbox;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window), "Automatic Scrolling");
       g_signal_connect (window, "destroy",
                         G_CALLBACK (gtk_widget_destroyed), &window);
diff --git a/demos/gtk-demo/textundo.c b/demos/gtk-demo/textundo.c
index fe057f00f3..770ec1cfbb 100644
--- a/demos/gtk-demo/textundo.c
+++ b/demos/gtk-demo/textundo.c
@@ -23,7 +23,7 @@ do_textundo (GtkWidget *do_widget)
       GtkTextBuffer *buffer;
       GtkTextIter iter;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window),
diff --git a/demos/gtk-demo/textview.c b/demos/gtk-demo/textview.c
index c28312a517..77b9274e46 100644
--- a/demos/gtk-demo/textview.c
+++ b/demos/gtk-demo/textview.c
@@ -466,7 +466,7 @@ do_textview (GtkWidget *do_widget)
       GtkWidget *sw;
       GtkTextBuffer *buffer;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window),
@@ -580,7 +580,7 @@ easter_egg_callback (GtkWidget *button,
 
   g_object_unref (buffer);
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_AUTOMATIC,
diff --git a/demos/gtk-demo/theming_style_classes.c b/demos/gtk-demo/theming_style_classes.c
index 30e7f403da..70c6f3df42 100644
--- a/demos/gtk-demo/theming_style_classes.c
+++ b/demos/gtk-demo/theming_style_classes.c
@@ -20,7 +20,7 @@ do_theming_style_classes (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Style Classes");
diff --git a/demos/gtk-demo/transparent.c b/demos/gtk-demo/transparent.c
index 9f1e989856..65373b8943 100644
--- a/demos/gtk-demo/transparent.c
+++ b/demos/gtk-demo/transparent.c
@@ -18,7 +18,7 @@ do_transparent (GtkWidget *do_widget)
       GtkWidget *label;
       GtkWidget *picture;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_default_size (GTK_WINDOW (window), 450, 450);
diff --git a/demos/gtk-demo/tree_store.c b/demos/gtk-demo/tree_store.c
index 77a2f84408..8123793d42 100644
--- a/demos/gtk-demo/tree_store.c
+++ b/demos/gtk-demo/tree_store.c
@@ -390,7 +390,7 @@ do_tree_store (GtkWidget *do_widget)
       GtkTreeModel *model;
 
       /* create window, etc */
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Tree Store");
diff --git a/demos/gtk-demo/video_player.c b/demos/gtk-demo/video_player.c
index 73e659d6a9..4b9e0622fc 100644
--- a/demos/gtk-demo/video_player.c
+++ b/demos/gtk-demo/video_player.c
@@ -63,7 +63,7 @@ do_video_player (GtkWidget *do_widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (do_widget));
       gtk_window_set_title (GTK_WINDOW (window), "Video Player");
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index f185463143..5a2db6af72 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -4505,7 +4505,6 @@ gtk_requisition_get_type
 <TITLE>GtkWindow</TITLE>
 GtkWindow
 GtkWindowClass
-GtkWindowType
 gtk_window_new
 gtk_window_set_title
 gtk_window_set_resizable
diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 73b0a431fc..2227c2f731 100644
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -41,7 +41,7 @@ new_widget_info (const char *name,
     }
   else
     {
-      info->window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      info->window = gtk_window_new ();
       info->include_decorations = FALSE;
       gtk_widget_show (widget);
       gtk_container_add (GTK_CONTAINER (info->window), widget);
@@ -711,7 +711,7 @@ create_window (void)
   WidgetInfo *info;
   GtkWidget *widget;
 
-  widget = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  widget = gtk_window_new ();
   info = new_widget_info ("window", widget, MEDIUM);
   info->include_decorations = TRUE;
   gtk_window_set_title (GTK_WINDOW (info->window), "Window");
@@ -1041,7 +1041,7 @@ create_volume_button (void)
   GtkWidget *widget;
   GtkWidget *popup;
 
-  widget = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  widget = gtk_window_new ();
   gtk_widget_set_size_request (widget, 100, 250);
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
@@ -1154,7 +1154,7 @@ create_headerbar (void)
   GtkWidget *view;
   GtkWidget *button;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   view = gtk_text_view_new ();
   gtk_widget_show (view);
   gtk_widget_set_size_request (window, 220, 150);
diff --git a/gtk/a11y/gtkwindowaccessible.c b/gtk/a11y/gtkwindowaccessible.c
index beb26617ec..51d55d7a4e 100644
--- a/gtk/a11y/gtkwindowaccessible.c
+++ b/gtk/a11y/gtkwindowaccessible.c
@@ -80,16 +80,11 @@ static void
 gtk_window_accessible_initialize (AtkObject *obj,
                                   gpointer   data)
 {
-  GtkWidget *widget = GTK_WIDGET (data);
-
   ATK_OBJECT_CLASS (gtk_window_accessible_parent_class)->initialize (obj, data);
 
   _gtk_widget_accessible_set_layer (GTK_WIDGET_ACCESSIBLE (obj), ATK_LAYER_WINDOW);
 
-  if (gtk_window_get_window_type (GTK_WINDOW (widget)) == GTK_WINDOW_POPUP)
-    obj->role = ATK_ROLE_WINDOW;
-  else
-    obj->role = ATK_ROLE_FRAME;
+  obj->role = ATK_ROLE_FRAME;
 }
 
 static GtkWidget *
diff --git a/gtk/gtkimcontextxim.c b/gtk/gtkimcontextxim.c
index e4b747af58..c9abe0b7d7 100644
--- a/gtk/gtkimcontextxim.c
+++ b/gtk/gtkimcontextxim.c
@@ -1632,7 +1632,7 @@ status_window_make_window (StatusWindow *status_window)
   GtkWidget *window;
   GtkWidget *status_label;
 
-  status_window->window = gtk_window_new (GTK_WINDOW_POPUP);
+  status_window->window = gtk_window_new ();
   window = status_window->window;
 
   gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c
index fe5868a95d..d84ffa8ddc 100644
--- a/gtk/gtkmain.c
+++ b/gtk/gtkmain.c
@@ -68,7 +68,7 @@
  *   gtk_init ();
  *
  *   // Create the main window
- *   mainwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ *   mainwin = gtk_window_new ();
  *
  *   // Set up our GUI elements
  *
diff --git a/gtk/gtkprintoperation-win32.c b/gtk/gtkprintoperation-win32.c
index 2518545e7f..fd9fd79e36 100644
--- a/gtk/gtkprintoperation-win32.c
+++ b/gtk/gtkprintoperation-win32.c
@@ -1722,7 +1722,7 @@ gtk_print_operation_run_with_dialog (GtkPrintOperation *op,
   
   if (parent == NULL)
     {
-      invisible = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      invisible = gtk_window_new ();
       parentHWnd = get_parent_hwnd (invisible);
     }
   else
diff --git a/gtk/gtkradiobutton.c b/gtk/gtkradiobutton.c
index 344cde3b89..cac2ffce6d 100644
--- a/gtk/gtkradiobutton.c
+++ b/gtk/gtkradiobutton.c
@@ -97,7 +97,7 @@
  * void create_radio_buttons (void) {
  *
  *    GtkWidget *window, *radio1, *radio2, *box, *entry;
- *    window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ *    window = gtk_window_new ();
  *    box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
  *    gtk_box_set_homogeneous (GTK_BOX (box), TRUE);
  *
diff --git a/gtk/gtkspinbutton.c b/gtk/gtkspinbutton.c
index 9e16ac0d78..9cd94ff865 100644
--- a/gtk/gtkspinbutton.c
+++ b/gtk/gtkspinbutton.c
@@ -141,7 +141,7 @@
  *
  *   adjustment = gtk_adjustment_new (50.0, 0.0, 100.0, 1.0, 5.0, 0.0);
  *
- *   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ *   window = gtk_window_new ();
  *
  *   // creates the spinbutton, with no decimal places
  *   button = gtk_spin_button_new (adjustment, 1.0, 0);
@@ -172,7 +172,7 @@
  *
  *   adjustment = gtk_adjustment_new (2.500, 0.0, 5.0, 0.001, 0.1, 0.0);
  *
- *   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ *   window = gtk_window_new ();
  *
  *   // creates the spinbutton, with three decimal places
  *   button = gtk_spin_button_new (adjustment, 0.001, 3);
diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index ad70b984ab..c8d4f49703 100644
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -75,7 +75,7 @@
  *   GtkWidget *box;
  *   const char *text;
  *
- *   window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+ *   window = gtk_window_new ();
  *   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
  *
  *   text = "Hi, I’m a toggle button.";
diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index 10dd3436bb..c484a8b67d 100644
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -247,7 +247,6 @@ typedef struct
   guint    resizable                 : 1;
   guint    stick_initially           : 1;
   guint    transient_parent_group    : 1;
-  guint    type                      : 4; /* GtkWindowType */
   guint    gravity                   : 5; /* GdkGravity */
   guint    csd_requested             : 1;
   guint    client_decorated          : 1; /* Decorations drawn client-side */
@@ -295,9 +294,6 @@ enum {
 enum {
   PROP_0,
 
-  /* Construct */
-  PROP_TYPE,
-
   /* Normal Props */
   PROP_TITLE,
   PROP_RESIZABLE,
@@ -811,14 +807,6 @@ gtk_window_class_init (GtkWindowClass *klass)
   klass->enable_debugging = gtk_window_enable_debugging;
   klass->close_request = gtk_window_close_request;
 
-  window_props[PROP_TYPE] =
-      g_param_spec_enum ("type",
-                         P_("Window Type"),
-                         P_("The type of the window"),
-                         GTK_TYPE_WINDOW_TYPE,
-                         GTK_WINDOW_TOPLEVEL,
-                         GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY);
-
   window_props[PROP_TITLE] =
       g_param_spec_string ("title",
                            P_("Window Title"),
@@ -1629,8 +1617,7 @@ edge_under_coordinates (GtkWindow     *window,
   gboolean supports_edge_constraints;
   guint constraints;
 
-  if (priv->type != GTK_WINDOW_TOPLEVEL ||
-      !priv->client_decorated ||
+  if (!priv->client_decorated ||
       !priv->resizable ||
       priv->fullscreen ||
       priv->maximized)
@@ -1789,7 +1776,6 @@ gtk_window_init (GtkWindow *window)
 
   priv->title = NULL;
   priv->geometry_info = NULL;
-  priv->type = GTK_WINDOW_TOPLEVEL;
   priv->focus_widget = NULL;
   priv->default_widget = NULL;
   priv->configure_request_count = 0;
@@ -1894,24 +1880,21 @@ gtk_window_constructed (GObject *object)
 
   G_OBJECT_CLASS (gtk_window_parent_class)->constructed (object);
 
-  if (priv->type == GTK_WINDOW_TOPLEVEL)
-    {
-      priv->click_gesture = gtk_gesture_click_new ();
-      gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->click_gesture), 0);
-      gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->click_gesture),
-                                                  GTK_PHASE_BUBBLE);
-      g_signal_connect (priv->click_gesture, "pressed",
-                        G_CALLBACK (click_gesture_pressed_cb), object);
-      gtk_widget_add_controller (GTK_WIDGET (object), GTK_EVENT_CONTROLLER (priv->click_gesture));
+  priv->click_gesture = gtk_gesture_click_new ();
+  gtk_gesture_single_set_button (GTK_GESTURE_SINGLE (priv->click_gesture), 0);
+  gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->click_gesture),
+                                              GTK_PHASE_BUBBLE);
+  g_signal_connect (priv->click_gesture, "pressed",
+                    G_CALLBACK (click_gesture_pressed_cb), object);
+  gtk_widget_add_controller (GTK_WIDGET (object), GTK_EVENT_CONTROLLER (priv->click_gesture));
 
-      priv->drag_gesture = create_drag_gesture (window);
-      gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->drag_gesture),
-                                                  GTK_PHASE_CAPTURE);
+  priv->drag_gesture = create_drag_gesture (window);
+  gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->drag_gesture),
+                                              GTK_PHASE_CAPTURE);
 
-      priv->bubble_drag_gesture = create_drag_gesture (window);
-      gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->bubble_drag_gesture),
-                                                  GTK_PHASE_BUBBLE);
-    }
+  priv->bubble_drag_gesture = create_drag_gesture (window);
+  gtk_event_controller_set_propagation_phase (GTK_EVENT_CONTROLLER (priv->bubble_drag_gesture),
+                                              GTK_PHASE_BUBBLE);
 
   g_list_store_append (toplevel_list, window);
   g_object_unref (window);
@@ -1924,13 +1907,9 @@ gtk_window_set_property (GObject      *object,
                         GParamSpec   *pspec)
 {
   GtkWindow  *window = GTK_WINDOW (object);
-  GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
 
   switch (prop_id)
     {
-    case PROP_TYPE:
-      priv->type = g_value_get_enum (value);
-      break;
     case PROP_TITLE:
       gtk_window_set_title (window, g_value_get_string (value));
       break;
@@ -2022,9 +2001,6 @@ gtk_window_get_property (GObject      *object,
   switch (prop_id)
     {
       GtkWindowGeometryInfo *info;
-    case PROP_TYPE:
-      g_value_set_enum (value, priv->type);
-      break;
     case PROP_TITLE:
       g_value_set_string (value, priv->title);
       break;
@@ -2390,20 +2366,9 @@ gtk_window_native_interface_init (GtkNativeInterface *iface)
 
 /**
  * gtk_window_new:
- * @type: type of window
  * 
  * Creates a new #GtkWindow, which is a toplevel window that can
- * contain other widgets. Nearly always, the type of the window should
- * be #GTK_WINDOW_TOPLEVEL. If you’re implementing something like a
- * popup menu from scratch (which is a bad idea, just use #GtkMenu),
- * you might use #GTK_WINDOW_POPUP. #GTK_WINDOW_POPUP is not for
- * dialogs, though in some other toolkits dialogs are called “popups”.
- * In GTK+, #GTK_WINDOW_POPUP means a pop-up menu or pop-up tooltip.
- * On X11, popup windows are not controlled by the
- * [window manager][gtk-X11-arch].
- *
- * If you simply want an undecorated window (no window borders), use
- * gtk_window_set_decorated(), don’t use #GTK_WINDOW_POPUP.
+ * contain other widgets.
  *
  * All top-level windows created by gtk_window_new() are stored in
  * an internal top-level window list.  This list can be obtained from
@@ -2416,15 +2381,9 @@ gtk_window_native_interface_init (GtkNativeInterface *iface)
  * Returns: a new #GtkWindow.
  **/
 GtkWidget*
-gtk_window_new (GtkWindowType type)
+gtk_window_new (void)
 {
-  GtkWindow *window;
-
-  g_return_val_if_fail (type >= GTK_WINDOW_TOPLEVEL && type <= GTK_WINDOW_POPUP, NULL);
-
-  window = g_object_new (GTK_TYPE_WINDOW, "type", type, NULL);
-
-  return GTK_WIDGET (window);
+  return g_object_new (GTK_TYPE_WINDOW, NULL);
 }
 
 static void
@@ -3130,11 +3089,6 @@ gtk_window_unset_transient_for  (GtkWindow *window)
  *
  * Passing %NULL for @parent unsets the current transient window.
  *
- * This function can also be used to attach a new
- * #GTK_WINDOW_POPUP to a #GTK_WINDOW_TOPLEVEL parent already mapped
- * on screen so that the #GTK_WINDOW_POPUP will be
- * positioned relative to the #GTK_WINDOW_TOPLEVEL surface.
- *
  * On Windows, this function puts the child window on top of the parent,
  * much as the window manager would have done on X.
  */
@@ -4059,10 +4013,6 @@ gtk_window_realize_icon (GtkWindow *window)
 
   g_return_if_fail (priv->surface != NULL);
 
-  /* no point setting an icon on override-redirect */
-  if (priv->type == GTK_WINDOW_POPUP)
-    return;
-
   info = ensure_icon_info (window);
 
   if (info->realized)
@@ -4278,9 +4228,6 @@ gtk_window_update_csd_size (GtkWindow *window,
   GtkBorder window_border = { 0 };
   gint w, h;
 
-  if (priv->type != GTK_WINDOW_TOPLEVEL)
-    return;
-
   if (!priv->decorated ||
       priv->fullscreen)
     return;
@@ -4517,7 +4464,7 @@ gtk_window_resize (GtkWindow *window,
  * way that this code:
  *
  * |[<!-- language="C" -->
- *   GtkWindow *window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL));
+ *   GtkWindow *window = GTK_WINDOW (gtk_window_new ());
  *   int width = 500;
  *   int height = 300;
  *   gtk_window_resize (window, width, height);
@@ -4823,9 +4770,6 @@ gtk_window_should_use_csd (GtkWindow *window)
   if (!priv->decorated)
     return FALSE;
 
-  if (priv->type == GTK_WINDOW_POPUP)
-    return FALSE;
-
   csd_env = g_getenv ("GTK_CSD");
 
 #ifdef GDK_WINDOWING_BROADWAY
@@ -4862,9 +4806,6 @@ create_decoration (GtkWidget *widget)
 
   gtk_window_enable_csd (window);
 
-  if (priv->type == GTK_WINDOW_POPUP)
-    return;
-
   if (priv->title_box == NULL)
     {
       priv->titlebar = create_titlebar (window);
@@ -4966,16 +4907,14 @@ gtk_window_map (GtkWidget *widget)
 
   gdk_surface_set_keep_below (surface, priv->below_initially);
 
-  if (priv->type == GTK_WINDOW_TOPLEVEL)
-    gtk_window_set_theme_variant (window);
+  gtk_window_set_theme_variant (window);
 
   /* No longer use the default settings */
   priv->need_default_size = FALSE;
 
   gdk_surface_show (surface);
 
-  if (!disable_startup_notification &&
-      priv->type != GTK_WINDOW_POPUP)
+  if (!disable_startup_notification)
     {
       /* Do we have a custom startup-notification id? */
       if (priv->startup_id != NULL)
@@ -5324,12 +5263,9 @@ get_shadow_width (GtkWindow *window,
   shadows = _gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BOX_SHADOW);
   _gtk_css_shadows_value_get_extents (shadows, &border);
 
-  if (priv->type != GTK_WINDOW_POPUP)
-    {
-      /* ... and compare it to the margin size, which we use for resize grips */
-      gtk_style_context_get_margin (context, &margin);
-      max_borders (&border, &margin);
-    }
+  /* ... and compare it to the margin size, which we use for resize grips */
+  gtk_style_context_get_margin (context, &margin);
+  max_borders (&border, &margin);
 
   sum_borders (&d, &border);
   *shadow_width = d;
@@ -5365,8 +5301,7 @@ update_csd_shape (GtkWindow *window)
    * outside the border windows go through.
    */
 
-  if (priv->type != GTK_WINDOW_POPUP)
-    subtract_borders (&window_border, &border);
+  subtract_borders (&window_border, &border);
 
   rect.x = window_border.left;
   rect.y = window_border.top;
@@ -5508,7 +5443,6 @@ gtk_window_realize (GtkWidget *widget)
   GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
   GtkAllocation allocation;
   GtkAllocation child_allocation;
-  GdkSurface *surface;
   GtkBorder window_border;
 
   if (!priv->client_decorated && gtk_window_should_use_csd (window))
@@ -5534,91 +5468,67 @@ gtk_window_realize (GtkWidget *widget)
 
   gtk_widget_get_allocation (widget, &allocation);
 
-  switch (priv->type)
-    {
-    case GTK_WINDOW_TOPLEVEL:
-      surface = gdk_surface_new_toplevel (gtk_widget_get_display (widget),
-                                          allocation.width,
-                                          allocation.height);
-      break;
-    case GTK_WINDOW_POPUP:
-      surface = gdk_surface_new_temp (gtk_widget_get_display (widget), &allocation);
-      break;
-    default:
-      g_error (G_STRLOC": Unknown window type %d!", priv->type);
-      break;
-    }
+  priv->surface = gdk_surface_new_toplevel (gtk_widget_get_display (widget),
+                                            allocation.width,
+                                            allocation.height);
+  gdk_surface_set_widget (priv->surface, widget);
 
-  priv->surface = surface;
-  gdk_surface_set_widget (surface, widget);
-
-  g_signal_connect_swapped (surface, "notify::state", G_CALLBACK (surface_state_changed), widget);
-  g_signal_connect_swapped (surface, "size-changed", G_CALLBACK (surface_size_changed), widget);
-  g_signal_connect (surface, "render", G_CALLBACK (surface_render), widget);
-  g_signal_connect (surface, "event", G_CALLBACK (surface_event), widget);
+  g_signal_connect_swapped (priv->surface, "notify::state", G_CALLBACK (surface_state_changed), widget);
+  g_signal_connect_swapped (priv->surface, "size-changed", G_CALLBACK (surface_size_changed), widget);
+  g_signal_connect (priv->surface, "render", G_CALLBACK (surface_render), widget);
+  g_signal_connect (priv->surface, "event", G_CALLBACK (surface_event), widget);
 
   GTK_WIDGET_CLASS (gtk_window_parent_class)->realize (widget);
 
   if (priv->renderer == NULL)
-    priv->renderer = gsk_renderer_new_for_surface (surface);
+    priv->renderer = gsk_renderer_new_for_surface (priv->surface);
 
   if (priv->transient_parent &&
       _gtk_widget_get_realized (GTK_WIDGET (priv->transient_parent)))
     {
       GtkWindowPrivate *parent_priv = gtk_window_get_instance_private (priv->transient_parent);
-      gdk_surface_set_transient_for (surface, parent_priv->surface);
+      gdk_surface_set_transient_for (priv->surface, parent_priv->surface);
     }
 
-  gdk_surface_set_type_hint (surface, priv->type_hint);
+  gdk_surface_set_type_hint (priv->surface, priv->type_hint);
 
   if (priv->title)
-    gdk_surface_set_title (surface, priv->title);
+    gdk_surface_set_title (priv->surface, priv->title);
 
   if (!priv->decorated || priv->client_decorated)
-    gdk_surface_set_decorations (surface, 0);
+    gdk_surface_set_decorations (priv->surface, 0);
 
 #ifdef GDK_WINDOWING_WAYLAND
-  if (priv->client_decorated && GDK_IS_WAYLAND_SURFACE (surface))
-    gdk_wayland_surface_announce_csd (surface);
+  if (priv->client_decorated && GDK_IS_WAYLAND_SURFACE (priv->surface))
+    gdk_wayland_surface_announce_csd (priv->surface);
 #endif
 
   if (!priv->deletable)
-    gdk_surface_set_functions (surface, GDK_FUNC_ALL | GDK_FUNC_CLOSE);
-
-  if (gtk_window_get_accept_focus (window))
-    gdk_surface_set_accept_focus (surface, TRUE);
-  else
-    gdk_surface_set_accept_focus (surface, FALSE);
-
-  if (gtk_window_get_focus_on_map (window))
-    gdk_surface_set_focus_on_map (surface, TRUE);
-  else
-    gdk_surface_set_focus_on_map (surface, FALSE);
+    gdk_surface_set_functions (priv->surface, GDK_FUNC_ALL | GDK_FUNC_CLOSE);
 
-  if (priv->modal)
-    gdk_surface_set_modal_hint (surface, TRUE);
-  else
-    gdk_surface_set_modal_hint (surface, FALSE);
+  gdk_surface_set_accept_focus (priv->surface, gtk_window_get_accept_focus (window));
+  gdk_surface_set_focus_on_map (priv->surface, gtk_window_get_focus_on_map (window));
+  gdk_surface_set_modal_hint (priv->surface, priv->modal);
 
   if (priv->startup_id)
     {
 #ifdef GDK_WINDOWING_X11
-      if (GDK_IS_X11_SURFACE (surface))
+      if (GDK_IS_X11_SURFACE (priv->surface))
         {
           guint32 timestamp = extract_time_from_startup_id (priv->startup_id);
           if (timestamp != GDK_CURRENT_TIME)
-            gdk_x11_surface_set_user_time (surface, timestamp);
+            gdk_x11_surface_set_user_time (priv->surface, timestamp);
         }
 #endif
       if (!startup_id_is_fake (priv->startup_id))
-        gdk_surface_set_startup_id (surface, priv->startup_id);
+        gdk_surface_set_startup_id (priv->surface, priv->startup_id);
     }
 
 #ifdef GDK_WINDOWING_X11
   if (priv->initial_timestamp != GDK_CURRENT_TIME)
     {
-      if (GDK_IS_X11_SURFACE (surface))
-        gdk_x11_surface_set_user_time (surface, priv->initial_timestamp);
+      if (GDK_IS_X11_SURFACE (priv->surface))
+        gdk_x11_surface_set_user_time (priv->surface, priv->initial_timestamp);
     }
 #endif
 
@@ -6991,7 +6901,7 @@ gtk_window_move_resize (GtkWindow *window)
     hints_changed = TRUE;
 
 #if 0
-  if (priv->type == GTK_WINDOW_TOPLEVEL)
+  if (priv->type == )
     {
       GtkAllocation alloc;
 
@@ -7152,34 +7062,31 @@ gtk_window_move_resize (GtkWindow *window)
        * we don't get the ConfigureNotify back, the resize queue will never be run.
        */
 
-      if (priv->type != GTK_WINDOW_POPUP)
-        {
-         /* Increment the number of have-not-yet-received-notify requests.
-           * This is done before gdk_surface[_move]_resize(), because
-           * that call might be synchronous (depending on which GDK backend
-           * is being used), so any preparations for its effects must
-           * be done beforehand.
-           */
-         priv->configure_request_count += 1;
-
-          gdk_surface_freeze_toplevel_updates (priv->surface);
-
-         /* for GTK_RESIZE_QUEUE toplevels, we are now awaiting a new
-          * configure event in response to our resizing request.
-          * the configure event will cause a new resize with
-          * ->configure_notify_received=TRUE.
-          * until then, we want to
-          * - discard expose events
-          * - coalesce resizes for our children
-          * - defer any window resizes until the configure event arrived
-          * to achieve this, we queue a resize for the window, but remove its
-          * resizing handler, so resizing will not be handled from the next
-          * idle handler but when the configure event arrives.
-          *
-          * FIXME: we should also dequeue the pending redraws here, since
-          * we handle those ourselves upon ->configure_notify_received==TRUE.
-          */
-       }
+      /* Increment the number of have-not-yet-received-notify requests.
+       * This is done before gdk_surface[_move]_resize(), because
+       * that call might be synchronous (depending on which GDK backend
+       * is being used), so any preparations for its effects must
+       * be done beforehand.
+       */
+      priv->configure_request_count += 1;
+
+      gdk_surface_freeze_toplevel_updates (priv->surface);
+
+      /* for GTK_RESIZE_QUEUE toplevels, we are now awaiting a new
+       * configure event in response to our resizing request.
+       * the configure event will cause a new resize with
+       * ->configure_notify_received=TRUE.
+       * until then, we want to
+       * - discard expose events
+       * - coalesce resizes for our children
+       * - defer any window resizes until the configure event arrived
+       * to achieve this, we queue a resize for the window, but remove its
+       * resizing handler, so resizing will not be handled from the next
+       * idle handler but when the configure event arrives.
+       *
+       * FIXME: we should also dequeue the pending redraws here, since
+       * we handle those ourselves upon ->configure_notify_received==TRUE.
+       */
 
       /* Now send the configure request */
       if (configure_request_pos_changed)
@@ -7187,19 +7094,6 @@ gtk_window_move_resize (GtkWindow *window)
 
       gdk_surface_resize (priv->surface,
                          new_request.width, new_request.height);
-
-      if (priv->type == GTK_WINDOW_POPUP)
-        {
-          GtkAllocation allocation;
-
-         /* Directly size allocate for override redirect (popup) windows. */
-          allocation.x = 0;
-         allocation.y = 0;
-         allocation.width = new_request.width;
-         allocation.height = new_request.height;
-
-          gtk_widget_size_allocate (widget, &allocation, -1);
-       }
     }
   else
     {
@@ -8133,10 +8027,7 @@ gtk_window_on_theme_variant_changed (GtkSettings *settings,
                                      GParamSpec  *pspec,
                                      GtkWindow   *window)
 {
-  GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
-
-  if (priv->type == GTK_WINDOW_TOPLEVEL)
-    gtk_window_set_theme_variant (window);
+  gtk_window_set_theme_variant (window);
 }
 #endif
 
@@ -8572,24 +8463,6 @@ gtk_window_set_auto_startup_notification (gboolean setting)
   disable_startup_notification = !setting;
 }
 
-/**
- * gtk_window_get_window_type:
- * @window: a #GtkWindow
- *
- * Gets the type of the window. See #GtkWindowType.
- *
- * Returns: the type of the window
- **/
-GtkWindowType
-gtk_window_get_window_type (GtkWindow *window)
-{
-  GtkWindowPrivate *priv = gtk_window_get_instance_private (window);
-
-  g_return_val_if_fail (GTK_IS_WINDOW (window), GTK_WINDOW_TOPLEVEL);
-
-  return priv->type;
-}
-
 /**
  * gtk_window_get_mnemonics_visible:
  * @window: a #GtkWindow
diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 3776bfd137..897b6888ad 100644
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -84,35 +84,10 @@ struct _GtkWindowClass
   gpointer padding[8];
 };
 
-/**
- * GtkWindowType:
- * @GTK_WINDOW_TOPLEVEL: A regular window, such as a dialog.
- * @GTK_WINDOW_POPUP: A special window such as a tooltip.
- *
- * A #GtkWindow can be one of these types. Most things you’d consider a
- * “window” should have type #GTK_WINDOW_TOPLEVEL; windows with this type
- * are managed by the window manager and have a frame by default (call
- * gtk_window_set_decorated() to toggle the frame).  Windows with type
- * #GTK_WINDOW_POPUP are ignored by the window manager; window manager
- * keybindings won’t work on them, the window manager won’t decorate the
- * window with a frame, many GTK+ features that rely on the window
- * manager will not work (e.g. maximization/minimization).
- * #GTK_WINDOW_POPUP is used to implement
- * widgets such as #GtkMenu or tooltips that you normally don’t think of
- * as windows per se. Nearly all windows should be #GTK_WINDOW_TOPLEVEL.
- * In particular, do not use #GTK_WINDOW_POPUP just to turn off
- * the window borders; use gtk_window_set_decorated() for that.
- */
-typedef enum
-{
-  GTK_WINDOW_TOPLEVEL,
-  GTK_WINDOW_POPUP
-} GtkWindowType;
-
 GDK_AVAILABLE_IN_ALL
 GType      gtk_window_get_type                 (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
-GtkWidget* gtk_window_new                      (GtkWindowType        type);
+GtkWidget* gtk_window_new                      (void);
 GDK_AVAILABLE_IN_ALL
 void       gtk_window_set_title                (GtkWindow           *window,
                                                const gchar         *title);
@@ -330,10 +305,6 @@ GtkWindowGroup *gtk_window_get_group (GtkWindow   *window);
 GDK_AVAILABLE_IN_ALL
 gboolean gtk_window_has_group        (GtkWindow   *window);
 
-GDK_AVAILABLE_IN_ALL
-GtkWindowType gtk_window_get_window_type     (GtkWindow     *window);
-
-
 GDK_AVAILABLE_IN_ALL
 GtkApplication *gtk_window_get_application      (GtkWindow          *window);
 GDK_AVAILABLE_IN_ALL
diff --git a/gtk/inspector/object-tree.c b/gtk/inspector/object-tree.c
index c6f4665d8e..a9e37abf61 100644
--- a/gtk/inspector/object-tree.c
+++ b/gtk/inspector/object-tree.c
@@ -1089,8 +1089,7 @@ toplevel_filter_func (gpointer item,
   if (g_str_equal (G_OBJECT_TYPE_NAME (item), "GtkInspectorWindow"))
     return FALSE;
 
-  return gtk_window_get_window_type (item) == GTK_WINDOW_TOPLEVEL &&
-         gtk_widget_get_display (item) == display;
+  return gtk_widget_get_display (item) == display;
 }
 
 static GListModel *
diff --git a/gtk/tools/gtk-builder-tool-preview.c b/gtk/tools/gtk-builder-tool-preview.c
index cc19251235..a700ec6c78 100644
--- a/gtk/tools/gtk-builder-tool-preview.c
+++ b/gtk/tools/gtk-builder-tool-preview.c
@@ -127,7 +127,7 @@ preview_file (const char *filename,
     {
       GtkWidget *widget = GTK_WIDGET (object);
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
 
       if (GTK_IS_BUILDABLE (object))
         id = gtk_buildable_get_name (GTK_BUILDABLE (object));
diff --git a/tests/animated-resizing.c b/tests/animated-resizing.c
index 1984aace2d..b8b92a0c06 100644
--- a/tests/animated-resizing.c
+++ b/tests/animated-resizing.c
@@ -186,7 +186,7 @@ main(int argc, char **argv)
   g_print ("# Resizing?: %s\n",
            cb_no_resize ? "no" : "yes");
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   frame_stats_ensure (GTK_WINDOW (window));
 
   da = gtk_drawing_area_new ();
diff --git a/tests/animated-revealing.c b/tests/animated-revealing.c
index 72e28459f4..9f433c6efc 100644
--- a/tests/animated-revealing.c
+++ b/tests/animated-revealing.c
@@ -37,7 +37,7 @@ main(int argc, char **argv)
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
   frame_stats_ensure (GTK_WINDOW (window));
 
diff --git a/tests/gdkgears.c b/tests/gdkgears.c
index 2df86a98e2..65ce6d57f2 100644
--- a/tests/gdkgears.c
+++ b/tests/gdkgears.c
@@ -117,7 +117,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_titlebar (GTK_WINDOW (window), g_object_new (GTK_TYPE_HEADER_BAR, "visible", TRUE, "title", 
"GdkGears", NULL));
   gtk_window_set_default_size (GTK_WINDOW (window), 640, 640);
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
diff --git a/tests/listmodel.c b/tests/listmodel.c
index c1bd0f933d..d8be132b1b 100644
--- a/tests/listmodel.c
+++ b/tests/listmodel.c
@@ -189,7 +189,7 @@ main (int argc, char *argv[])
       g_object_unref (obj);
     }
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   grid = gtk_grid_new ();
   gtk_container_add (GTK_CONTAINER (window), grid);
   sw = gtk_scrolled_window_new (NULL, NULL);
diff --git a/tests/meson.build b/tests/meson.build
index aa16f4fde7..187ecf1645 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -29,7 +29,6 @@ gtk_tests = [
   ['testcombochange'],
   ['testcellrenderertext'],
   ['testdialog'],
-  ['testdnd'],
   ['testdnd2'],
   ['testellipsise'],
   ['testemblems'],
diff --git a/tests/motion-compression.c b/tests/motion-compression.c
index d69716e5f3..fa8581fbbb 100644
--- a/tests/motion-compression.c
+++ b/tests/motion-compression.c
@@ -46,7 +46,7 @@ main (int argc, char **argv)
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
diff --git a/tests/overlayscroll.c b/tests/overlayscroll.c
index 64f3279351..01d0e08e3b 100644
--- a/tests/overlayscroll.c
+++ b/tests/overlayscroll.c
@@ -53,7 +53,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (window), 640, 480);
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
diff --git a/tests/scrolling-performance.c b/tests/scrolling-performance.c
index bfba4acc74..567a52a732 100644
--- a/tests/scrolling-performance.c
+++ b/tests/scrolling-performance.c
@@ -114,7 +114,7 @@ main (int argc, char **argv)
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   frame_stats_ensure (GTK_WINDOW (window));
   gtk_window_set_default_size (GTK_WINDOW (window), 800, 600);
 
diff --git a/tests/showrendernode.c b/tests/showrendernode.c
index 6ea4ba1d5d..4711bb23ef 100644
--- a/tests/showrendernode.c
+++ b/tests/showrendernode.c
@@ -150,7 +150,7 @@ main (int argc, char **argv)
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   nodeview = g_object_new (GTK_TYPE_NODE_VIEW, NULL);
 
   gtk_window_set_decorated (GTK_WINDOW (window), FALSE);
diff --git a/tests/simple.c b/tests/simple.c
index 63ae18f2f6..acfc8560a8 100644
--- a/tests/simple.c
+++ b/tests/simple.c
@@ -32,7 +32,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "hello world");
   gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
diff --git a/tests/stresstest-toolbar.c b/tests/stresstest-toolbar.c
index bbf745e60f..5e530eeaad 100644
--- a/tests/stresstest-toolbar.c
+++ b/tests/stresstest-toolbar.c
@@ -138,7 +138,7 @@ main (gint argc, gchar **argv)
 
   info.toolbar = NULL;
   info.counter = 0;
-  info.window = GTK_WINDOW (gtk_window_new (GTK_WINDOW_TOPLEVEL));
+  info.window = GTK_WINDOW (gtk_window_new ());
 
   gtk_widget_show (GTK_WIDGET (info.window));
   
diff --git a/tests/syncscroll.c b/tests/syncscroll.c
index 9229ff9aea..d31eaa7616 100644
--- a/tests/syncscroll.c
+++ b/tests/syncscroll.c
@@ -22,7 +22,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  win = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (win), 640, 480);
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
diff --git a/tests/testaccel.c b/tests/testaccel.c
index 0cc7d1600b..b9eacb9797 100644
--- a/tests/testaccel.c
+++ b/tests/testaccel.c
@@ -67,7 +67,7 @@ key_test (void)
         GtkWidget *box, *entry;
 
        /* create window */
-       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+       window = gtk_window_new ();
         gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
 
        sw = gtk_scrolled_window_new (NULL, NULL);
diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c
index 7bcb86215f..06524f15aa 100644
--- a/tests/testadjustsize.c
+++ b/tests/testadjustsize.c
@@ -63,7 +63,7 @@ open_test_window (void)
   GtkWidget *grid;
   int i;
 
-  test_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  test_window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (test_window), "Tests");
 
   g_signal_connect (test_window, "destroy", G_CALLBACK (gtk_main_quit), test_window);
@@ -128,7 +128,7 @@ open_control_window (void)
   GtkWidget *box;
   GtkWidget *toggle;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Controls");
 
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
@@ -227,7 +227,7 @@ open_alignment_window (void)
   int i;
   GEnumClass *align_class;
 
-  test_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  test_window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (test_window), "Alignment");
 
   g_signal_connect (test_window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
@@ -288,7 +288,7 @@ open_margin_window (void)
     "margin"
   };
 
-  test_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  test_window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (test_window), "Margin");
 
   g_signal_connect (test_window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
@@ -315,7 +315,7 @@ open_valigned_label_window (void)
 {
   GtkWidget *window, *box, *label, *frame;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
 
   g_signal_connect (test_window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
diff --git a/tests/testappchooser.c b/tests/testappchooser.c
index baf9adcad2..b2fee0903f 100644
--- a/tests/testappchooser.c
+++ b/tests/testappchooser.c
@@ -159,7 +159,7 @@ main (int argc, char **argv)
 
   gtk_init ();
 
-  toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  toplevel = gtk_window_new ();
   grid = gtk_grid_new ();
 
   w1 = gtk_label_new ("File:");
diff --git a/tests/testappchooserbutton.c b/tests/testappchooserbutton.c
index 6aee3dad6d..c02497ad46 100644
--- a/tests/testappchooserbutton.c
+++ b/tests/testappchooserbutton.c
@@ -68,7 +68,7 @@ main (int argc,
 
   gtk_init ();
 
-  toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  toplevel = gtk_window_new ();
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (toplevel), box);
diff --git a/tests/testassistant.c b/tests/testassistant.c
index ec3d3f9928..e5198f8cd5 100644
--- a/tests/testassistant.c
+++ b/tests/testassistant.c
@@ -701,7 +701,7 @@ main (int argc, gchar *argv[])
   if (g_getenv ("RTL"))
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_hide_on_close (GTK_WINDOW (window), TRUE);
 
   g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL);
diff --git a/tests/testbaseline.c b/tests/testbaseline.c
index 2ab609582f..9e2021df6f 100644
--- a/tests/testbaseline.c
+++ b/tests/testbaseline.c
@@ -87,7 +87,7 @@ main (int    argc,
                                               GTK_STYLE_PROVIDER (provider),
                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
   g_object_unref (provider);
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   g_signal_connect (G_OBJECT (window), "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   notebook = gtk_notebook_new ();
diff --git a/tests/testblur.c b/tests/testblur.c
index 99632ffd9c..9ddd8a8229 100644
--- a/tests/testblur.c
+++ b/tests/testblur.c
@@ -82,7 +82,7 @@ main (int argc, char **argv)
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   blur_box = g_object_new (gtk_blur_box_get_type (),
diff --git a/tests/testborderdrawing.c b/tests/testborderdrawing.c
index 80d5b81a96..a2b00451d7 100644
--- a/tests/testborderdrawing.c
+++ b/tests/testborderdrawing.c
@@ -95,7 +95,7 @@ main (int argc, char **argv)
                                               GTK_STYLE_PROVIDER (provider),
                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 40);
   top = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 40);
   bottom = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 40);
diff --git a/tests/testbox.c b/tests/testbox.c
index 106986d45b..b3a69a5b5f 100644
--- a/tests/testbox.c
+++ b/tests/testbox.c
@@ -83,7 +83,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
diff --git a/tests/testbuttons.c b/tests/testbuttons.c
index 038dfade80..caeb144ad5 100644
--- a/tests/testbuttons.c
+++ b/tests/testbuttons.c
@@ -29,7 +29,7 @@ int main (int argc, char *argv[])
 
        gtk_init ();
 
-       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+       window = gtk_window_new ();
 
        box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
diff --git a/tests/testcairo.c b/tests/testcairo.c
index 3f69ae6d48..f279eba38a 100644
--- a/tests/testcairo.c
+++ b/tests/testcairo.c
@@ -191,7 +191,7 @@ main (int argc, char **argv)
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
   gtk_window_set_title (GTK_WINDOW (window), "cairo: Knockout Groups");
diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index 545e89aac0..396c6add72 100644
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -444,7 +444,7 @@ create_calendar(void)
   for (i = 0; i < G_N_ELEMENTS (calendar_data.settings); i++)
     calendar_data.settings[i] = 0;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_hide_on_close (GTK_WINDOW (window), TRUE);
   gtk_window_set_title (GTK_WINDOW (window), "GtkCalendar Example");
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
diff --git a/tests/testcellarea.c b/tests/testcellarea.c
index e4d9f19cec..f75d9087ab 100644
--- a/tests/testcellarea.c
+++ b/tests/testcellarea.c
@@ -180,7 +180,7 @@ simple_cell_area (void)
   GtkWidget *window, *widget;
   GtkWidget *iconview, *frame, *vbox, *hbox;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
 
   gtk_window_set_title (GTK_WINDOW (window), "CellArea expand and alignments");
 
@@ -423,7 +423,7 @@ focus_cell_area (void)
   GtkWidget *window, *widget;
   GtkWidget *iconview, *frame, *vbox, *hbox;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   hbox  = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   gtk_widget_show (hbox);
 
@@ -512,7 +512,7 @@ background_area (void)
   GtkWidget *window, *widget, *label, *main_vbox;
   GtkWidget *iconview, *frame, *vbox, *hbox;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   hbox  = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   main_vbox  = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_widget_show (hbox);
diff --git a/tests/testcellrenderertext.c b/tests/testcellrenderertext.c
index 4c35f13ef8..7bda2777e0 100644
--- a/tests/testcellrenderertext.c
+++ b/tests/testcellrenderertext.c
@@ -256,7 +256,7 @@ main (int argc, char **argv)
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   g_signal_connect (window, "destroy",
                    G_CALLBACK (gtk_main_quit), NULL);
 
diff --git a/tests/testcenterbox.c b/tests/testcenterbox.c
index 326a728bfb..1acf9a8525 100644
--- a/tests/testcenterbox.c
+++ b/tests/testcenterbox.c
@@ -12,7 +12,7 @@ main (int argc, char *argv[])
   if (g_getenv ("RTL"))
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   box = gtk_center_box_new ();
   gtk_container_add (GTK_CONTAINER (window), box);
 
diff --git a/tests/testclipboard2.c b/tests/testclipboard2.c
index 432cbfc4bf..138460dd1f 100644
--- a/tests/testclipboard2.c
+++ b/tests/testclipboard2.c
@@ -386,7 +386,7 @@ main (int argc, char **argv)
   if (alt_display == NULL)
     alt_display = gdk_display_get_default ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
   gtk_container_add (GTK_CONTAINER (window),
                      get_window_contents (gtk_widget_get_display (window),
diff --git a/tests/testcombo.c b/tests/testcombo.c
index ade1673f80..ca8a48ba4d 100644
--- a/tests/testcombo.c
+++ b/tests/testcombo.c
@@ -938,7 +938,7 @@ main (int argc, char **argv)
        if (g_getenv ("RTL"))
          gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);
 
-        window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+        window = gtk_window_new ();
         g_signal_connect (window, "destroy", gtk_main_quit, NULL);
 
         mainbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
diff --git a/tests/testdialog.c b/tests/testdialog.c
index 7ec34dc9cd..cae1f39455 100644
--- a/tests/testdialog.c
+++ b/tests/testdialog.c
@@ -323,7 +323,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
diff --git a/tests/testdnd.c b/tests/testdnd.c
index dfc9bceac1..7e8af24207 100644
--- a/tests/testdnd.c
+++ b/tests/testdnd.c
@@ -593,7 +593,7 @@ main (int argc, char **argv)
   
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   g_signal_connect (window, "destroy",
                    G_CALLBACK (gtk_main_quit), NULL);
 
diff --git a/tests/testdnd2.c b/tests/testdnd2.c
index 5505055d0e..31fd24189f 100644
--- a/tests/testdnd2.c
+++ b/tests/testdnd2.c
@@ -347,7 +347,7 @@ main (int argc, char *Argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Drag And Drop");
   gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
diff --git a/tests/testellipsise.c b/tests/testellipsise.c
index 7abb58f229..bdc6e8a945 100644
--- a/tests/testellipsise.c
+++ b/tests/testellipsise.c
@@ -102,7 +102,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
diff --git a/tests/testemblems.c b/tests/testemblems.c
index cd28b39952..efd3c8d702 100644
--- a/tests/testemblems.c
+++ b/tests/testemblems.c
@@ -10,7 +10,7 @@ int main (int argc, char **argv)
 
        gtk_init ();
 
-       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+       window = gtk_window_new ();
 
        grid = gtk_grid_new ();
        gtk_grid_set_row_spacing (GTK_GRID (grid), 12);
diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c
index 3967c0bba6..fbdcbf23c5 100644
--- a/tests/testentrycompletion.c
+++ b/tests/testentrycompletion.c
@@ -298,7 +298,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
   
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
diff --git a/tests/testentryicons.c b/tests/testentryicons.c
index 83f81dbaab..dabc2acb2c 100644
--- a/tests/testentryicons.c
+++ b/tests/testentryicons.c
@@ -131,7 +131,7 @@ main (int argc, char **argv)
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Gtk Entry Icons Test");
 
   g_signal_connect (G_OBJECT (window), "destroy",
diff --git a/tests/testexpand.c b/tests/testexpand.c
index 348e66dd85..93561b0028 100644
--- a/tests/testexpand.c
+++ b/tests/testexpand.c
@@ -46,7 +46,7 @@ create_box_window (void)
   GtkWidget *toggle;
   GtkWidget *colorbox;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Boxes");
 
   box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
@@ -107,7 +107,7 @@ create_grid_window (void)
   GtkWidget *toggle;
   GtkWidget *colorbox;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Grid");
 
   grid = gtk_grid_new ();
diff --git a/tests/testfilechooser.c b/tests/testfilechooser.c
index 2141994275..d9fbd5e5fc 100644
--- a/tests/testfilechooser.c
+++ b/tests/testfilechooser.c
@@ -705,7 +705,7 @@ main (int argc, char **argv)
   /* Extra controls for manipulating the test environment
    */
 
-  control_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  control_window = gtk_window_new ();
 
   vbbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (control_window), vbbox);
diff --git a/tests/testfilechooserbutton.c b/tests/testfilechooserbutton.c
index 1df31b9a04..d6f419debd 100644
--- a/tests/testfilechooserbutton.c
+++ b/tests/testfilechooserbutton.c
@@ -110,7 +110,7 @@ tests_button_clicked_cb (GtkButton *real_button,
     {
       GtkWidget *box, *button;
 
-      tests = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      tests = gtk_window_new ();
       gtk_window_set_hide_on_close (GTK_WINDOW (tests), TRUE);
       gtk_window_set_title (GTK_WINDOW (tests),
                            "Tests - TestFileChooserButton");
diff --git a/tests/testflowbox.c b/tests/testflowbox.c
index f1e8415aeb..b622d40eca 100644
--- a/tests/testflowbox.c
+++ b/tests/testflowbox.c
@@ -379,7 +379,7 @@ create_window (void)
   GtkWidget *window, *hbox, *vbox, *flowbox_cntl, *items_cntl;
   GtkWidget *flowbox, *widget, *expander, *swindow;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   hbox   = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   vbox   = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 
diff --git a/tests/testfontchooser.c b/tests/testfontchooser.c
index 039a5695b5..9193a9f4ae 100644
--- a/tests/testfontchooser.c
+++ b/tests/testfontchooser.c
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
 
   fontchooser = gtk_font_chooser_widget_new ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_widget_set_size_request (window, 600, 600);
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_add (GTK_CONTAINER (window), box);
diff --git a/tests/testfontchooserdialog.c b/tests/testfontchooserdialog.c
index e85c6dc773..764f10a651 100644
--- a/tests/testfontchooserdialog.c
+++ b/tests/testfontchooserdialog.c
@@ -94,7 +94,7 @@ main (int argc, char *argv[])
 
   gtk_font_button_set_use_font (GTK_FONT_BUTTON (font_button), TRUE);
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_container_add (GTK_CONTAINER (window), font_button);
   gtk_widget_show (window);
 
diff --git a/tests/testfontoptions.c b/tests/testfontoptions.c
index 4043146199..d267955120 100644
--- a/tests/testfontoptions.c
+++ b/tests/testfontoptions.c
@@ -34,7 +34,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   grid = gtk_grid_new ();
   gtk_grid_set_row_spacing (GTK_GRID (grid), 10);
   gtk_grid_set_column_spacing (GTK_GRID (grid), 10);
diff --git a/tests/testframe.c b/tests/testframe.c
index 20ca049ec2..be1007ae53 100644
--- a/tests/testframe.c
+++ b/tests/testframe.c
@@ -135,7 +135,7 @@ int main (int argc, char **argv)
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);
 
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
diff --git a/tests/testfullscreen.c b/tests/testfullscreen.c
index 64d8e31d20..79e5f0850b 100644
--- a/tests/testfullscreen.c
+++ b/tests/testfullscreen.c
@@ -46,7 +46,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
   gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER);
diff --git a/tests/testgaction.c b/tests/testgaction.c
index 8591eae2d5..512f36adc9 100644
--- a/tests/testgaction.c
+++ b/tests/testgaction.c
@@ -98,7 +98,7 @@ static const char *menu_data =
 int main (int argc, char **argv)
 {
   gtk_init ();
-  GtkWidget *window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  GtkWidget *window = gtk_window_new ();
   GtkWidget *box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   GtkWidget *menubutton = gtk_menu_button_new ();
   GtkWidget *button1 = gtk_button_new_with_label ("Change Label Text");
diff --git a/tests/testgiconpixbuf.c b/tests/testgiconpixbuf.c
index 8a32943457..c4c222876a 100644
--- a/tests/testgiconpixbuf.c
+++ b/tests/testgiconpixbuf.c
@@ -36,7 +36,7 @@ main (int argc,
   gtk_init ();
 
   pixbuf = gdk_pixbuf_new_from_file ("apple-red.png", NULL);
-  toplevel = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  toplevel = gtk_window_new ();
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
   gtk_container_add (GTK_CONTAINER (toplevel), hbox);
 
diff --git a/tests/testglarea.c b/tests/testglarea.c
index 08ed63ce73..b55480556c 100644
--- a/tests/testglarea.c
+++ b/tests/testglarea.c
@@ -403,7 +403,7 @@ main (int argc, char *argv[])
    * GL context, and to check for features
    */
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "GtkGLArea - Triangle");
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 600);
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
diff --git a/tests/testglblending.c b/tests/testglblending.c
index fea7115582..3660913155 100644
--- a/tests/testglblending.c
+++ b/tests/testglblending.c
@@ -10,7 +10,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Test GL/gtk inter-blending");
   gtk_window_set_default_size (GTK_WINDOW (window), 250, 250);
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
diff --git a/tests/testgmenu.c b/tests/testgmenu.c
index ef4702165b..9d97eb8ae4 100644
--- a/tests/testgmenu.c
+++ b/tests/testgmenu.c
@@ -629,7 +629,7 @@ main (int argc, char *argv[])
        exit (1);
     }
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (window), box);
diff --git a/tests/testgrid.c b/tests/testgrid.c
index 4b63268895..b2d305fbb6 100644
--- a/tests/testgrid.c
+++ b/tests/testgrid.c
@@ -50,7 +50,7 @@ simple_grid (void)
   GtkWidget *test1, *test2, *test3, *test4, *test5, *test6;
   GtkGesture *gesture;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Orientation");
   grid = gtk_grid_new ();
   gtk_container_add (GTK_CONTAINER (window), grid);
@@ -95,7 +95,7 @@ text_grid (void)
   GtkWidget *box;
   GtkWidget *label;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Height-for-Width");
   paned1 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_container_add (GTK_CONTAINER (window), paned1);
@@ -137,7 +137,7 @@ box_comparison (void)
   GtkWidget *label;
   GtkWidget *grid;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Grid vs. Box");
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
   gtk_container_add (GTK_CONTAINER (window), vbox);
@@ -200,7 +200,7 @@ empty_line (void)
   GtkWidget *grid;
   GtkWidget *child;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Empty row");
   grid = gtk_grid_new ();
   gtk_container_add (GTK_CONTAINER (window), grid);
@@ -228,7 +228,7 @@ empty_grid (void)
   GtkWidget *grid;
   GtkWidget *child;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Empty grid");
   grid = gtk_grid_new ();
   gtk_container_add (GTK_CONTAINER (window), grid);
@@ -256,7 +256,7 @@ scrolling (void)
   GtkWidget *child;
   gint i;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Scrolling");
   sw = gtk_scrolled_window_new (NULL, NULL);
   viewport = gtk_viewport_new (NULL, NULL);
@@ -352,7 +352,7 @@ insert (void)
   GtkWidget *child;
   GtkWidget *button;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Insertion / Removal");
 
   g = gtk_grid_new ();
@@ -417,7 +417,7 @@ spanning_grid (void)
    * child need to stay collapsed
    */
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Spanning");
 
   g = gtk_grid_new ();
diff --git a/tests/testgridbaseline.c b/tests/testgridbaseline.c
index 8c097bfd96..0099469745 100644
--- a/tests/testgridbaseline.c
+++ b/tests/testgridbaseline.c
@@ -15,7 +15,7 @@ main (int argc, char *argv[])
   g_setenv ("GTK_DEBUG", "baselines,layout", TRUE);
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   grid = gtk_grid_new ();
   gtk_grid_set_row_spacing (GTK_GRID (grid), 30);
   gtk_grid_set_column_spacing (GTK_GRID (grid), 30);
diff --git a/tests/testgrouping.c b/tests/testgrouping.c
index fbcb20f051..4ef371eb21 100644
--- a/tests/testgrouping.c
+++ b/tests/testgrouping.c
@@ -109,7 +109,7 @@ main (int argc, char **argv)
 
   model = create_model ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
   gtk_window_set_default_size (GTK_WINDOW (window), 320, 480);
 
diff --git a/tests/testgtk.c b/tests/testgtk.c
index 96b80f8d94..d057d4ebab 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -266,7 +266,7 @@ create_buttons (GtkWidget *widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (widget));
 
@@ -341,7 +341,7 @@ create_toggle_buttons (GtkWidget *widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (widget));
 
@@ -715,7 +715,7 @@ create_statusbar (GtkWidget *widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (widget));
 
@@ -928,7 +928,7 @@ void create_labels (GtkWidget *widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
 
       gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (widget));
@@ -1224,7 +1224,7 @@ create_pixbuf (GtkWidget *widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
 
       gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (widget));
@@ -1304,7 +1304,6 @@ create_tooltips (GtkWidget *widget)
     {
       window =
        g_object_new (gtk_window_get_type (),
-                       "GtkWindow::type", GTK_WINDOW_TOPLEVEL,
                        "GtkWindow::title", "Tooltips",
                        "GtkWindow::resizable", FALSE,
                        NULL);
@@ -1405,7 +1404,7 @@ create_image (GtkWidget *widget)
       GtkWidget *vbox;
       GdkPixbuf *pixbuf;
         
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       
       gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (widget));
@@ -1535,7 +1534,7 @@ create_listbox (GtkWidget *widget)
       GdkDisplay *display = gtk_widget_get_display (widget);
       int i;
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_hide_on_close (GTK_WINDOW (window), TRUE);
       gtk_window_set_display (GTK_WINDOW (window), display);
 
@@ -1764,7 +1763,7 @@ create_modal_window (GtkWidget *widget)
   GtkWidget *btnColor,*btnFile,*btnClose;
 
   /* Create modal window (Here you can use any window descendent )*/
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_display (GTK_WINDOW (window),
                          gtk_widget_get_display (widget));
 
@@ -1925,7 +1924,7 @@ scrolled_windows_remove (GtkWidget *dialog, gint response, GtkWidget *scrollwin)
   else
     {
       sw_parent = gtk_widget_get_parent (scrollwin);
-      sw_float_parent = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      sw_float_parent = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (sw_float_parent),
                              gtk_widget_get_display (dialog));
       
@@ -2117,7 +2116,7 @@ create_entry (GtkWidget *widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (widget));
 
@@ -2214,7 +2213,7 @@ create_expander (GtkWidget *widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (widget));
 
@@ -2609,7 +2608,7 @@ create_spins (GtkWidget *widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (widget));
 
@@ -3051,7 +3050,7 @@ create_cursors (GtkWidget *widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (widget));
 
@@ -3178,7 +3177,7 @@ create_color_selection (GtkWidget *widget)
       GtkWidget *hbox;
       GtkWidget *label;
       
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window), 
                              gtk_widget_get_display (widget));
                             
@@ -3355,7 +3354,7 @@ create_font_selection (GtkWidget *widget)
       GtkWidget *hbox;
       GtkWidget *label;
       
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (widget));
 
@@ -3543,7 +3542,6 @@ create_display_screen (GtkWidget *widget)
 
   window = g_object_new (gtk_window_get_type (),
                         "display", display,
-                        "type", GTK_WINDOW_TOPLEVEL,
                         "title", "Screen or Display selection",
                          10, NULL);
   g_signal_connect (window, "destroy", 
@@ -3621,7 +3619,7 @@ create_range_controls (GtkWidget *widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
 
       gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (widget));
@@ -4001,7 +3999,7 @@ create_notebook (GtkWidget *widget)
   
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (widget));
 
@@ -4199,7 +4197,7 @@ create_panes (GtkWidget *widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
 
       gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (widget));
@@ -4288,7 +4286,7 @@ paned_keyboard_window1 (GtkWidget *widget)
   GtkWidget *button3;
   GtkWidget *button4;
 
-  window1 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window1 = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window1), "Basic paned navigation");
   gtk_window_set_display (GTK_WINDOW (window1), 
                          gtk_widget_get_display (widget));
@@ -4371,7 +4369,7 @@ paned_keyboard_window2 (GtkWidget *widget)
   GtkWidget *button11;
   GtkWidget *button10;
 
-  window2 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window2 = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window2), "\"button 10\" is not inside the horisontal pane");
 
   gtk_window_set_display (GTK_WINDOW (window2), 
@@ -4431,7 +4429,7 @@ paned_keyboard_window3 (GtkWidget *widget)
   GtkWidget *frame12;
   GtkWidget *button17;
 
-  window3 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window3 = gtk_window_new ();
   g_object_set_data (G_OBJECT (window3), "window3", window3);
   gtk_window_set_title (GTK_WINDOW (window3), "Nested panes");
 
@@ -4506,7 +4504,7 @@ paned_keyboard_window4 (GtkWidget *widget)
   GtkWidget *button25;
   GtkWidget *button24;
 
-  window4 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window4 = gtk_window_new ();
   g_object_set_data (G_OBJECT (window4), "window4", window4);
   gtk_window_set_title (GTK_WINDOW (window4), "window4");
 
@@ -4655,7 +4653,7 @@ create_wmhints (GtkWidget *widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
 
       gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (widget));
@@ -4966,7 +4964,7 @@ create_surface_states (GtkWidget *widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                              gtk_widget_get_display (widget));
 
@@ -4979,7 +4977,7 @@ create_surface_states (GtkWidget *widget)
       box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_container_add (GTK_CONTAINER (window), box1);
 
-      iconified = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      iconified = gtk_window_new ();
 
       gtk_window_set_display (GTK_WINDOW (iconified),
                              gtk_widget_get_display (widget));
@@ -4993,7 +4991,7 @@ create_surface_states (GtkWidget *widget)
       controls = get_state_controls (iconified);
       gtk_container_add (GTK_CONTAINER (iconified), controls);
       
-      normal = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      normal = gtk_window_new ();
 
       gtk_window_set_display (GTK_WINDOW (normal),
                              gtk_widget_get_display (widget));
@@ -5133,7 +5131,7 @@ window_controls (GtkWidget *window)
   GtkWidget *spin;
   GtkAdjustment *adjustment;
   
-  control_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  control_window = gtk_window_new ();
 
   gtk_window_set_display (GTK_WINDOW (control_window),
                          gtk_widget_get_display (window));
@@ -5255,7 +5253,7 @@ create_window_sizing (GtkWidget *widget)
     {
       GtkWidget *label;
       
-      target_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      target_window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (target_window),
                              gtk_widget_get_display (widget));
       label = gtk_label_new (NULL);
@@ -6021,7 +6019,7 @@ create_native_dialogs (GtkWidget *widget)
 
   if (!window)
     {
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       gtk_window_set_display (GTK_WINDOW (window),
                               gtk_widget_get_display (widget));
 
@@ -6190,7 +6188,7 @@ create_main_window (void)
   GtkWidget *separator;
   int i;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_widget_set_name (window, "main_window");
   gtk_window_set_default_size (GTK_WINDOW (window), -1, 400);
 
@@ -6331,7 +6329,7 @@ do_bench (char* what, int num)
   GtkWidget *widget;
   void (* fn) (GtkWidget *widget);
   fn = NULL;
-  widget = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  widget = gtk_window_new ();
 
   if (g_ascii_strcasecmp (what, "ALL") == 0)
     {
diff --git a/tests/testheaderbar.c b/tests/testheaderbar.c
index 51f5a97a13..ea3c9ac15b 100644
--- a/tests/testheaderbar.c
+++ b/tests/testheaderbar.c
@@ -127,7 +127,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_style_context_add_class (gtk_widget_get_style_context (window), "main");
 
   provider = gtk_css_provider_new ();
diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c
index 3a09bede1e..9748f4c87b 100644
--- a/tests/testheightforwidth.c
+++ b/tests/testheightforwidth.c
@@ -808,7 +808,7 @@ create_window (void)
   GtkWidget *window, *vbox, *button;
   gint i;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   vbox   = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 
   g_object_set (vbox, "margin", 8, NULL);
diff --git a/tests/testicontheme.c b/tests/testicontheme.c
index 8b3d462864..9d31634c00 100644
--- a/tests/testicontheme.c
+++ b/tests/testicontheme.c
@@ -115,7 +115,7 @@ main (int argc, char *argv[])
           return 1;
         }
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       image = gtk_image_new ();
       gtk_image_set_from_paintable (GTK_IMAGE (image), paintable);
       g_object_unref (paintable);
@@ -143,7 +143,7 @@ main (int argc, char *argv[])
       if (argc >= 6)
        scale = atoi (argv[5]);
 
-      window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window = gtk_window_new ();
       image = gtk_image_new ();
       gtk_container_add (GTK_CONTAINER (window), image);
       g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
diff --git a/tests/testiconview-keynav.c b/tests/testiconview-keynav.c
index 69a9b95869..2bb3bb5c94 100644
--- a/tests/testiconview-keynav.c
+++ b/tests/testiconview-keynav.c
@@ -232,7 +232,7 @@ main (int argc, char *argv[])
 
   set_styles ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
diff --git a/tests/testiconview.c b/tests/testiconview.c
index f82d706950..40ca35bbf9 100644
--- a/tests/testiconview.c
+++ b/tests/testiconview.c
@@ -416,7 +416,7 @@ main (gint argc, gchar **argv)
   if (g_getenv ("RTL"))
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (window), 700, 400);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
diff --git a/tests/testimage.c b/tests/testimage.c
index 455d5c03fa..e3ac22cf5e 100644
--- a/tests/testimage.c
+++ b/tests/testimage.c
@@ -93,7 +93,7 @@ main (int argc, char **argv)
   if (argc > 2)
     anim_filename = argv[2];
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
 
   grid = gtk_grid_new ();
   gtk_grid_set_row_spacing (GTK_GRID (grid), 10);
diff --git a/tests/testinfobar.c b/tests/testinfobar.c
index 0fa3163410..cb78f3f82d 100644
--- a/tests/testinfobar.c
+++ b/tests/testinfobar.c
@@ -85,7 +85,7 @@ on_activate (GApplication *application,
   g_signal_connect (info_bar, "response",
                     G_CALLBACK (on_info_bar_response), widget);
 
-  widget = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  widget = gtk_window_new ();
   gtk_container_add (GTK_CONTAINER (widget), box);
   gtk_widget_show (widget);
   gtk_application_add_window (GTK_APPLICATION (application),
diff --git a/tests/testkineticscrolling.c b/tests/testkineticscrolling.c
index cc866e5f51..f0365bd451 100644
--- a/tests/testkineticscrolling.c
+++ b/tests/testkineticscrolling.c
@@ -24,7 +24,7 @@ kinetic_scrolling (void)
   GdkContentFormats *targets;
   gint i;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
diff --git a/tests/testlevelbar.c b/tests/testlevelbar.c
index 255bd1d523..0bc706bf52 100644
--- a/tests/testlevelbar.c
+++ b/tests/testlevelbar.c
@@ -77,7 +77,7 @@ main (int argc, char *argv[])
 
   add_custom_css ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (window), 500, 100);
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
   g_object_set (box, "margin", 20, NULL);
diff --git a/tests/testlist.c b/tests/testlist.c
index 8e3f8b9007..a751ef6b0e 100644
--- a/tests/testlist.c
+++ b/tests/testlist.c
@@ -256,7 +256,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (window), hbox);
 
diff --git a/tests/testlist2.c b/tests/testlist2.c
index c329f06fe5..02e1081fc0 100644
--- a/tests/testlist2.c
+++ b/tests/testlist2.c
@@ -103,7 +103,7 @@ int main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);
 
   list = gtk_list_box_new ();
diff --git a/tests/testlist3.c b/tests/testlist3.c
index 2f6aba8450..480aa6fa5e 100644
--- a/tests/testlist3.c
+++ b/tests/testlist3.c
@@ -144,7 +144,7 @@ main (int argc, char *argv[])
   provider = gtk_css_provider_new ();
   gtk_css_provider_load_from_data (provider, css, -1);
   gtk_style_context_add_provider_for_display (gdk_display_get_default (), GTK_STYLE_PROVIDER (provider), 
800);
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (window), -1, 300);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
diff --git a/tests/testlockbutton.c b/tests/testlockbutton.c
index 732f8bdbd1..5f7a63fcc3 100644
--- a/tests/testlockbutton.c
+++ b/tests/testlockbutton.c
@@ -222,7 +222,7 @@ main (int argc, char *argv[])
 
   permission = g_object_new (G_TYPE_TEST_PERMISSION, NULL);
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
diff --git a/tests/testlogout.c b/tests/testlogout.c
index 78236e82ff..f0435cad7d 100644
--- a/tests/testlogout.c
+++ b/tests/testlogout.c
@@ -79,7 +79,7 @@ activate (GtkApplication *app,
   GtkWidget *button;
   GtkWidget *label;
 
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  win = gtk_window_new ();
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
   g_object_set (box, "margin", 12, NULL);
diff --git a/tests/testmenubutton.c b/tests/testmenubutton.c
index 7e3d945b73..4869b7eb09 100644
--- a/tests/testmenubutton.c
+++ b/tests/testmenubutton.c
@@ -47,7 +47,7 @@ int main (int argc, char **argv)
 
        gtk_init ();
 
-       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+       window = gtk_window_new ();
        gtk_window_resize (GTK_WINDOW (window), 400, 300);
 
        grid = gtk_grid_new ();
diff --git a/tests/testmodelbutton.c b/tests/testmodelbutton.c
index bea494faa6..523de0db26 100644
--- a/tests/testmodelbutton.c
+++ b/tests/testmodelbutton.c
@@ -75,7 +75,7 @@ on_application_activate (GApplication *gapplication,
                           G_BINDING_SYNC_CREATE | G_BINDING_BIDIRECTIONAL);
   gtk_container_add (GTK_CONTAINER (box), widget);
 
-  widget = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  widget = gtk_window_new ();
   gtk_container_add (GTK_CONTAINER (widget), box);
   gtk_widget_show (widget);
   gtk_application_add_window (GTK_APPLICATION (application), GTK_WINDOW (widget));
diff --git a/tests/testnoscreen.c b/tests/testnoscreen.c
index f6474bb298..476d1f23cb 100644
--- a/tests/testnoscreen.c
+++ b/tests/testnoscreen.c
@@ -33,7 +33,7 @@ int main (int argc, char *argv[])
   has_display = gtk_init_check ();
   g_assert (!has_display);
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   button = gtk_button_new ();
   gtk_container_add (GTK_CONTAINER (window), button);
 
diff --git a/tests/testnotebookdnd.c b/tests/testnotebookdnd.c
index 543b8186f3..3f6e51b7e8 100644
--- a/tests/testnotebookdnd.c
+++ b/tests/testnotebookdnd.c
@@ -68,7 +68,7 @@ window_creation_function (GtkNotebook *source_notebook,
 {
   GtkWidget *window, *notebook;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   notebook = gtk_notebook_new ();
   g_signal_connect (notebook, "create-window",
                     G_CALLBACK (window_creation_function), NULL);
@@ -303,7 +303,7 @@ main (gint argc, gchar *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   grid = gtk_grid_new ();
 
   gtk_grid_attach (GTK_GRID (grid),
diff --git a/tests/testorientable.c b/tests/testorientable.c
index c002eebd96..ab3fc08dd4 100644
--- a/tests/testorientable.c
+++ b/tests/testorientable.c
@@ -53,7 +53,7 @@ main (int argc, char **argv)
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   grid= gtk_grid_new ();
   gtk_grid_set_row_spacing (GTK_GRID (grid), 12);
   gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
diff --git a/tests/testoutsetshadowdrawing.c b/tests/testoutsetshadowdrawing.c
index 96462a3310..4ebffc090a 100644
--- a/tests/testoutsetshadowdrawing.c
+++ b/tests/testoutsetshadowdrawing.c
@@ -92,7 +92,7 @@ main (int argc, char **argv)
                                               GTK_STYLE_PROVIDER (provider),
                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_decorated (GTK_WINDOW (window), FALSE);
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 120);
   top = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 120);
diff --git a/tests/testoverlay.c b/tests/testoverlay.c
index b73b0fc783..dbe66da980 100644
--- a/tests/testoverlay.c
+++ b/tests/testoverlay.c
@@ -41,7 +41,7 @@ test_nonzerox (void)
   GtkWidget *text;
   GtkWidget *child;
 
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  win = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (win), "Non-zero X");
 
   grid = gtk_grid_new ();
@@ -120,7 +120,7 @@ test_relative (void)
   GtkWidget *text;
   GtkWidget *child;
 
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  win = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (win), "Custom positioning");
 
   overlay = gtk_overlay_new ();
@@ -166,7 +166,7 @@ test_fullwidth (void)
   GtkWidget *text;
   GtkWidget *child;
 
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  win = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (win), "Full-width");
 
   overlay = gtk_overlay_new ();
@@ -200,7 +200,7 @@ test_scrolling (void)
   gchar *contents;
   gsize len;
 
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  win = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (win), "Scrolling");
 
   overlay = gtk_overlay_new ();
@@ -343,7 +343,7 @@ test_chase (void)
   gsize len;
   GtkEventController *controller;
 
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  win = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (win), "Chase");
 
   overlay = gtk_overlay_new ();
@@ -394,7 +394,7 @@ test_stacking (void)
   GtkWidget *check1;
   GtkWidget *check2;
 
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  win = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (win), "Stacking");
 
   grid = gtk_grid_new ();
@@ -439,7 +439,7 @@ test_input_stacking (void)
   GtkWidget *vbox;
   int i,j;
 
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  win = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (win), "Input Stacking");
 
   overlay = gtk_overlay_new ();
diff --git a/tests/testoverlaystyleclass.c b/tests/testoverlaystyleclass.c
index 37a857d265..e4297c7745 100644
--- a/tests/testoverlaystyleclass.c
+++ b/tests/testoverlaystyleclass.c
@@ -60,7 +60,7 @@ main (int argc, char *argv[])
                                               GTK_STYLE_PROVIDER (provider),
                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  win = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (win), 600, 600);
 
   grid = gtk_grid_new ();
diff --git a/tests/testpixbuf-scale.c b/tests/testpixbuf-scale.c
index 5e48ef8bd1..db3373fc5c 100644
--- a/tests/testpixbuf-scale.c
+++ b/tests/testpixbuf-scale.c
@@ -87,7 +87,7 @@ main(int argc, char **argv)
         if (creator)
                 g_print ("%s was created by '%s'\n", argv[1], creator);
 
-       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+       window = gtk_window_new ();
        g_signal_connect (window, "destroy",
                          G_CALLBACK (gtk_main_quit), NULL);
        
diff --git a/tests/testplacesview.c b/tests/testplacesview.c
index e258c4405d..ad372a97e0 100644
--- a/tests/testplacesview.c
+++ b/tests/testplacesview.c
@@ -10,7 +10,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  win = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (win), 400, 600);
 
   view = gtk_places_view_new ();
diff --git a/tests/testpopover.c b/tests/testpopover.c
index 7927362d57..d948da9714 100644
--- a/tests/testpopover.c
+++ b/tests/testpopover.c
@@ -58,7 +58,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  win = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (win), 400, 600);
   header_bar = gtk_header_bar_new ();
   gtk_header_bar_set_show_title_buttons (GTK_HEADER_BAR (header_bar), TRUE);
diff --git a/tests/testrevealer.c b/tests/testrevealer.c
index cb2cf9b952..3f7a67af96 100644
--- a/tests/testrevealer.c
+++ b/tests/testrevealer.c
@@ -8,7 +8,7 @@ main (gint argc,
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_widget_set_size_request (window, 300, 300);
 
   box = gtk_grid_new ();
diff --git a/tests/testscale.c b/tests/testscale.c
index 33280dcf37..50672b1971 100644
--- a/tests/testscale.c
+++ b/tests/testscale.c
@@ -116,7 +116,7 @@ int main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Ranges with marks");
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
   box1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
diff --git a/tests/testscrolledge.c b/tests/testscrolledge.c
index 03a0b669fe..819cbf02fa 100644
--- a/tests/testscrolledge.c
+++ b/tests/testscrolledge.c
@@ -98,7 +98,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  win = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (win), 600, 400);
 
   overlay = gtk_overlay_new ();
diff --git a/tests/testscrolledwindow.c b/tests/testscrolledwindow.c
index 417f172217..0b65ea805b 100644
--- a/tests/testscrolledwindow.c
+++ b/tests/testscrolledwindow.c
@@ -83,7 +83,7 @@ scrollable_policy (void)
   GtkWidget *window, *swindow, *hbox, *vbox, *frame, *cntl, *listbox;
   GtkWidget *viewport, *label, *expander, *widget, *popover;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   hbox   = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   vbox   = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 
diff --git a/tests/testsensitive.c b/tests/testsensitive.c
index 4085b51373..e973799285 100644
--- a/tests/testsensitive.c
+++ b/tests/testsensitive.c
@@ -60,7 +60,7 @@ int main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
   gtk_container_add (GTK_CONTAINER (window), box);
 
diff --git a/tests/testspinbutton.c b/tests/testspinbutton.c
index 49420a69a5..ad1aabdece 100644
--- a/tests/testspinbutton.c
+++ b/tests/testspinbutton.c
@@ -36,7 +36,7 @@ prepare_window_for_orientation (GtkOrientation orientation)
   GtkWidget *window, *mainbox, *wrap_button;
   int max;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   g_signal_connect (window, "close-request", G_CALLBACK (on_delete), NULL);
 
   mainbox = gtk_box_new (GTK_ORIENTATION_VERTICAL ^ orientation, 2);
diff --git a/tests/teststack.c b/tests/teststack.c
index 672a12fd12..da3ed7ea6a 100644
--- a/tests/teststack.c
+++ b/tests/teststack.c
@@ -122,7 +122,7 @@ main (gint argc,
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_widget_set_size_request (window, 300, 300);
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
diff --git a/tests/testswitch.c b/tests/testswitch.c
index 9d9ded6d45..a08f1df189 100644
--- a/tests/testswitch.c
+++ b/tests/testswitch.c
@@ -154,7 +154,7 @@ int main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   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 (gtk_main_quit), NULL);
diff --git a/tests/testtexture.c b/tests/testtexture.c
index 3fe7dc358f..7bf206ebfb 100644
--- a/tests/testtexture.c
+++ b/tests/testtexture.c
@@ -126,7 +126,7 @@ main (int argc, char **argv)
       return -1;
     }
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
   view = g_object_new (GTK_TYPE_TEXTURE_VIEW, NULL);
   ((GtkTextureView*)view)->texture = g_steal_pointer (&texture);
diff --git a/tests/testtextview.c b/tests/testtextview.c
index c0458e2dd9..99fd2a29da 100644
--- a/tests/testtextview.c
+++ b/tests/testtextview.c
@@ -175,7 +175,7 @@ main (int argc, char **argv)
 
   gtk_init ();
 
-  window   = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window   = gtk_window_new ();
   sw       = gtk_scrolled_window_new (NULL, NULL);
   textview = g_object_new (my_text_view_get_type (), NULL);
   buffer   = gtk_text_view_get_buffer (GTK_TEXT_VIEW (textview));
diff --git a/tests/testtoolbar.c b/tests/testtoolbar.c
index a26f8a842b..e2aa30d07b 100644
--- a/tests/testtoolbar.c
+++ b/tests/testtoolbar.c
@@ -403,7 +403,7 @@ main (gint argc, gchar **argv)
   
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
 
   g_signal_connect (window, "destroy", G_CALLBACK(gtk_main_quit), NULL);
 
diff --git a/tests/testtoolbar2.c b/tests/testtoolbar2.c
index 4b1b24e0fd..14e9b1ef7a 100644
--- a/tests/testtoolbar2.c
+++ b/tests/testtoolbar2.c
@@ -11,7 +11,7 @@ int main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (window), box);
diff --git a/tests/testtooltips.c b/tests/testtooltips.c
index 0f9af5ce05..4d4d62d053 100644
--- a/tests/testtooltips.c
+++ b/tests/testtooltips.c
@@ -284,7 +284,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Tooltips test");
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
diff --git a/tests/testtreechanging.c b/tests/testtreechanging.c
index 0b5d6d8c06..c4bedec112 100644
--- a/tests/testtreechanging.c
+++ b/tests/testtreechanging.c
@@ -479,7 +479,7 @@ main (int    argc,
   if (g_getenv ("RTL"))
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
   gtk_window_set_default_size (GTK_WINDOW (window), 430, 400);
 
diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c
index b22f5fbf95..eb6c346271 100644
--- a/tests/testtreecolumns.c
+++ b/tests/testtreecolumns.c
@@ -743,7 +743,7 @@ main (int argc, char *argv[])
     }
 
   /* Set up the test windows. */
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); 
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);
   gtk_window_set_title (GTK_WINDOW (window), "Top Window");
@@ -752,7 +752,7 @@ main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (swindow), sample_tree_view_top);
   gtk_widget_show (window);
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL); 
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);
   gtk_window_set_title (GTK_WINDOW (window), "Bottom Window");
@@ -762,7 +762,7 @@ main (int argc, char *argv[])
   gtk_widget_show (window);
 
   /* Set up the main window */
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
   gtk_window_set_default_size (GTK_WINDOW (window), 500, 300);
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
diff --git a/tests/testtreecolumnsizing.c b/tests/testtreecolumnsizing.c
index 7bd3187b58..4130190d24 100644
--- a/tests/testtreecolumnsizing.c
+++ b/tests/testtreecolumnsizing.c
@@ -173,7 +173,7 @@ main (int argc, char **argv)
   gtk_init ();
 
   /* Window and box */
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (window), 640, 480);
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
diff --git a/tests/testtreednd.c b/tests/testtreednd.c
index 5cf423c9bf..0a11dfc0af 100644
--- a/tests/testtreednd.c
+++ b/tests/testtreednd.c
@@ -124,7 +124,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (window), box);
diff --git a/tests/testtreeedit.c b/tests/testtreeedit.c
index 0b47b28a33..621901a5ec 100644
--- a/tests/testtreeedit.c
+++ b/tests/testtreeedit.c
@@ -233,7 +233,7 @@ main (gint argc, gchar **argv)
   if (g_getenv ("RTL"))
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "GtkTreeView editing sample");
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
 
diff --git a/tests/testtreeflow.c b/tests/testtreeflow.c
index 6155744595..1c1c978ae6 100644
--- a/tests/testtreeflow.c
+++ b/tests/testtreeflow.c
@@ -130,7 +130,7 @@ main (int argc, char *argv[])
   gtk_init ();
 
   path = gtk_tree_path_new_from_string ("80");
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Reflow test");
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c
index 65cebaf587..383f488726 100644
--- a/tests/testtreefocus.c
+++ b/tests/testtreefocus.c
@@ -348,7 +348,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Card planning sheet");
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
@@ -463,7 +463,7 @@ main (int argc, char *argv[])
                               650, 400);
   gtk_widget_show (window);
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Model");
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
diff --git a/tests/testtreelistmodel.c b/tests/testtreelistmodel.c
index 277a6e156d..8cb9472de3 100644
--- a/tests/testtreelistmodel.c
+++ b/tests/testtreelistmodel.c
@@ -310,7 +310,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  win = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (win), 400, 600);
   g_signal_connect (win, "destroy", G_CALLBACK (gtk_main_quit), win);
 
diff --git a/tests/testtreepos.c b/tests/testtreepos.c
index 39944a26b7..80e3d9d7b4 100644
--- a/tests/testtreepos.c
+++ b/tests/testtreepos.c
@@ -93,7 +93,7 @@ int main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_container_add (GTK_CONTAINER (window), sw);
   tv = gtk_tree_view_new ();
diff --git a/tests/testtreesort.c b/tests/testtreesort.c
index 14a1b25e1e..3a2a02e5a9 100644
--- a/tests/testtreesort.c
+++ b/tests/testtreesort.c
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
    * First window - Just a GtkTreeStore
    */
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Words, words, words - Window 1");
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
@@ -245,7 +245,7 @@ main (int argc, char *argv[])
 
   if (smodel)
     {
-      window2 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window2 = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window2), 
                            "Words, words, words - window 2");
       g_signal_connect (window2, "destroy", gtk_main_quit, NULL);
@@ -314,7 +314,7 @@ main (int argc, char *argv[])
   
   if (ssmodel)
     {
-      window3 = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+      window3 = gtk_window_new ();
       gtk_window_set_title (GTK_WINDOW (window3), 
                            "Words, words, words - Window 3");
       g_signal_connect (window3, "destroy", gtk_main_quit, NULL);
diff --git a/tests/testtreeview.c b/tests/testtreeview.c
index 37735cda33..eaca004e50 100644
--- a/tests/testtreeview.c
+++ b/tests/testtreeview.c
@@ -686,7 +686,7 @@ main (int    argc,
 
   run_automated_tests ();
   
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   g_signal_connect (window, "destroy", G_CALLBACK (gtk_main_quit), NULL);
   gtk_window_set_default_size (GTK_WINDOW (window), 430, 400);
 
diff --git a/tests/testverticalcells.c b/tests/testverticalcells.c
index 15512e114e..af73731f2e 100644
--- a/tests/testverticalcells.c
+++ b/tests/testverticalcells.c
@@ -304,7 +304,7 @@ main (gint argc, gchar **argv)
   if (g_getenv ("RTL"))
     gtk_widget_set_default_direction (GTK_TEXT_DIR_RTL);
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Vertical cells in GtkTreeViewColumn example");
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
 
diff --git a/tests/testvolumebutton.c b/tests/testvolumebutton.c
index 04bff92ccd..1886e561d9 100644
--- a/tests/testvolumebutton.c
+++ b/tests/testvolumebutton.c
@@ -84,7 +84,7 @@ main (int    argc,
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (window), 400, 300);
   button = gtk_volume_button_new ();
   button2 = gtk_volume_button_new ();
diff --git a/tests/testwidgetfocus.c b/tests/testwidgetfocus.c
index 0ee9e7903c..295b169711 100644
--- a/tests/testwidgetfocus.c
+++ b/tests/testwidgetfocus.c
@@ -280,7 +280,7 @@ main()
                                               GTK_STYLE_PROVIDER (provider),
                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   widget = g_object_new (GTK_TYPE_FOCUS_WIDGET, NULL);
 
   gtk_window_set_decorated (GTK_WINDOW (window), FALSE);
diff --git a/tests/testwidgettransforms.c b/tests/testwidgettransforms.c
index d8cf78fc6c..24dc25b02c 100644
--- a/tests/testwidgettransforms.c
+++ b/tests/testwidgettransforms.c
@@ -297,7 +297,7 @@ main (int argc, char **argv)
                                               GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
 
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   matrix_chooser = g_object_new (GTK_TYPE_MATRIX_CHOOSER, NULL);
   transform_tester = g_object_new (GTK_TYPE_TRANSFORM_TESTER, NULL);
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
diff --git a/tests/testwindowdrag.c b/tests/testwindowdrag.c
index baa49952ac..a1d2f7b08f 100644
--- a/tests/testwindowdrag.c
+++ b/tests/testwindowdrag.c
@@ -98,7 +98,7 @@ main (int argc, char *argv[])
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_titlebar (GTK_WINDOW (window), gtk_header_bar_new ());
 
   grid = gtk_grid_new ();
diff --git a/tests/testwindowsize.c b/tests/testwindowsize.c
index e5fb876906..1effb03258 100644
--- a/tests/testwindowsize.c
+++ b/tests/testwindowsize.c
@@ -80,7 +80,7 @@ create_window (void)
   GtkWidget *label;
   GtkWidget *button;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_title (GTK_WINDOW (window), "Window size");
   gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
diff --git a/tests/treestoretest.c b/tests/treestoretest.c
index 2eaddcf702..aa06722989 100644
--- a/tests/treestoretest.c
+++ b/tests/treestoretest.c
@@ -290,7 +290,7 @@ make_window (gint view_type)
   GObject *selection;
 
   /* Make the Widgets/Objects */
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   switch (view_type)
     {
     case 0:
diff --git a/tests/video-timer.c b/tests/video-timer.c
index 033425ece4..dfd21db1b8 100644
--- a/tests/video-timer.c
+++ b/tests/video-timer.c
@@ -380,7 +380,7 @@ main(int argc, char **argv)
 
   gtk_init ();
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_window_set_default_size (GTK_WINDOW (window), 300, 300);
   g_signal_connect (window, "destroy",
                     G_CALLBACK (gtk_main_quit), NULL);
diff --git a/tests/visuals/visuals.c b/tests/visuals/visuals.c
index 069d8132f3..b329408150 100644
--- a/tests/visuals/visuals.c
+++ b/tests/visuals/visuals.c
@@ -36,7 +36,7 @@ dark_button_toggled_cb (GtkToggleButton *button,
 static void
 create_dark_popup (GtkWidget *parent)
 {
-  GtkWidget *popup = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  GtkWidget *popup = gtk_window_new ();
   GtkWidget *button = gtk_toggle_button_new_with_label ("Dark");
 
   gtk_window_set_decorated (GTK_WINDOW (popup), FALSE);
diff --git a/testsuite/a11y/children.c b/testsuite/a11y/children.c
index cc186c3259..debbca5b1e 100644
--- a/testsuite/a11y/children.c
+++ b/testsuite/a11y/children.c
@@ -248,7 +248,7 @@ main (int argc, char *argv[])
   add_child_tests (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0));
   add_child_tests (gtk_paned_new (GTK_ORIENTATION_HORIZONTAL));
   add_child_tests (gtk_grid_new ());
-  add_child_tests (gtk_window_new (GTK_WINDOW_TOPLEVEL));
+  add_child_tests (gtk_window_new ());
   add_child_tests (gtk_assistant_new ());
   add_child_tests (gtk_frame_new ("frame"));
   add_child_tests (gtk_expander_new ("expander"));
diff --git a/testsuite/gtk/action.c b/testsuite/gtk/action.c
index 50882c36d6..056e60fc80 100644
--- a/testsuite/gtk/action.c
+++ b/testsuite/gtk/action.c
@@ -54,7 +54,7 @@ test_action (void)
     { "action", box_activate, NULL, NULL, NULL },
   };
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   button = gtk_button_new ();
 
@@ -207,7 +207,7 @@ test_overlap (void)
   GSimpleActionGroup *win_actions;
   GSimpleActionGroup *box_actions;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
   gtk_container_add (GTK_CONTAINER (window), box);
diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 645f86bb03..4b07310bd2 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -828,7 +828,6 @@ test_construct_only_property (void)
   const gchar buffer[] =
     "<interface>"
     "  <object class=\"GtkWindow\" id=\"window1\">"
-    "    <property name=\"type\">popup</property>"
     "  </object>"
     "</interface>";
   const gchar buffer2[] =
@@ -839,12 +838,9 @@ test_construct_only_property (void)
     "  </object>"
     "</interface>";
   GObject *widget, *tagtable, *textbuffer;
-  GtkWindowType type;
   
   builder = builder_new_from_string (buffer, -1, NULL);
   widget = gtk_builder_get_object (builder, "window1");
-  g_object_get (widget, "type", &type, NULL);
-  g_assert (type == GTK_WINDOW_POPUP);
 
   gtk_widget_destroy (GTK_WIDGET (widget));
   g_object_unref (builder);
@@ -1714,23 +1710,6 @@ test_value_from_string (void)
   g_error_free (error);
   error = NULL;
 
-  g_assert (gtk_builder_value_from_string_type (builder, GTK_TYPE_WINDOW_TYPE, "toplevel", &value, &error) 
== TRUE);
-  g_assert (G_VALUE_HOLDS_ENUM (&value));
-  g_assert (g_value_get_enum (&value) == GTK_WINDOW_TOPLEVEL);
-  g_value_unset (&value);
-
-  g_assert (gtk_builder_value_from_string_type (builder, GTK_TYPE_WINDOW_TYPE, "sliff", &value, &error) == 
FALSE);
-  g_value_unset (&value);
-  g_assert_error (error, GTK_BUILDER_ERROR, GTK_BUILDER_ERROR_INVALID_VALUE);
-  g_error_free (error);
-  error = NULL;
-
-  g_assert (gtk_builder_value_from_string_type (builder, GTK_TYPE_WINDOW_TYPE, "foobar", &value, &error) == 
FALSE);
-  g_value_unset (&value);
-  g_assert_error (error, GTK_BUILDER_ERROR, GTK_BUILDER_ERROR_INVALID_VALUE);
-  g_error_free (error);
-  error = NULL;
-  
   g_object_unref (builder);
 }
 
diff --git a/testsuite/gtk/displayclose.c b/testsuite/gtk/displayclose.c
index 47794a476d..46f54c790b 100644
--- a/testsuite/gtk/displayclose.c
+++ b/testsuite/gtk/displayclose.c
@@ -23,7 +23,7 @@ main (int argc, char **argv)
 
   gdk_display_manager_set_default_display (gdk_display_manager_get (), display);
 
-  win = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  win = gtk_window_new ();
   g_signal_connect (win, "destroy", G_CALLBACK (gtk_main_quit), NULL);
 
   but = gtk_button_new_with_label ("Try to Exit");
diff --git a/testsuite/gtk/filtermodel.c b/testsuite/gtk/filtermodel.c
index 48351bc320..649e9c9749 100644
--- a/testsuite/gtk/filtermodel.c
+++ b/testsuite/gtk/filtermodel.c
@@ -4688,7 +4688,7 @@ specific_append_after_collapse (void)
 
   sort = gtk_tree_model_sort_new_with_model (filter);
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   tree_view = gtk_tree_view_new_with_model (sort);
   gtk_container_add (GTK_CONTAINER (window), tree_view);
   gtk_widget_realize (tree_view);
@@ -4808,7 +4808,7 @@ specific_sort_filter_remove_node (void)
                                           filter, NULL);
 
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   tree_view = gtk_tree_view_new_with_model (filter);
   gtk_container_add (GTK_CONTAINER (window), tree_view);
   gtk_widget_realize (tree_view);
@@ -5823,7 +5823,7 @@ specific_bug_311955 (void)
                                           specific_bug_311955_filter_func,
                                           NULL, NULL);
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   tree_view = gtk_tree_view_new_with_model (filter);
   g_object_unref (store);
 
diff --git a/testsuite/gtk/focus.c b/testsuite/gtk/focus.c
index 73b777a05f..584a2c557e 100644
--- a/testsuite/gtk/focus.c
+++ b/testsuite/gtk/focus.c
@@ -94,7 +94,7 @@ test_window_focus (void)
    *      [entry1]  label2  [entry2]
    */
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   gtk_widget_set_name (window, "window");
   add_controller (window, s);
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
diff --git a/testsuite/gtk/gestures.c b/testsuite/gtk/gestures.c
index 8fcf6eb560..002f7520c8 100644
--- a/testsuite/gtk/gestures.c
+++ b/testsuite/gtk/gestures.c
@@ -403,7 +403,7 @@ test_phases (void)
   GString *str;
   GtkAllocation allocation;
 
-  A = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  A = gtk_window_new ();
   gtk_widget_set_name (A, "A");
   B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_set_name (B, "B");
@@ -455,7 +455,7 @@ test_mixed (void)
   GString *str;
   GtkAllocation allocation;
 
-  A = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  A = gtk_window_new ();
   gtk_widget_set_name (A, "A");
   B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_set_name (B, "B");
@@ -514,7 +514,7 @@ test_early_exit (void)
   GString *str;
   GtkAllocation allocation;
 
-  A = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  A = gtk_window_new ();
   gtk_widget_set_name (A, "A");
   B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_set_name (B, "B");
@@ -569,7 +569,7 @@ test_claim_capture (void)
   GString *str;
   GtkAllocation allocation;
 
-  A = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  A = gtk_window_new ();
   gtk_widget_set_name (A, "A");
   B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_set_name (B, "B");
@@ -616,7 +616,7 @@ test_claim_target (void)
   GString *str;
   GtkAllocation allocation;
 
-  A = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  A = gtk_window_new ();
   gtk_widget_set_name (A, "A");
   B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_set_name (B, "B");
@@ -663,7 +663,7 @@ test_claim_bubble (void)
   GString *str;
   GtkAllocation allocation;
 
-  A = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  A = gtk_window_new ();
   gtk_widget_set_name (A, "A");
   B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_set_name (B, "B");
@@ -717,7 +717,7 @@ test_early_claim_capture (void)
   GString *str;
   GtkAllocation allocation;
 
-  A = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  A = gtk_window_new ();
   gtk_widget_set_name (A, "A");
   B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_set_name (B, "B");
@@ -774,7 +774,7 @@ test_late_claim_capture (void)
   GString *str;
   GtkAllocation allocation;
 
-  A = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  A = gtk_window_new ();
   gtk_widget_set_name (A, "A");
   B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_set_name (B, "B");
@@ -833,7 +833,7 @@ test_group (void)
   GtkGesture *g1, *g2;
   GtkAllocation allocation;
 
-  A = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  A = gtk_window_new ();
   gtk_widget_set_name (A, "A");
   B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_set_name (B, "B");
@@ -886,7 +886,7 @@ test_gestures_outside_grab (void)
   GString *str;
   GtkAllocation allocation;
 
-  A = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  A = gtk_window_new ();
   gtk_widget_set_name (A, "A");
   B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_set_name (B, "B");
@@ -900,7 +900,7 @@ test_gestures_outside_grab (void)
 
   gtk_widget_show (A);
 
-  D = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  D = gtk_window_new ();
   gtk_widget_show (D);
 
   str = g_string_new ("");
@@ -946,7 +946,7 @@ test_gestures_inside_grab (void)
   GString *str;
   GtkAllocation allocation;
 
-  A = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  A = gtk_window_new ();
   gtk_widget_set_name (A, "A");
   B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_set_name (B, "B");
@@ -1007,7 +1007,7 @@ test_multitouch_on_single (void)
   GString *str;
   GtkAllocation allocation;
 
-  A = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  A = gtk_window_new ();
   gtk_widget_set_name (A, "A");
   B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_set_name (B, "B");
@@ -1059,7 +1059,7 @@ test_multitouch_activation (void)
   GString *str;
   GtkAllocation allocation;
 
-  A = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  A = gtk_window_new ();
   gtk_widget_set_name (A, "A");
   B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_set_name (B, "B");
@@ -1137,7 +1137,7 @@ test_multitouch_interaction (void)
   GString *str;
   GtkAllocation allocation;
 
-  A = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  A = gtk_window_new ();
   gtk_widget_set_name (A, "A");
   B = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_set_name (B, "B");
diff --git a/testsuite/gtk/grid-layout.c b/testsuite/gtk/grid-layout.c
index 5c4378a873..17e1e6bf4e 100644
--- a/testsuite/gtk/grid-layout.c
+++ b/testsuite/gtk/grid-layout.c
@@ -112,7 +112,7 @@ test_simple_row (void)
   GtkLayoutChild *lc;
   int minimum, natural;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   parent = g_object_new (GTK_TYPE_GIZMO, NULL);
   gtk_container_add (GTK_CONTAINER (window), parent);
 
@@ -212,7 +212,7 @@ test_simple_column (void)
   GtkLayoutChild *lc;
   int minimum, natural;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   parent = g_object_new (GTK_TYPE_GIZMO, NULL);
   gtk_container_add (GTK_CONTAINER (window), parent);
 
@@ -323,7 +323,7 @@ test_spans (void)
   GtkLayoutChild *lc;
   int minimum, natural;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   parent = g_object_new (GTK_TYPE_GIZMO, NULL);
   gtk_container_add (GTK_CONTAINER (window), parent);
 
@@ -446,7 +446,7 @@ test_homogeneous (void)
   GtkLayoutChild *lc;
   int minimum, natural;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   parent = g_object_new (GTK_TYPE_GIZMO, NULL);
   gtk_container_add (GTK_CONTAINER (window), parent);
 
@@ -578,7 +578,7 @@ test_simple_layout (void)
   GtkGizmo *child3;
   int minimum, natural;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   parent = g_object_new (GTK_TYPE_GIZMO, NULL);
   gtk_container_add (GTK_CONTAINER (window), parent);
 
diff --git a/testsuite/gtk/popover.c b/testsuite/gtk/popover.c
index acd14e062e..66f6f6d201 100644
--- a/testsuite/gtk/popover.c
+++ b/testsuite/gtk/popover.c
@@ -36,7 +36,7 @@ test_show_popover (void)
   GtkWidget *button;
   GtkWidget *popover;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   button = gtk_menu_button_new ();
   popover = gtk_popover_new (NULL);
   gtk_container_add (GTK_CONTAINER (popover), gtk_label_new ("Nu?"));
diff --git a/testsuite/gtk/propertylookuplistmodel.c b/testsuite/gtk/propertylookuplistmodel.c
index 21fa26445d..4e8092e06f 100644
--- a/testsuite/gtk/propertylookuplistmodel.c
+++ b/testsuite/gtk/propertylookuplistmodel.c
@@ -108,7 +108,7 @@ create_widget_tree (void)
 {
   GtkWidget *window, *box, *grid, *label;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   widgets = g_slist_prepend (widgets, window);
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
diff --git a/testsuite/gtk/regression-tests.c b/testsuite/gtk/regression-tests.c
index e44eaa65a0..6b64e863da 100644
--- a/testsuite/gtk/regression-tests.c
+++ b/testsuite/gtk/regression-tests.c
@@ -24,7 +24,7 @@ test_9d6da33ff5c5e41e3521e1afd63d2d67bc915753 (void)
 {
   GtkWidget *window, *label;
 
-  window = gtk_window_new (GTK_WINDOW_POPUP);
+  window = gtk_window_new ();
   label = gtk_label_new ("I am sensitive.");
   gtk_container_add (GTK_CONTAINER (window), label);
 
@@ -43,7 +43,7 @@ test_94f00eb04dd1433cf1cc9a3341f485124e38abd1 (void)
 {
   GtkWidget *window, *label;
 
-  window = gtk_window_new (GTK_WINDOW_POPUP);
+  window = gtk_window_new ();
   label = gtk_label_new ("I am insensitive.");
   gtk_container_add (GTK_CONTAINER (window), label);
 
diff --git a/testsuite/gtk/treeview.c b/testsuite/gtk/treeview.c
index 13dc43785a..016f1a8357 100644
--- a/testsuite/gtk/treeview.c
+++ b/testsuite/gtk/treeview.c
@@ -193,7 +193,7 @@ test_row_separator_height (void)
   gtk_list_store_insert_with_values (store, &iter, 4, 0, "Row content", -1);
 
   /*window = gtk_invisible_new ();*/
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
 
   tree_view = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
   gtk_tree_view_set_row_separator_func (GTK_TREE_VIEW (tree_view),
diff --git a/testsuite/gtk/window.c b/testsuite/gtk/window.c
index bd3a8038bb..dab10c6190 100644
--- a/testsuite/gtk/window.c
+++ b/testsuite/gtk/window.c
@@ -54,7 +54,7 @@ test_default_size (void)
   GtkWidget *da;
   gint w, h;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   if (interactive)
     {
       GtkEventController *controller = gtk_event_controller_key_new ();
@@ -135,7 +135,7 @@ test_resize (void)
   GtkWidget *da;
   gint w, h;
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
   if (interactive)
     {
       GtkEventController *controller = gtk_event_controller_key_new ();
@@ -186,32 +186,6 @@ test_resize (void)
   gtk_widget_destroy (window);
 }
 
-static void
-test_resize_popup (void)
-{
-  GtkWidget *window;
-  gint w, h;
-
-  /* testcase for the dnd window */
-  window = gtk_window_new (GTK_WINDOW_POPUP);
-  gtk_window_set_display (GTK_WINDOW (window), gdk_display_get_default ());
-  gtk_window_resize (GTK_WINDOW (window), 1, 1);
-  gtk_window_get_size (GTK_WINDOW (window), &w, &h);
-  g_assert_cmpint (w, ==, 1);
-  g_assert_cmpint (h, ==, 1);
-
-  gtk_widget_show (window);
-
-  g_timeout_add (200, stop_main, NULL);
-  gtk_main ();
-
-  gtk_window_get_size (GTK_WINDOW (window), &w, &h);
-  g_assert_cmpint (w, ==, 1);
-  g_assert_cmpint (h, ==, 1);
-
-  gtk_widget_destroy (window);
-}
-
 static void
 test_show_hide (void)
 {
@@ -222,7 +196,7 @@ test_show_hide (void)
 
   /* test that hide/show does not affect the size */
 
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
+  window = gtk_window_new ();
 
   gtk_widget_show (window);
 
@@ -267,7 +241,6 @@ main (int argc, char *argv[])
 
   g_test_add_func ("/window/default-size", test_default_size);
   g_test_add_func ("/window/resize", test_resize);
-  g_test_add_func ("/window/resize-popup", test_resize_popup);
   g_test_add_func ("/window/show-hide", test_show_hide);
 
   return g_test_run ();


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