diff --git a/tests/Makefile.in b/tests/Makefile.in
index a267e6d5b1..9f9506631b 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -216,6 +216,7 @@ TEST_GUI_OBJECTS =  \
 	test_gui_socket.o \
 	test_gui_boxsizer.o \
 	test_gui_wrapsizer.o \
+	test_gui_toplevel.o \
 	test_gui_valnum.o \
 	test_gui_clientsize.o \
 	test_gui_setsize.o \
@@ -880,6 +881,9 @@ test_gui_boxsizer.o: $(srcdir)/sizers/boxsizer.cpp $(TEST_GUI_ODEP)
 test_gui_wrapsizer.o: $(srcdir)/sizers/wrapsizer.cpp $(TEST_GUI_ODEP)
 	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/sizers/wrapsizer.cpp
 
+test_gui_toplevel.o: $(srcdir)/toplevel/toplevel.cpp $(TEST_GUI_ODEP)
+	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/toplevel/toplevel.cpp
+
 test_gui_valnum.o: $(srcdir)/validators/valnum.cpp $(TEST_GUI_ODEP)
 	$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/validators/valnum.cpp
 
diff --git a/tests/makefile.bcc b/tests/makefile.bcc
index 379b9f5315..da4658bfb1 100644
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -140,7 +140,7 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_colour.obj \
 	$(OBJS)\test_gui_ellipsization.obj \
 	$(OBJS)\test_gui_measuring.obj \
-	$(OBJS)\test_gui_affinematrix.obj \
+	$(OBJS)\test_gui_affinematrix.obj \
 	$(OBJS)\test_gui_config.obj \
 	$(OBJS)\test_gui_bitmapcomboboxtest.obj \
 	$(OBJS)\test_gui_bitmaptogglebuttontest.obj \
@@ -164,7 +164,7 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_listboxtest.obj \
 	$(OBJS)\test_gui_listctrltest.obj \
 	$(OBJS)\test_gui_listviewtest.obj \
-	$(OBJS)\test_gui_markuptest.obj \
+	$(OBJS)\test_gui_markuptest.obj \
 	$(OBJS)\test_gui_notebooktest.obj \
 	$(OBJS)\test_gui_ownerdrawncomboboxtest.obj \
 	$(OBJS)\test_gui_pickerbasetest.obj \
@@ -197,13 +197,14 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_guifuncs.obj \
 	$(OBJS)\test_gui_selstoretest.obj \
 	$(OBJS)\test_gui_garbage.obj \
-	$(OBJS)\test_gui_settings.obj \
-	$(OBJS)\test_gui_socket.obj \
-	$(OBJS)\test_gui_boxsizer.obj \
-	$(OBJS)\test_gui_wrapsizer.obj \
-	$(OBJS)\test_gui_valnum.obj \
-	$(OBJS)\test_gui_clientsize.obj \
-	$(OBJS)\test_gui_setsize.obj \
+	$(OBJS)\test_gui_settings.obj \
+	$(OBJS)\test_gui_socket.obj \
+	$(OBJS)\test_gui_boxsizer.obj \
+	$(OBJS)\test_gui_wrapsizer.obj \
+	$(OBJS)\test_gui_toplevel.obj \
+	$(OBJS)\test_gui_valnum.obj \
+	$(OBJS)\test_gui_clientsize.obj \
+	$(OBJS)\test_gui_setsize.obj \
 	$(OBJS)\test_gui_xrctest.obj
 
 ### Conditionally set variables: ###
