Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move evthandler.cpp to non-GUI test as it doesn't require the GUI

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58615 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-02-01 23:20:27 +00:00
parent 9b3ff3c04f
commit 4fc218c2a7
14 changed files with 41 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tests/Makefile.in
View File

@@ -62,6 +62,7 @@ TEST_OBJECTS = \
test_cmdlinetest.o \ test_cmdlinetest.o \
test_fileconf.o \ test_fileconf.o \
test_datetimetest.o \ test_datetimetest.o \
test_evthandler.o \
test_timertest.o \ test_timertest.o \
test_filekind.o \ test_filekind.o \
test_filenametest.o \ test_filenametest.o \
@@ -132,7 +133,6 @@ TEST_GUI_OBJECTS = \
test_gui_textentrytest.o \ test_gui_textentrytest.o \
test_gui_treectrltest.o \ test_gui_treectrltest.o \
test_gui_propagation.o \ test_gui_propagation.o \
test_gui_evthandler.o \
test_gui_rawbmp.o \ test_gui_rawbmp.o \
test_gui_htmlwindow.o \ test_gui_htmlwindow.o \
test_gui_guifuncs.o \ test_gui_guifuncs.o \
@@ -385,6 +385,9 @@ test_fileconf.o: $(srcdir)/config/fileconf.cpp $(TEST_ODEP)
test_datetimetest.o: $(srcdir)/datetime/datetimetest.cpp $(TEST_ODEP) test_datetimetest.o: $(srcdir)/datetime/datetimetest.cpp $(TEST_ODEP)
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/datetime/datetimetest.cpp $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/datetime/datetimetest.cpp
test_evthandler.o: $(srcdir)/events/evthandler.cpp $(TEST_ODEP)
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/events/evthandler.cpp
test_timertest.o: $(srcdir)/events/timertest.cpp $(TEST_ODEP) test_timertest.o: $(srcdir)/events/timertest.cpp $(TEST_ODEP)
$(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/events/timertest.cpp $(CXXC) -c -o $@ $(TEST_CXXFLAGS) $(srcdir)/events/timertest.cpp
@@ -574,9 +577,6 @@ test_gui_treectrltest.o: $(srcdir)/controls/treectrltest.cpp $(TEST_GUI_ODEP)
test_gui_propagation.o: $(srcdir)/events/propagation.cpp $(TEST_GUI_ODEP) test_gui_propagation.o: $(srcdir)/events/propagation.cpp $(TEST_GUI_ODEP)
$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/events/propagation.cpp $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/events/propagation.cpp
test_gui_evthandler.o: $(srcdir)/events/evthandler.cpp $(TEST_GUI_ODEP)
$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/events/evthandler.cpp
test_gui_rawbmp.o: $(srcdir)/image/rawbmp.cpp $(TEST_GUI_ODEP) test_gui_rawbmp.o: $(srcdir)/image/rawbmp.cpp $(TEST_GUI_ODEP)
$(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/image/rawbmp.cpp $(CXXC) -c -o $@ $(TEST_GUI_CXXFLAGS) $(srcdir)/image/rawbmp.cpp

8
tests/makefile.bcc
View File

@@ -46,6 +46,7 @@ TEST_OBJECTS = \
$(OBJS)\test_cmdlinetest.obj \ $(OBJS)\test_cmdlinetest.obj \
$(OBJS)\test_fileconf.obj \ $(OBJS)\test_fileconf.obj \
$(OBJS)\test_datetimetest.obj \ $(OBJS)\test_datetimetest.obj \
$(OBJS)\test_evthandler.obj \
$(OBJS)\test_timertest.obj \ $(OBJS)\test_timertest.obj \
$(OBJS)\test_filekind.obj \ $(OBJS)\test_filekind.obj \
$(OBJS)\test_filenametest.obj \ $(OBJS)\test_filenametest.obj \
@@ -117,7 +118,6 @@ TEST_GUI_OBJECTS = \
$(OBJS)\test_gui_textentrytest.obj \ $(OBJS)\test_gui_textentrytest.obj \
$(OBJS)\test_gui_treectrltest.obj \ $(OBJS)\test_gui_treectrltest.obj \
$(OBJS)\test_gui_propagation.obj \ $(OBJS)\test_gui_propagation.obj \
$(OBJS)\test_gui_evthandler.obj \
$(OBJS)\test_gui_rawbmp.obj \ $(OBJS)\test_gui_rawbmp.obj \
$(OBJS)\test_gui_htmlwindow.obj \ $(OBJS)\test_gui_htmlwindow.obj \
$(OBJS)\test_gui_guifuncs.obj \ $(OBJS)\test_gui_guifuncs.obj \
@@ -422,6 +422,9 @@ $(OBJS)\test_fileconf.obj: .\config\fileconf.cpp
$(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp $(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\datetime\datetimetest.cpp $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\datetime\datetimetest.cpp
$(OBJS)\test_evthandler.obj: .\events\evthandler.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\evthandler.cpp
$(OBJS)\test_timertest.obj: .\events\timertest.cpp $(OBJS)\test_timertest.obj: .\events\timertest.cpp
$(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\timertest.cpp $(CXX) -q -c -P -o$@ $(TEST_CXXFLAGS) .\events\timertest.cpp
@@ -614,9 +617,6 @@ $(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp
$(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp $(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp
$(OBJS)\test_gui_evthandler.obj: .\events\evthandler.cpp
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\events\evthandler.cpp
$(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp $(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
$(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp $(CXX) -q -c -P -o$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp

8
tests/makefile.gcc
View File

@@ -38,6 +38,7 @@ TEST_OBJECTS = \
$(OBJS)\test_cmdlinetest.o \ $(OBJS)\test_cmdlinetest.o \
$(OBJS)\test_fileconf.o \ $(OBJS)\test_fileconf.o \
$(OBJS)\test_datetimetest.o \ $(OBJS)\test_datetimetest.o \
$(OBJS)\test_evthandler.o \
$(OBJS)\test_timertest.o \ $(OBJS)\test_timertest.o \
$(OBJS)\test_filekind.o \ $(OBJS)\test_filekind.o \
$(OBJS)\test_filenametest.o \ $(OBJS)\test_filenametest.o \
@@ -110,7 +111,6 @@ TEST_GUI_OBJECTS = \
$(OBJS)\test_gui_textentrytest.o \ $(OBJS)\test_gui_textentrytest.o \
$(OBJS)\test_gui_treectrltest.o \ $(OBJS)\test_gui_treectrltest.o \
$(OBJS)\test_gui_propagation.o \ $(OBJS)\test_gui_propagation.o \
$(OBJS)\test_gui_evthandler.o \
$(OBJS)\test_gui_rawbmp.o \ $(OBJS)\test_gui_rawbmp.o \
$(OBJS)\test_gui_htmlwindow.o \ $(OBJS)\test_gui_htmlwindow.o \
$(OBJS)\test_gui_guifuncs.o \ $(OBJS)\test_gui_guifuncs.o \
@@ -402,6 +402,9 @@ $(OBJS)\test_fileconf.o: ./config/fileconf.cpp
$(OBJS)\test_datetimetest.o: ./datetime/datetimetest.cpp $(OBJS)\test_datetimetest.o: ./datetime/datetimetest.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\test_evthandler.o: ./events/evthandler.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\test_timertest.o: ./events/timertest.cpp $(OBJS)\test_timertest.o: ./events/timertest.cpp
$(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(TEST_CXXFLAGS) $(CPPDEPS) $<
@@ -594,9 +597,6 @@ $(OBJS)\test_gui_treectrltest.o: ./controls/treectrltest.cpp
$(OBJS)\test_gui_propagation.o: ./events/propagation.cpp $(OBJS)\test_gui_propagation.o: ./events/propagation.cpp
$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\test_gui_evthandler.o: ./events/evthandler.cpp
$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<
$(OBJS)\test_gui_rawbmp.o: ./image/rawbmp.cpp $(OBJS)\test_gui_rawbmp.o: ./image/rawbmp.cpp
$(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $< $(CXX) -c -o $@ $(TEST_GUI_CXXFLAGS) $(CPPDEPS) $<

13
tests/makefile.vc
View File

@@ -29,6 +29,11 @@ TEST_CXXFLAGS = /M$(__RUNTIME_LIBS_8)$(__DEBUGRUNTIME) /DWIN32 $(__DEBUGINFO) \
$(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"testprec.h" \ $(CPPUNIT_CFLAGS) $(__RTTIFLAG) $(__EXCEPTIONSFLAG) /Yu"testprec.h" \
/Fp"$(OBJS)\testprec_test.pch" $(CPPFLAGS) $(CXXFLAGS) /Fp"$(OBJS)\testprec_test.pch" $(CPPFLAGS) $(CXXFLAGS)
TEST_OBJECTS = \ TEST_OBJECTS = \
$(OBJS)\test_dummy.obj \
$(OBJS)\test_test.obj \
$(OBJS)\test_evthandler.obj \
TEST_OBJECTS_ = \
$(OBJS)\test_dummy.obj \ $(OBJS)\test_dummy.obj \
$(OBJS)\test_test.obj \ $(OBJS)\test_test.obj \
$(OBJS)\test_archivetest.obj \ $(OBJS)\test_archivetest.obj \
@@ -39,6 +44,7 @@ TEST_OBJECTS = \
$(OBJS)\test_cmdlinetest.obj \ $(OBJS)\test_cmdlinetest.obj \
$(OBJS)\test_fileconf.obj \ $(OBJS)\test_fileconf.obj \
$(OBJS)\test_datetimetest.obj \ $(OBJS)\test_datetimetest.obj \
$(OBJS)\test_evthandler.obj \
$(OBJS)\test_timertest.obj \ $(OBJS)\test_timertest.obj \
$(OBJS)\test_filekind.obj \ $(OBJS)\test_filekind.obj \
$(OBJS)\test_filenametest.obj \ $(OBJS)\test_filenametest.obj \
@@ -113,7 +119,6 @@ TEST_GUI_OBJECTS = \
$(OBJS)\test_gui_textentrytest.obj \ $(OBJS)\test_gui_textentrytest.obj \
$(OBJS)\test_gui_treectrltest.obj \ $(OBJS)\test_gui_treectrltest.obj \
$(OBJS)\test_gui_propagation.obj \ $(OBJS)\test_gui_propagation.obj \
$(OBJS)\test_gui_evthandler.obj \
$(OBJS)\test_gui_rawbmp.obj \ $(OBJS)\test_gui_rawbmp.obj \
$(OBJS)\test_gui_htmlwindow.obj \ $(OBJS)\test_gui_htmlwindow.obj \
$(OBJS)\test_gui_guifuncs.obj \ $(OBJS)\test_gui_guifuncs.obj \
@@ -507,6 +512,9 @@ $(OBJS)\test_fileconf.obj: .\config\fileconf.cpp
$(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp $(OBJS)\test_datetimetest.obj: .\datetime\datetimetest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\datetime\datetimetest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\datetime\datetimetest.cpp
$(OBJS)\test_evthandler.obj: .\events\evthandler.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\evthandler.cpp
$(OBJS)\test_timertest.obj: .\events\timertest.cpp $(OBJS)\test_timertest.obj: .\events\timertest.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\timertest.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_CXXFLAGS) .\events\timertest.cpp
@@ -699,9 +707,6 @@ $(OBJS)\test_gui_treectrltest.obj: .\controls\treectrltest.cpp
$(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp $(OBJS)\test_gui_propagation.obj: .\events\propagation.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\propagation.cpp
$(OBJS)\test_gui_evthandler.obj: .\events\evthandler.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\events\evthandler.cpp
$(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp $(OBJS)\test_gui_rawbmp.obj: .\image\rawbmp.cpp
$(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp $(CXX) /c /nologo /TP /Fo$@ $(TEST_GUI_CXXFLAGS) .\image\rawbmp.cpp

8
tests/makefile.wat
View File

@@ -273,6 +273,7 @@ TEST_OBJECTS = &
$(OBJS)\test_cmdlinetest.obj & $(OBJS)\test_cmdlinetest.obj &
$(OBJS)\test_fileconf.obj & $(OBJS)\test_fileconf.obj &
$(OBJS)\test_datetimetest.obj & $(OBJS)\test_datetimetest.obj &
$(OBJS)\test_evthandler.obj &
$(OBJS)\test_timertest.obj & $(OBJS)\test_timertest.obj &
$(OBJS)\test_filekind.obj & $(OBJS)\test_filekind.obj &
$(OBJS)\test_filenametest.obj & $(OBJS)\test_filenametest.obj &
@@ -344,7 +345,6 @@ TEST_GUI_OBJECTS = &
$(OBJS)\test_gui_textentrytest.obj & $(OBJS)\test_gui_textentrytest.obj &
$(OBJS)\test_gui_treectrltest.obj & $(OBJS)\test_gui_treectrltest.obj &
$(OBJS)\test_gui_propagation.obj & $(OBJS)\test_gui_propagation.obj &
$(OBJS)\test_gui_evthandler.obj &
$(OBJS)\test_gui_rawbmp.obj & $(OBJS)\test_gui_rawbmp.obj &
$(OBJS)\test_gui_htmlwindow.obj & $(OBJS)\test_gui_htmlwindow.obj &
$(OBJS)\test_gui_guifuncs.obj & $(OBJS)\test_gui_guifuncs.obj &
@@ -459,6 +459,9 @@ $(OBJS)\test_fileconf.obj : .AUTODEPEND .\config\fileconf.cpp
$(OBJS)\test_datetimetest.obj : .AUTODEPEND .\datetime\datetimetest.cpp $(OBJS)\test_datetimetest.obj : .AUTODEPEND .\datetime\datetimetest.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_evthandler.obj : .AUTODEPEND .\events\evthandler.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
$(OBJS)\test_timertest.obj : .AUTODEPEND .\events\timertest.cpp $(OBJS)\test_timertest.obj : .AUTODEPEND .\events\timertest.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(TEST_CXXFLAGS) $<
@@ -651,9 +654,6 @@ $(OBJS)\test_gui_treectrltest.obj : .AUTODEPEND .\controls\treectrltest.cpp
$(OBJS)\test_gui_propagation.obj : .AUTODEPEND .\events\propagation.cpp $(OBJS)\test_gui_propagation.obj : .AUTODEPEND .\events\propagation.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
$(OBJS)\test_gui_evthandler.obj : .AUTODEPEND .\events\evthandler.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<
$(OBJS)\test_gui_rawbmp.obj : .AUTODEPEND .\image\rawbmp.cpp $(OBJS)\test_gui_rawbmp.obj : .AUTODEPEND .\image\rawbmp.cpp
$(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $< $(CXX) -bt=nt -zq -fo=$^@ $(TEST_GUI_CXXFLAGS) $<

2
tests/test.bkl
View File

@@ -37,6 +37,7 @@
cmdline/cmdlinetest.cpp cmdline/cmdlinetest.cpp
config/fileconf.cpp config/fileconf.cpp
datetime/datetimetest.cpp datetime/datetimetest.cpp
events/evthandler.cpp
events/timertest.cpp events/timertest.cpp
filekind/filekind.cpp filekind/filekind.cpp
filename/filenametest.cpp filename/filenametest.cpp
@@ -114,7 +115,6 @@
controls/textentrytest.cpp controls/textentrytest.cpp
controls/treectrltest.cpp controls/treectrltest.cpp
events/propagation.cpp events/propagation.cpp
events/evthandler.cpp
image/rawbmp.cpp image/rawbmp.cpp
html/htmlwindow.cpp html/htmlwindow.cpp
misc/guifuncs.cpp misc/guifuncs.cpp

4
tests/test_test.dsp
View File

@@ -285,6 +285,10 @@ SOURCE=.\weakref\evtconnection.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\events\evthandler.cpp
# End Source File
# Begin Source File
SOURCE=.\streams\ffilestream.cpp SOURCE=.\streams\ffilestream.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File

4
tests/test_test_gui.dsp
View File

@@ -253,10 +253,6 @@ SOURCE=.\dummy.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File
SOURCE=.\events\evthandler.cpp
# End Source File
# Begin Source File
SOURCE=.\misc\garbage.cpp SOURCE=.\misc\garbage.cpp
# End Source File # End Source File
# Begin Source File # Begin Source File

3
tests/test_vc7_test.vcproj
View File

@@ -633,6 +633,9 @@
<File <File
RelativePath=".\weakref\evtconnection.cpp"> RelativePath=".\weakref\evtconnection.cpp">
</File> </File>
<File
RelativePath=".\events\evthandler.cpp">
</File>
<File <File
RelativePath=".\streams\ffilestream.cpp"> RelativePath=".\streams\ffilestream.cpp">
</File> </File>

3
tests/test_vc7_test_gui.vcproj
View File

@@ -609,9 +609,6 @@
UsePrecompiledHeader="1"/> UsePrecompiledHeader="1"/>
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath=".\events\evthandler.cpp">
</File>
<File <File
RelativePath=".\misc\garbage.cpp"> RelativePath=".\misc\garbage.cpp">
</File> </File>

4
tests/test_vc8_test.vcproj
View File

@@ -923,6 +923,10 @@
RelativePath=".\weakref\evtconnection.cpp" RelativePath=".\weakref\evtconnection.cpp"
> >
</File> </File>
<File
RelativePath=".\events\evthandler.cpp"
>
</File>
<File <File
RelativePath=".\streams\ffilestream.cpp" RelativePath=".\streams\ffilestream.cpp"
> >

4
tests/test_vc8_test_gui.vcproj
View File

@@ -891,10 +891,6 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath=".\events\evthandler.cpp"
>
</File>
<File <File
RelativePath=".\misc\garbage.cpp" RelativePath=".\misc\garbage.cpp"
> >

4
tests/test_vc9_test.vcproj
View File

@@ -895,6 +895,10 @@
RelativePath=".\weakref\evtconnection.cpp" RelativePath=".\weakref\evtconnection.cpp"
> >
</File> </File>
<File
RelativePath=".\events\evthandler.cpp"
>
</File>
<File <File
RelativePath=".\streams\ffilestream.cpp" RelativePath=".\streams\ffilestream.cpp"
> >

4
tests/test_vc9_test_gui.vcproj
View File

@@ -863,10 +863,6 @@
/> />
</FileConfiguration> </FileConfiguration>
</File> </File>
<File
RelativePath=".\events\evthandler.cpp"
>
</File>
<File <File
RelativePath=".\misc\garbage.cpp" RelativePath=".\misc\garbage.cpp"
> >