Use wxRefCounter instead of wxObjecrDataRef

[wxWidgets.git] / tests / test.bkl

diff --git a/tests/test.bkl b/tests/test.bkl
index b78a570a0cf719e65513865e251aa13138a8608e..b679cfb4715394222475ee6749eca651b8a8f7d7 100644 (file)
--- a/tests/test.bkl
+++ b/tests/test.bkl
@@ -76,6 +76,7 @@
             streams/memstream.cpp
             streams/socketstream.cpp
             streams/sstream.cpp
             streams/memstream.cpp
             streams/socketstream.cpp
             streams/sstream.cpp

+            streams/stdstream.cpp

             streams/tempfile.cpp
             streams/textstreamtest.cpp
             streams/zlibstream.cpp
             streams/tempfile.cpp
             streams/textstreamtest.cpp
             streams/zlibstream.cpp


@@ -84,6 +85,7 @@
             thread/queue.cpp
             thread/tls.cpp
             uris/uris.cpp
             thread/queue.cpp
             thread/tls.cpp
             uris/uris.cpp

+            uris/url.cpp

             vectors/vectors.cpp
             weakref/evtconnection.cpp
             weakref/weakref.cpp
             vectors/vectors.cpp
             weakref/evtconnection.cpp
             weakref/weakref.cpp


@@ -91,8 +93,8 @@
             xml/xmltest.cpp
         </sources>
         <wx-lib>net</wx-lib>
             xml/xmltest.cpp
         </sources>
         <wx-lib>net</wx-lib>

-        <wx-lib>base</wx-lib>

         <wx-lib>xml</wx-lib>
         <wx-lib>xml</wx-lib>

+        <wx-lib>base</wx-lib>

     </exe>
 
 
     </exe>
 
 


@@ -119,6 +121,7 @@
             events/clone.cpp
             events/propagation.cpp
             font/fonttest.cpp
             events/clone.cpp
             events/propagation.cpp
             font/fonttest.cpp

+            image/image.cpp

             image/rawbmp.cpp
             html/htmlwindow.cpp
             misc/guifuncs.cpp
             image/rawbmp.cpp
             html/htmlwindow.cpp
             misc/guifuncs.cpp


@@ -147,6 +150,10 @@
 
     <wx-data id="data">
         <files>testdata.fc</files>
 
     <wx-data id="data">
         <files>testdata.fc</files>

+        
+        <!-- test data for image/image.cpp test unit: -->
+        <files>horse.ani  horse.bmp  horse.cur  horse.gif  horse.ico  horse.jpg  
+               horse.pcx  horse.png  horse.pnm  horse.tga  horse.tif  horse.xpm</files>

     </wx-data>
 
     <template id="catalog">
     </wx-data>
 
     <template id="catalog">


@@ -158,16 +165,6 @@
     <wx-data id="fr" template="catalog"/>
 
 
     <wx-data id="fr" template="catalog"/>
 
 

-    <!-- BENCHMARKS -->
-
-    <exe id="printfbench" template="wx_sample_console,wx_test"
-                          template_append="wx_append_base">
-        <sources>
-            benchmarks/printfbench.cpp
-        </sources>
-        <wx-lib>base</wx-lib>
-    </exe>
-

     <fragment format="autoconf">
 # notice the ugly hack with using CXXWARNINGS: we can't use CPPFLAGS as
 # currently the value in the makefile would be ignored if we did, but
     <fragment format="autoconf">
 # notice the ugly hack with using CXXWARNINGS: we can't use CPPFLAGS as
 # currently the value in the makefile would be ignored if we did, but


@@ -176,7 +173,7 @@
 # fail
 failtest:
        @$(RM) test_evthandler.o
 # fail
 failtest:
        @$(RM) test_evthandler.o

-       @for d in GLOBAL STATIC METHOD FUNCTOR DERIVED WRONG_CLASS; do \
+       @for d in GLOBAL STATIC METHOD FUNCTOR NO_HANDLER DERIVED WRONG_CLASS; do \

            if $(MAKE) CXXWARNINGS=-DTEST_INVALID_BIND_$$d test_evthandler.o 2>/dev/null; then \
                echo "*** Compilation with TEST_INVALID_BIND_$$d unexpectedly succeeded.">&amp;2; \
                exit 1; \
            if $(MAKE) CXXWARNINGS=-DTEST_INVALID_BIND_$$d test_evthandler.o 2>/dev/null; then \
                echo "*** Compilation with TEST_INVALID_BIND_$$d unexpectedly succeeded.">&amp;2; \
                exit 1; \