@@ -745,9 +746,9 @@ $(OBJS)\test_gui_ellipsization.obj: .\graphics\ellipsization.cpp
 $(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\measuring.cpp
 
-$(OBJS)\test_gui_affinematrix.obj: .\graphics\affinematrix.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\affinematrix.cpp
-
+$(OBJS)\test_gui_affinematrix.obj: .\graphics\affinematrix.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\affinematrix.cpp
+
 $(OBJS)\test_gui_config.obj: .\config\config.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp
 
@@ -817,9 +818,9 @@ $(OBJS)\test_gui_listctrltest.obj: .\controls\listctrltest.cpp
 $(OBJS)\test_gui_listviewtest.obj: .\controls\listviewtest.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listviewtest.cpp
 
-$(OBJS)\test_gui_markuptest.obj: .\controls\markuptest.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\markuptest.cpp
-
+$(OBJS)\test_gui_markuptest.obj: .\controls\markuptest.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\markuptest.cpp
+
 $(OBJS)\test_gui_notebooktest.obj: .\controls\notebooktest.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\notebooktest.cpp
 
@@ -922,15 +923,18 @@ $(OBJS)\test_gui_settings.obj: .\misc\settings.cpp
 $(OBJS)\test_gui_socket.obj: .\net\socket.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\net\socket.cpp
 
-$(OBJS)\test_gui_boxsizer.obj: .\sizers\boxsizer.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp
-
-$(OBJS)\test_gui_wrapsizer.obj: .\sizers\wrapsizer.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\sizers\wrapsizer.cpp
-
-$(OBJS)\test_gui_valnum.obj: .\validators\valnum.cpp
-	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\validators\valnum.cpp
-
+$(OBJS)\test_gui_boxsizer.obj: .\sizers\boxsizer.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp
+
+$(OBJS)\test_gui_wrapsizer.obj: .\sizers\wrapsizer.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\sizers\wrapsizer.cpp
+
+$(OBJS)\test_gui_toplevel.obj: .\toplevel\toplevel.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\toplevel\toplevel.cpp
+
+$(OBJS)\test_gui_valnum.obj: .\validators\valnum.cpp
+	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\validators\valnum.cpp
+
 $(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp
 	$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp
 
diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 618098b690..05aa99bef4 100644
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -133,7 +133,7 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_colour.o \
 	$(OBJS)\test_gui_ellipsization.o \
 	$(OBJS)\test_gui_measuring.o \
-	$(OBJS)\test_gui_affinematrix.o \
+	$(OBJS)\test_gui_affinematrix.o \
 	$(OBJS)\test_gui_config.o \
 	$(OBJS)\test_gui_bitmapcomboboxtest.o \
 	$(OBJS)\test_gui_bitmaptogglebuttontest.o \
@@ -157,7 +157,7 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_listboxtest.o \
 	$(OBJS)\test_gui_listctrltest.o \
 	$(OBJS)\test_gui_listviewtest.o \
-	$(OBJS)\test_gui_markuptest.o \
+	$(OBJS)\test_gui_markuptest.o \
 	$(OBJS)\test_gui_notebooktest.o \
 	$(OBJS)\test_gui_ownerdrawncomboboxtest.o \
 	$(OBJS)\test_gui_pickerbasetest.o \
@@ -190,13 +190,14 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_guifuncs.o \
 	$(OBJS)\test_gui_selstoretest.o \
 	$(OBJS)\test_gui_garbage.o \
-	$(OBJS)\test_gui_settings.o \
-	$(OBJS)\test_gui_socket.o \
-	$(OBJS)\test_gui_boxsizer.o \
-	$(OBJS)\test_gui_wrapsizer.o \
-	$(OBJS)\test_gui_valnum.o \
-	$(OBJS)\test_gui_clientsize.o \
-	$(OBJS)\test_gui_setsize.o \
+	$(OBJS)\test_gui_settings.o \
+	$(OBJS)\test_gui_socket.o \
+	$(OBJS)\test_gui_boxsizer.o \
+	$(OBJS)\test_gui_wrapsizer.o \
+	$(OBJS)\test_gui_toplevel.o \
+	$(OBJS)\test_gui_valnum.o \
+	$(OBJS)\test_gui_clientsize.o \
+	$(OBJS)\test_gui_setsize.o \
 	$(OBJS)\test_gui_xrctest.o
 
 ### Conditionally set variables: ###
@@ -726,9 +727,9 @@ $(OBJS)\test_gui_ellipsization.o: ./graphics/ellipsization.cpp
 $(OBJS)\test_gui_measuring.o: ./graphics/measuring.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\test_gui_affinematrix.o: ./graphics/affinematrix.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\test_gui_affinematrix.o: ./graphics/affinematrix.cpp
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_gui_config.o: ./config/config.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
@@ -798,9 +799,9 @@ $(OBJS)\test_gui_listctrltest.o: ./controls/listctrltest.cpp
 $(OBJS)\test_gui_listviewtest.o: ./controls/listviewtest.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\test_gui_markuptest.o: ./controls/markuptest.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\test_gui_markuptest.o: ./controls/markuptest.cpp
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_gui_notebooktest.o: ./controls/notebooktest.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
@@ -903,15 +904,18 @@ $(OBJS)\test_gui_settings.o: ./misc/settings.cpp
 $(OBJS)\test_gui_socket.o: ./net/socket.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
-$(OBJS)\test_gui_boxsizer.o: ./sizers/boxsizer.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_wrapsizer.o: ./sizers/wrapsizer.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
-$(OBJS)\test_gui_valnum.o: ./validators/valnum.cpp
-	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\test_gui_boxsizer.o: ./sizers/boxsizer.cpp
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_wrapsizer.o: ./sizers/wrapsizer.cpp
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_toplevel.o: ./toplevel/toplevel.cpp
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
+$(OBJS)\test_gui_valnum.o: ./validators/valnum.cpp
+	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
+
 $(OBJS)\test_gui_clientsize.o: ./window/clientsize.cpp
 	$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
 
diff --git a/tests/makefile.vc b/tests/makefile.vc
index 4edaa5a816..0de79873de 100644
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -135,7 +135,7 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_colour.obj \
 	$(OBJS)\test_gui_ellipsization.obj \
 	$(OBJS)\test_gui_measuring.obj \
-	$(OBJS)\test_gui_affinematrix.obj \
+	$(OBJS)\test_gui_affinematrix.obj \
 	$(OBJS)\test_gui_config.obj \
 	$(OBJS)\test_gui_bitmapcomboboxtest.obj \
 	$(OBJS)\test_gui_bitmaptogglebuttontest.obj \
@@ -159,7 +159,7 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_listboxtest.obj \
 	$(OBJS)\test_gui_listctrltest.obj \
 	$(OBJS)\test_gui_listviewtest.obj \
-	$(OBJS)\test_gui_markuptest.obj \
+	$(OBJS)\test_gui_markuptest.obj \
 	$(OBJS)\test_gui_notebooktest.obj \
 	$(OBJS)\test_gui_ownerdrawncomboboxtest.obj \
 	$(OBJS)\test_gui_pickerbasetest.obj \
@@ -192,13 +192,14 @@ TEST_GUI_OBJECTS =  \
 	$(OBJS)\test_gui_guifuncs.obj \
 	$(OBJS)\test_gui_selstoretest.obj \
 	$(OBJS)\test_gui_garbage.obj \
-	$(OBJS)\test_gui_settings.obj \
-	$(OBJS)\test_gui_socket.obj \
-	$(OBJS)\test_gui_boxsizer.obj \
-	$(OBJS)\test_gui_wrapsizer.obj \
-	$(OBJS)\test_gui_valnum.obj \
-	$(OBJS)\test_gui_clientsize.obj \
-	$(OBJS)\test_gui_setsize.obj \
+	$(OBJS)\test_gui_settings.obj \
+	$(OBJS)\test_gui_socket.obj \
+	$(OBJS)\test_gui_boxsizer.obj \
+	$(OBJS)\test_gui_wrapsizer.obj \
+	$(OBJS)\test_gui_toplevel.obj \
+	$(OBJS)\test_gui_valnum.obj \
+	$(OBJS)\test_gui_clientsize.obj \
+	$(OBJS)\test_gui_setsize.obj \
 	$(OBJS)\test_gui_xrctest.obj
 TEST_GUI_RESOURCES =  \
 	$(OBJS)\test_gui_sample.res
@@ -871,9 +872,9 @@ $(OBJS)\test_gui_ellipsization.obj: .\graphics\ellipsization.cpp
 $(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\measuring.cpp
 
-$(OBJS)\test_gui_affinematrix.obj: .\graphics\affinematrix.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\affinematrix.cpp
-
+$(OBJS)\test_gui_affinematrix.obj: .\graphics\affinematrix.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\affinematrix.cpp
+
 $(OBJS)\test_gui_config.obj: .\config\config.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp
 
@@ -943,9 +944,9 @@ $(OBJS)\test_gui_listctrltest.obj: .\controls\listctrltest.cpp
 $(OBJS)\test_gui_listviewtest.obj: .\controls\listviewtest.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listviewtest.cpp
 
-$(OBJS)\test_gui_markuptest.obj: .\controls\markuptest.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\markuptest.cpp
-
+$(OBJS)\test_gui_markuptest.obj: .\controls\markuptest.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\markuptest.cpp
+
 $(OBJS)\test_gui_notebooktest.obj: .\controls\notebooktest.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\notebooktest.cpp
 
@@ -1048,15 +1049,18 @@ $(OBJS)\test_gui_settings.obj: .\misc\settings.cpp
 $(OBJS)\test_gui_socket.obj: .\net\socket.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\net\socket.cpp
 
-$(OBJS)\test_gui_boxsizer.obj: .\sizers\boxsizer.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp
-
-$(OBJS)\test_gui_wrapsizer.obj: .\sizers\wrapsizer.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\sizers\wrapsizer.cpp
-
-$(OBJS)\test_gui_valnum.obj: .\validators\valnum.cpp
-	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\validators\valnum.cpp
-
+$(OBJS)\test_gui_boxsizer.obj: .\sizers\boxsizer.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp
+
+$(OBJS)\test_gui_wrapsizer.obj: .\sizers\wrapsizer.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\sizers\wrapsizer.cpp
+
+$(OBJS)\test_gui_toplevel.obj: .\toplevel\toplevel.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\toplevel\toplevel.cpp
+
+$(OBJS)\test_gui_valnum.obj: .\validators\valnum.cpp
+	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\validators\valnum.cpp
+
 $(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp
 	$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp
 
diff --git a/tests/makefile.wat b/tests/makefile.wat
index 0ae1d53914..f89e93c51d 100644
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -379,7 +379,7 @@ TEST_GUI_OBJECTS =  &
 	$(OBJS)\test_gui_colour.obj &
 	$(OBJS)\test_gui_ellipsization.obj &
 	$(OBJS)\test_gui_measuring.obj &
-	$(OBJS)\test_gui_affinematrix.obj &
+	$(OBJS)\test_gui_affinematrix.obj &
 	$(OBJS)\test_gui_config.obj &
 	$(OBJS)\test_gui_bitmapcomboboxtest.obj &
 	$(OBJS)\test_gui_bitmaptogglebuttontest.obj &
@@ -403,7 +403,7 @@ TEST_GUI_OBJECTS =  &
 	$(OBJS)\test_gui_listboxtest.obj &
 	$(OBJS)\test_gui_listctrltest.obj &
 	$(OBJS)\test_gui_listviewtest.obj &
-	$(OBJS)\test_gui_markuptest.obj &
+	$(OBJS)\test_gui_markuptest.obj &
 	$(OBJS)\test_gui_notebooktest.obj &
 	$(OBJS)\test_gui_ownerdrawncomboboxtest.obj &
 	$(OBJS)\test_gui_pickerbasetest.obj &
@@ -436,13 +436,14 @@ TEST_GUI_OBJECTS =  &
 	$(OBJS)\test_gui_guifuncs.obj &
 	$(OBJS)\test_gui_selstoretest.obj &
 	$(OBJS)\test_gui_garbage.obj &
-	$(OBJS)\test_gui_settings.obj &
-	$(OBJS)\test_gui_socket.obj &
-	$(OBJS)\test_gui_boxsizer.obj &
-	$(OBJS)\test_gui_wrapsizer.obj &
-	$(OBJS)\test_gui_valnum.obj &
-	$(OBJS)\test_gui_clientsize.obj &
-	$(OBJS)\test_gui_setsize.obj &
+	$(OBJS)\test_gui_settings.obj &
+	$(OBJS)\test_gui_socket.obj &
+	$(OBJS)\test_gui_boxsizer.obj &
+	$(OBJS)\test_gui_wrapsizer.obj &
+	$(OBJS)\test_gui_toplevel.obj &
+	$(OBJS)\test_gui_valnum.obj &
+	$(OBJS)\test_gui_clientsize.obj &
+	$(OBJS)\test_gui_setsize.obj &
 	$(OBJS)\test_gui_xrctest.obj
 
 
@@ -785,9 +786,9 @@ $(OBJS)\test_gui_ellipsization.obj :  .AUTODEPEND .\graphics\ellipsization.cpp
 $(OBJS)\test_gui_measuring.obj :  .AUTODEPEND .\graphics\measuring.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 
-$(OBJS)\test_gui_affinematrix.obj :  .AUTODEPEND .\graphics\affinematrix.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+$(OBJS)\test_gui_affinematrix.obj :  .AUTODEPEND .\graphics\affinematrix.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
 $(OBJS)\test_gui_config.obj :  .AUTODEPEND .\config\config.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 
@@ -857,9 +858,9 @@ $(OBJS)\test_gui_listctrltest.obj :  .AUTODEPEND .\controls\listctrltest.cpp
 $(OBJS)\test_gui_listviewtest.obj :  .AUTODEPEND .\controls\listviewtest.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 
-$(OBJS)\test_gui_markuptest.obj :  .AUTODEPEND .\controls\markuptest.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+$(OBJS)\test_gui_markuptest.obj :  .AUTODEPEND .\controls\markuptest.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
 $(OBJS)\test_gui_notebooktest.obj :  .AUTODEPEND .\controls\notebooktest.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 
@@ -962,15 +963,18 @@ $(OBJS)\test_gui_settings.obj :  .AUTODEPEND .\misc\settings.cpp
 $(OBJS)\test_gui_socket.obj :  .AUTODEPEND .\net\socket.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 
-$(OBJS)\test_gui_boxsizer.obj :  .AUTODEPEND .\sizers\boxsizer.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_wrapsizer.obj :  .AUTODEPEND .\sizers\wrapsizer.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
-$(OBJS)\test_gui_valnum.obj :  .AUTODEPEND .\validators\valnum.cpp
-	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
-
+$(OBJS)\test_gui_boxsizer.obj :  .AUTODEPEND .\sizers\boxsizer.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
+$(OBJS)\test_gui_wrapsizer.obj :  .AUTODEPEND .\sizers\wrapsizer.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
+$(OBJS)\test_gui_toplevel.obj :  .AUTODEPEND .\toplevel\toplevel.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
+$(OBJS)\test_gui_valnum.obj :  .AUTODEPEND .\validators\valnum.cpp
+	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
+
 $(OBJS)\test_gui_clientsize.obj :  .AUTODEPEND .\window\clientsize.cpp
 	$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
 
diff --git a/tests/test.bkl b/tests/test.bkl
index 404e15b80a..4087a16b67 100644
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -202,6 +202,7 @@
             net/socket.cpp
             sizers/boxsizer.cpp
             sizers/wrapsizer.cpp
+            toplevel/toplevel.cpp
             validators/valnum.cpp
             window/clientsize.cpp
             window/setsize.cpp
diff --git a/tests/test_test_gui.dsp b/tests/test_test_gui.dsp
index f412c8d6a8..9fd20781c2 100644
--- a/tests/test_test_gui.dsp
+++ b/tests/test_test_gui.dsp
@@ -239,10 +239,10 @@ SOURCE=.\menu\accelentry.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\graphics\affinematrix.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=.\graphics\affinematrix.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\asserthelper.cpp
 # End Source File
 # Begin Source File
@@ -397,10 +397,10 @@ SOURCE=.\controls\listviewtest.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\controls\markuptest.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=.\controls\markuptest.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\graphics\measuring.cpp
 # End Source File
 # Begin Source File
@@ -517,6 +517,10 @@ SOURCE=.\controls\toolbooktest.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=.\toplevel\toplevel.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\controls\treebooktest.cpp
 # End Source File
 # Begin Source File
@@ -537,10 +541,10 @@ SOURCE=.\controls\windowtest.cpp
 # End Source File
 # Begin Source File
 
-SOURCE=.\sizers\wrapsizer.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=.\sizers\wrapsizer.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=.\xml\xrctest.cpp
 # End Source File
 # End Group
diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj
index 77ba872270..861d041cec 100644
--- a/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@ -569,9 +569,9 @@
 				RelativePath=".\menu\accelentry.cpp">
 			</File>
 			<File
-				RelativePath=".\graphics\affinematrix.cpp">
-			</File>
-			<File
+				RelativePath=".\graphics\affinematrix.cpp">
+			</File>
+			<File
 				RelativePath=".\asserthelper.cpp">
 			</File>
 			<File
@@ -734,9 +734,9 @@
 				RelativePath=".\controls\listviewtest.cpp">
 			</File>
 			<File
-				RelativePath=".\controls\markuptest.cpp">
-			</File>
-			<File
+				RelativePath=".\controls\markuptest.cpp">
+			</File>
+			<File
 				RelativePath=".\graphics\measuring.cpp">
 			</File>
 			<File
@@ -820,6 +820,9 @@
 			<File
 				RelativePath=".\controls\toolbooktest.cpp">
 			</File>
+			<File
+				RelativePath=".\toplevel\toplevel.cpp">
+			</File>
 			<File
 				RelativePath=".\controls\treebooktest.cpp">
 			</File>
@@ -836,9 +839,9 @@
 				RelativePath=".\controls\windowtest.cpp">
 			</File>
 			<File
-				RelativePath=".\sizers\wrapsizer.cpp">
-			</File>
-			<File
+				RelativePath=".\sizers\wrapsizer.cpp">
+			</File>
+			<File
 				RelativePath=".\xml\xrctest.cpp">
 			</File>
 		</Filter>
diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj
index 3bc2ce80f3..8bfa56f191 100644
--- a/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@ -832,10 +832,10 @@
 				>
 			</File>
 			<File
-				RelativePath=".\graphics\affinematrix.cpp"
-				>
-			</File>
-			<File
+				RelativePath=".\graphics\affinematrix.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\asserthelper.cpp"
 				>
 			</File>
@@ -1052,10 +1052,10 @@
 				>
 			</File>
 			<File
-				RelativePath=".\controls\markuptest.cpp"
-				>
-			</File>
-			<File
+				RelativePath=".\controls\markuptest.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\graphics\measuring.cpp"
 				>
 			</File>
@@ -1167,6 +1167,10 @@
 				RelativePath=".\controls\toolbooktest.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\toplevel\toplevel.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\controls\treebooktest.cpp"
 				>
@@ -1188,10 +1192,10 @@
 				>
 			</File>
 			<File
-				RelativePath=".\sizers\wrapsizer.cpp"
-				>
-			</File>
-			<File
+				RelativePath=".\sizers\wrapsizer.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\xml\xrctest.cpp"
 				>
 			</File>
diff --git a/tests/test_vc9_test_gui.vcproj b/tests/test_vc9_test_gui.vcproj
index d312302f26..76f0924655 100644
--- a/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@ -804,10 +804,10 @@
 				>
 			</File>
 			<File
-				RelativePath=".\graphics\affinematrix.cpp"
-				>
-			</File>
-			<File
+				RelativePath=".\graphics\affinematrix.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\asserthelper.cpp"
 				>
 			</File>
@@ -1024,10 +1024,10 @@
 				>
 			</File>
 			<File
-				RelativePath=".\controls\markuptest.cpp"
-				>
-			</File>
-			<File
+				RelativePath=".\controls\markuptest.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\graphics\measuring.cpp"
 				>
 			</File>
@@ -1139,6 +1139,10 @@
 				RelativePath=".\controls\toolbooktest.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\toplevel\toplevel.cpp"
+				>
+			</File>
 			<File
 				RelativePath=".\controls\treebooktest.cpp"
 				>
@@ -1160,10 +1164,10 @@
 				>
 			</File>
 			<File
-				RelativePath=".\sizers\wrapsizer.cpp"
-				>
-			</File>
-			<File
+				RelativePath=".\sizers\wrapsizer.cpp"
+				>
+			</File>
+			<File
 				RelativePath=".\xml\xrctest.cpp"
 				>
 			</File>
diff --git a/tests/toplevel/toplevel.cpp b/tests/toplevel/toplevel.cpp
index 27799fbd1b..0e5b42db0e 100644
--- a/tests/toplevel/toplevel.cpp
+++ b/tests/toplevel/toplevel.cpp
@@ -18,8 +18,10 @@
 #endif
 
 #ifndef WX_PRECOMP
-    #include "wx/app.h"
-    #include "wx/window.h"
+    #include "wx/dialog.h"
+    #include "wx/frame.h"
+    #include "wx/textctrl.h"
+    #include "wx/toplevel.h"
 #endif // WX_PRECOMP
 
 #include "wx/evtloop.h"
@@ -50,10 +52,10 @@ private:
 };
 
 // register in the unnamed registry so that these tests are run by default
-CPPUNIT_TEST_SUITE_REGISTRATION( TopLevelWindowTestCase );
+//CPPUNIT_TEST_SUITE_REGISTRATION( TopLevelWindowTestCase );
 
 // also include in its own registry so that these tests can be run alone
-CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TopLevelWindowTestCase, "TopLevelWindowTestCase" );
+CPPUNIT_TEST_SUITE_NAMED_REGISTRATION( TopLevelWindowTestCase, "fixme" );
 
 // ----------------------------------------------------------------------------
 // test initialization
@@ -93,7 +95,7 @@ void TopLevelWindowTestCase::TopLevelWindowShowTest(wxTopLevelWindow* tlw)
     textCtrl->SetFocus();
     
 // only run this test on platforms where ShowWithoutActivating is implemented.
-#ifdef __WXMSW__ || defined(__WXMAC__)
+#if defined(__WXMSW__) || defined(__WXMAC__)
     tlw->ShowWithoutActivating();
     CPPUNIT_ASSERT(tlw->IsShown());
     CPPUNIT_ASSERT(!tlw->IsActive());