Rebaked test GUI projects with toplevel.cpp included.

Added toplevel.cpp to GUI test projects and removed the test suite from the unnamed registry so that by default its tests don't run (some regarding ShowWithoutActivating are failing). This way at least the source file has more of a chance to be in a compilable state (compilation was broken). toplevel.cpp has never been included in a project since its addition in r62508 ("[...] until the mainloop issues are resolved [...]").

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67657 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/tests/Makefile.in b/tests/Makefile.in
index a267e6d5b17b2f449c91a6dfbea1c49db5955131..9f9506631b4b4c03012b5781d8962694771112ab 100644 (file)
--- 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 379b9f53151e2851251bc66b07c34e9fb65e8e40..da4658bfb1b18b007be30310a8d219afc0074888 100644 (file)
--- a/tests/makefile.bcc
+++ b/tests/makefile.bcc
@@ -140,7 +140,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_colour.obj \\r
        $(OBJS)\test_gui_ellipsization.obj \\r
        $(OBJS)\test_gui_measuring.obj \\r
-       $(OBJS)\test_gui_affinematrix.obj \
+       $(OBJS)\test_gui_affinematrix.obj \\r
        $(OBJS)\test_gui_config.obj \\r
        $(OBJS)\test_gui_bitmapcomboboxtest.obj \\r
        $(OBJS)\test_gui_bitmaptogglebuttontest.obj \\r
@@ -164,7 +164,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_listboxtest.obj \\r
        $(OBJS)\test_gui_listctrltest.obj \\r
        $(OBJS)\test_gui_listviewtest.obj \\r
-       $(OBJS)\test_gui_markuptest.obj \
+       $(OBJS)\test_gui_markuptest.obj \\r
        $(OBJS)\test_gui_notebooktest.obj \\r
        $(OBJS)\test_gui_ownerdrawncomboboxtest.obj \\r
        $(OBJS)\test_gui_pickerbasetest.obj \\r
@@ -197,13 +197,14 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_guifuncs.obj \\r
        $(OBJS)\test_gui_selstoretest.obj \\r
        $(OBJS)\test_gui_garbage.obj \\r
