AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Exclude wxWeakRef tests not compiling with VC6 from compilation.

Browse Source 
The ctor used by these tests can't be enabled for VC6 (see r63955), simply
disable them to allow the rest to compile.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@63965 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin 2010-04-13 16:38:18 +00:00
parent aa47eebb1b
commit deee2b1885
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/weakref/weakref.cpp
View File

@ -80,8 +80,12 @@ void WeakRefTestCase::DeclareTest()
{
{
// Not initializing or initializing with NULL should work too
//
// FIXME-VC6: but it doesn't with VC6, see comment in wx/weakref.h
#ifndef __VISUALC6__
wxWeakRef<wxEvtHandler> wroDef;
wxWeakRef<wxEvtHandler> wro0(NULL);
#endif // __VISUALC6__
wxObject o; // Should not work
wxEvtHandler eh;
@ -129,6 +133,9 @@ void WeakRefTestCase::AssignTest()
CPPUNIT_ASSERT( !wro2 );
// Explicitly resetting should work too
//
// FIXME-VC6: as above, it doesn't work with VC6, see wx/weakref.h
#ifndef __VISUALC6__
wxEvtHandler eh;
wxObjectTrackable ot;
@ -140,6 +147,7 @@ void WeakRefTestCase::AssignTest()
CPPUNIT_ASSERT( !wro1 );
CPPUNIT_ASSERT( !wro2 );
#endif // __VISUALC6__
}
void WeakRefTestCase::AssignWeakRefTest()