-       $(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 \\r
+       $(OBJS)\test_gui_socket.obj \\r
+       $(OBJS)\test_gui_boxsizer.obj \\r
+       $(OBJS)\test_gui_wrapsizer.obj \\r
+       $(OBJS)\test_gui_toplevel.obj \\r
+       $(OBJS)\test_gui_valnum.obj \\r
+       $(OBJS)\test_gui_clientsize.obj \\r
+       $(OBJS)\test_gui_setsize.obj \\r
        $(OBJS)\test_gui_xrctest.obj\r
 \r
 ### Conditionally set variables: ###\r
@@ -745,9 +746,9 @@ $(OBJS)\test_gui_ellipsization.obj: .\graphics\ellipsization.cpp
 $(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\measuring.cpp\r
 \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\graphics\affinematrix.cpp\r
+\r
 $(OBJS)\test_gui_config.obj: .\config\config.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp\r
 \r
@@ -817,9 +818,9 @@ $(OBJS)\test_gui_listctrltest.obj: .\controls\listctrltest.cpp
 $(OBJS)\test_gui_listviewtest.obj: .\controls\listviewtest.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\listviewtest.cpp\r
 \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\markuptest.cpp\r
+\r
 $(OBJS)\test_gui_notebooktest.obj: .\controls\notebooktest.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\controls\notebooktest.cpp\r
 \r
@@ -922,15 +923,18 @@ $(OBJS)\test_gui_settings.obj: .\misc\settings.cpp
 $(OBJS)\test_gui_socket.obj: .\net\socket.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\net\socket.cpp\r
 \r
-$(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\r
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp\r
+\r
+$(OBJS)\test_gui_wrapsizer.obj: .\sizers\wrapsizer.cpp\r
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\sizers\wrapsizer.cpp\r
+\r
+$(OBJS)\test_gui_toplevel.obj: .\toplevel\toplevel.cpp\r
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\toplevel\toplevel.cpp\r
+\r
+$(OBJS)\test_gui_valnum.obj: .\validators\valnum.cpp\r
+       $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\validators\valnum.cpp\r
+\r
 $(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp\r
        $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp\r
 \r

diff --git a/tests/makefile.gcc b/tests/makefile.gcc
index 618098b690ffb03c446e86a58ea835deb275e412..05aa99bef412a9a1b156d67c8ea0907d17972da4 100644 (file)
--- a/tests/makefile.gcc
+++ b/tests/makefile.gcc
@@ -133,7 +133,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_colour.o \\r
        $(OBJS)\test_gui_ellipsization.o \\r
        $(OBJS)\test_gui_measuring.o \\r
-       $(OBJS)\test_gui_affinematrix.o \
+       $(OBJS)\test_gui_affinematrix.o \\r
        $(OBJS)\test_gui_config.o \\r
        $(OBJS)\test_gui_bitmapcomboboxtest.o \\r
        $(OBJS)\test_gui_bitmaptogglebuttontest.o \\r
@@ -157,7 +157,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_listboxtest.o \\r
        $(OBJS)\test_gui_listctrltest.o \\r
        $(OBJS)\test_gui_listviewtest.o \\r
-       $(OBJS)\test_gui_markuptest.o \
+       $(OBJS)\test_gui_markuptest.o \\r
        $(OBJS)\test_gui_notebooktest.o \\r
        $(OBJS)\test_gui_ownerdrawncomboboxtest.o \\r
        $(OBJS)\test_gui_pickerbasetest.o \\r
@@ -190,13 +190,14 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_guifuncs.o \\r
        $(OBJS)\test_gui_selstoretest.o \\r
        $(OBJS)\test_gui_garbage.o \\r
-       $(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 \\r
+       $(OBJS)\test_gui_socket.o \\r
+       $(OBJS)\test_gui_boxsizer.o \\r
+       $(OBJS)\test_gui_wrapsizer.o \\r
+       $(OBJS)\test_gui_toplevel.o \\r
+       $(OBJS)\test_gui_valnum.o \\r
+       $(OBJS)\test_gui_clientsize.o \\r
+       $(OBJS)\test_gui_setsize.o \\r
        $(OBJS)\test_gui_xrctest.o\r
 \r
 ### Conditionally set variables: ###\r
@@ -726,9 +727,9 @@ $(OBJS)\test_gui_ellipsization.o: ./graphics/ellipsization.cpp
 $(OBJS)\test_gui_measuring.o: ./graphics/measuring.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r
-$(OBJS)\test_gui_affinematrix.o: ./graphics/affinematrix.cpp
-       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\test_gui_affinematrix.o: ./graphics/affinematrix.cpp\r
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\test_gui_config.o: ./config/config.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -798,9 +799,9 @@ $(OBJS)\test_gui_listctrltest.o: ./controls/listctrltest.cpp
 $(OBJS)\test_gui_listviewtest.o: ./controls/listviewtest.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r
-$(OBJS)\test_gui_markuptest.o: ./controls/markuptest.cpp
-       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
-
+$(OBJS)\test_gui_markuptest.o: ./controls/markuptest.cpp\r
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\test_gui_notebooktest.o: ./controls/notebooktest.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r
@@ -903,15 +904,18 @@ $(OBJS)\test_gui_settings.o: ./misc/settings.cpp
 $(OBJS)\test_gui_socket.o: ./net/socket.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r
-$(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\r
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\test_gui_wrapsizer.o: ./sizers/wrapsizer.cpp\r
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\test_gui_toplevel.o: ./toplevel/toplevel.cpp\r
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
+\r
+$(OBJS)\test_gui_valnum.o: ./validators/valnum.cpp\r
+       $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
+\r
 $(OBJS)\test_gui_clientsize.o: ./window/clientsize.cpp\r
        $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<\r
 \r

diff --git a/tests/makefile.vc b/tests/makefile.vc
index 4edaa5a8160be41ca952fa5226dd941d8bfbb0ec..0de79873de17aa674e9b05ae8402f4682f99e099 100644 (file)
--- a/tests/makefile.vc
+++ b/tests/makefile.vc
@@ -135,7 +135,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_colour.obj \\r
        $(OBJS)\test_gui_ellipsization.obj \\r
        $(OBJS)\test_gui_measuring.obj \\r
-       $(OBJS)\test_gui_affinematrix.obj \
+       $(OBJS)\test_gui_affinematrix.obj \\r
        $(OBJS)\test_gui_config.obj \\r
        $(OBJS)\test_gui_bitmapcomboboxtest.obj \\r
        $(OBJS)\test_gui_bitmaptogglebuttontest.obj \\r
@@ -159,7 +159,7 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_listboxtest.obj \\r
        $(OBJS)\test_gui_listctrltest.obj \\r
        $(OBJS)\test_gui_listviewtest.obj \\r
-       $(OBJS)\test_gui_markuptest.obj \
+       $(OBJS)\test_gui_markuptest.obj \\r
        $(OBJS)\test_gui_notebooktest.obj \\r
        $(OBJS)\test_gui_ownerdrawncomboboxtest.obj \\r
        $(OBJS)\test_gui_pickerbasetest.obj \\r
@@ -192,13 +192,14 @@ TEST_GUI_OBJECTS =  \
        $(OBJS)\test_gui_guifuncs.obj \\r
        $(OBJS)\test_gui_selstoretest.obj \\r
        $(OBJS)\test_gui_garbage.obj \\r
-       $(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 \\r
+       $(OBJS)\test_gui_socket.obj \\r
+       $(OBJS)\test_gui_boxsizer.obj \\r
+       $(OBJS)\test_gui_wrapsizer.obj \\r
+       $(OBJS)\test_gui_toplevel.obj \\r
+       $(OBJS)\test_gui_valnum.obj \\r
+       $(OBJS)\test_gui_clientsize.obj \\r
+       $(OBJS)\test_gui_setsize.obj \\r
        $(OBJS)\test_gui_xrctest.obj\r
 TEST_GUI_RESOURCES =  \\r
        $(OBJS)\test_gui_sample.res\r
@@ -871,9 +872,9 @@ $(OBJS)\test_gui_ellipsization.obj: .\graphics\ellipsization.cpp
 $(OBJS)\test_gui_measuring.obj: .\graphics\measuring.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\measuring.cpp\r
 \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\graphics\affinematrix.cpp\r
+\r
 $(OBJS)\test_gui_config.obj: .\config\config.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\config\config.cpp\r
 \r
@@ -943,9 +944,9 @@ $(OBJS)\test_gui_listctrltest.obj: .\controls\listctrltest.cpp
 $(OBJS)\test_gui_listviewtest.obj: .\controls\listviewtest.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\listviewtest.cpp\r
 \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\markuptest.cpp\r
+\r
 $(OBJS)\test_gui_notebooktest.obj: .\controls\notebooktest.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\controls\notebooktest.cpp\r
 \r
@@ -1048,15 +1049,18 @@ $(OBJS)\test_gui_settings.obj: .\misc\settings.cpp
 $(OBJS)\test_gui_socket.obj: .\net\socket.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\net\socket.cpp\r
 \r
-$(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\r
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\sizers\boxsizer.cpp\r
+\r
+$(OBJS)\test_gui_wrapsizer.obj: .\sizers\wrapsizer.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\sizers\wrapsizer.cpp\r
+\r
+$(OBJS)\test_gui_toplevel.obj: .\toplevel\toplevel.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\toplevel\toplevel.cpp\r
+\r
+$(OBJS)\test_gui_valnum.obj: .\validators\valnum.cpp\r
+       $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\validators\valnum.cpp\r
+\r
 $(OBJS)\test_gui_clientsize.obj: .\window\clientsize.cpp\r
        $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\window\clientsize.cpp\r
 \r

diff --git a/tests/makefile.wat b/tests/makefile.wat
index 0ae1d53914a3b71846ef84dcd6c48e56d73c1113..f89e93c51d4cae8b2d6ce76109121fbd101ed078 100644 (file)
--- a/tests/makefile.wat
+++ b/tests/makefile.wat
@@ -379,7 +379,7 @@ TEST_GUI_OBJECTS =  &
        $(OBJS)\test_gui_colour.obj &\r
        $(OBJS)\test_gui_ellipsization.obj &\r
        $(OBJS)\test_gui_measuring.obj &\r
-       $(OBJS)\test_gui_affinematrix.obj &
+       $(OBJS)\test_gui_affinematrix.obj &\r
        $(OBJS)\test_gui_config.obj &\r
        $(OBJS)\test_gui_bitmapcomboboxtest.obj &\r
        $(OBJS)\test_gui_bitmaptogglebuttontest.obj &\r
@@ -403,7 +403,7 @@ TEST_GUI_OBJECTS =  &
        $(OBJS)\test_gui_listboxtest.obj &\r
        $(OBJS)\test_gui_listctrltest.obj &\r
        $(OBJS)\test_gui_listviewtest.obj &\r
-       $(OBJS)\test_gui_markuptest.obj &
+       $(OBJS)\test_gui_markuptest.obj &\r
        $(OBJS)\test_gui_notebooktest.obj &\r
        $(OBJS)\test_gui_ownerdrawncomboboxtest.obj &\r
        $(OBJS)\test_gui_pickerbasetest.obj &\r
@@ -436,13 +436,14 @@ TEST_GUI_OBJECTS =  &
        $(OBJS)\test_gui_guifuncs.obj &\r
        $(OBJS)\test_gui_selstoretest.obj &\r
        $(OBJS)\test_gui_garbage.obj &\r
-       $(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 &\r
+       $(OBJS)\test_gui_socket.obj &\r
+       $(OBJS)\test_gui_boxsizer.obj &\r
+       $(OBJS)\test_gui_wrapsizer.obj &\r
+       $(OBJS)\test_gui_toplevel.obj &\r
+       $(OBJS)\test_gui_valnum.obj &\r
+       $(OBJS)\test_gui_clientsize.obj &\r
+       $(OBJS)\test_gui_setsize.obj &\r
        $(OBJS)\test_gui_xrctest.obj\r
 \r
 \r
@@ -785,9 +786,9 @@ $(OBJS)\test_gui_ellipsization.obj :  .AUTODEPEND .\graphics\ellipsization.cpp
 $(OBJS)\test_gui_measuring.obj :  .AUTODEPEND .\graphics\measuring.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
 $(OBJS)\test_gui_config.obj :  .AUTODEPEND .\config\config.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
@@ -857,9 +858,9 @@ $(OBJS)\test_gui_listctrltest.obj :  .AUTODEPEND .\controls\listctrltest.cpp
 $(OBJS)\test_gui_listviewtest.obj :  .AUTODEPEND .\controls\listviewtest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
 $(OBJS)\test_gui_notebooktest.obj :  .AUTODEPEND .\controls\notebooktest.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
@@ -962,15 +963,18 @@ $(OBJS)\test_gui_settings.obj :  .AUTODEPEND .\misc\settings.cpp
 $(OBJS)\test_gui_socket.obj :  .AUTODEPEND .\net\socket.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r
-$(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\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_wrapsizer.obj :  .AUTODEPEND .\sizers\wrapsizer.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_toplevel.obj :  .AUTODEPEND .\toplevel\toplevel.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
+$(OBJS)\test_gui_valnum.obj :  .AUTODEPEND .\validators\valnum.cpp\r
+       $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
+\r
 $(OBJS)\test_gui_clientsize.obj :  .AUTODEPEND .\window\clientsize.cpp\r
        $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<\r
 \r

diff --git a/tests/test.bkl b/tests/test.bkl
index 404e15b80a25e97e9cd4e2003d2f0131b23e6fa2..4087a16b67c2e1a94ae7ba10de3ba2d39bb46c14 100644 (file)
--- 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 f412c8d6a836f10b24c49d5d5520e5c2a69f70dc..9fd20781c21b6f707de2c95a2270fff0582dfcf6 100644 (file)
--- a/tests/test_test_gui.dsp
+++ b/tests/test_test_gui.dsp
@@ -239,10 +239,10 @@ SOURCE=.\menu\accelentry.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\graphics\affinematrix.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=.\graphics\affinematrix.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\asserthelper.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -397,10 +397,10 @@ SOURCE=.\controls\listviewtest.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\controls\markuptest.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=.\controls\markuptest.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\graphics\measuring.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -517,6 +517,10 @@ SOURCE=.\controls\toolbooktest.cpp
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\toplevel\toplevel.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\controls\treebooktest.cpp\r
 # End Source File\r
 # Begin Source File\r
@@ -537,10 +541,10 @@ SOURCE=.\controls\windowtest.cpp
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\sizers\wrapsizer.cpp
-# End Source File
-# Begin Source File
-
+SOURCE=.\sizers\wrapsizer.cpp\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\xml\xrctest.cpp\r
 # End Source File\r
 # End Group\r

diff --git a/tests/test_vc7_test_gui.vcproj b/tests/test_vc7_test_gui.vcproj
index 77ba87227003d2d5c070b05a5234428af4d26f13..861d041cec3cb5b78d78dd6001f89e4378f9729f 100644 (file)
--- a/tests/test_vc7_test_gui.vcproj
+++ b/tests/test_vc7_test_gui.vcproj
@@ -569,9 +569,9 @@
                                RelativePath=".\menu\accelentry.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\graphics\affinematrix.cpp">
-                       </File>
-                       <File
+                               RelativePath=".\graphics\affinematrix.cpp">\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\asserthelper.cpp">\r
                        </File>\r
                        <File\r
@@ -734,9 +734,9 @@
                                RelativePath=".\controls\listviewtest.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\controls\markuptest.cpp">
-                       </File>
-                       <File
+                               RelativePath=".\controls\markuptest.cpp">\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\graphics\measuring.cpp">\r
                        </File>\r
                        <File\r
@@ -820,6 +820,9 @@
                        <File\r
                                RelativePath=".\controls\toolbooktest.cpp">\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\toplevel\toplevel.cpp">\r
+                       </File>\r
                        <File\r
                                RelativePath=".\controls\treebooktest.cpp">\r
                        </File>\r
@@ -836,9 +839,9 @@
                                RelativePath=".\controls\windowtest.cpp">\r
                        </File>\r
                        <File\r
-                               RelativePath=".\sizers\wrapsizer.cpp">
-                       </File>
-                       <File
+                               RelativePath=".\sizers\wrapsizer.cpp">\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\xml\xrctest.cpp">\r
                        </File>\r
                </Filter>\r

diff --git a/tests/test_vc8_test_gui.vcproj b/tests/test_vc8_test_gui.vcproj
index 3bc2ce80f3b1fc78c8f4a3b04ebf6d3ccc055c49..8bfa56f191b48a03575faec4964eb8d9996ea3e9 100644 (file)
--- a/tests/test_vc8_test_gui.vcproj
+++ b/tests/test_vc8_test_gui.vcproj
@@ -832,10 +832,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\graphics\affinematrix.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath=".\graphics\affinematrix.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\asserthelper.cpp"\r
                                >\r
                        </File>\r
@@ -1052,10 +1052,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\controls\markuptest.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath=".\controls\markuptest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\graphics\measuring.cpp"\r
                                >\r
                        </File>\r
@@ -1167,6 +1167,10 @@
                                RelativePath=".\controls\toolbooktest.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\toplevel\toplevel.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\controls\treebooktest.cpp"\r
                                >\r
@@ -1188,10 +1192,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\sizers\wrapsizer.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath=".\sizers\wrapsizer.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\xml\xrctest.cpp"\r
                                >\r
                        </File>\r

diff --git a/tests/test_vc9_test_gui.vcproj b/tests/test_vc9_test_gui.vcproj
index d312302f26f7ef0b3a6d110f961ea07852019bb1..76f09246555823805742f8fc0a324b9c43084d1f 100644 (file)
--- a/tests/test_vc9_test_gui.vcproj
+++ b/tests/test_vc9_test_gui.vcproj
@@ -804,10 +804,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\graphics\affinematrix.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath=".\graphics\affinematrix.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\asserthelper.cpp"\r
                                >\r
                        </File>\r
@@ -1024,10 +1024,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\controls\markuptest.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath=".\controls\markuptest.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\graphics\measuring.cpp"\r
                                >\r
                        </File>\r
@@ -1139,6 +1139,10 @@
                                RelativePath=".\controls\toolbooktest.cpp"\r
                                >\r
                        </File>\r
+                       <File\r
+                               RelativePath=".\toplevel\toplevel.cpp"\r
+                               >\r
+                       </File>\r
                        <File\r
                                RelativePath=".\controls\treebooktest.cpp"\r
                                >\r
@@ -1160,10 +1164,10 @@
                                >\r
                        </File>\r
                        <File\r
-                               RelativePath=".\sizers\wrapsizer.cpp"
-                               >
-                       </File>
-                       <File
+                               RelativePath=".\sizers\wrapsizer.cpp"\r
+                               >\r
+                       </File>\r
+                       <File\r
                                RelativePath=".\xml\xrctest.cpp"\r
                                >\r
                        </File>\r

diff --git a/tests/toplevel/toplevel.cpp b/tests/toplevel/toplevel.cpp
index 27799fbd1b0985375a55459e6834dea4a7a7def8..0e5b42db0e1f8ba7b46f750deb0a30f29f53a8f2 100644 (file)
--- 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());