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

fix for the broken VC6 compiler (why do we have to still support it?)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58013 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi 2009-01-11 10:28:20 +00:00
parent 4cb21a7b74
commit ef57fb9546
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tests/misc/garbage.cpp
View File

@ -92,12 +92,14 @@ void GarbageTestCase::LoadGarbage()
void GarbageTestCase::DoLoadFile(const wxString& fullname) void GarbageTestCase::DoLoadFile(const wxString& fullname)
{ {
int type;
// test wxImage // test wxImage
wxImage img; wxImage img;
CPPUNIT_ASSERT( img.LoadFile(fullname) == false ); CPPUNIT_ASSERT( img.LoadFile(fullname) == false );
// test with the default wxBITMAP_TYPE_ANY // test with the default wxBITMAP_TYPE_ANY
for (int type = wxBITMAP_TYPE_BMP; type < wxBITMAP_TYPE_ANY; type++) for (type = wxBITMAP_TYPE_BMP; type < wxBITMAP_TYPE_ANY; type++)
CPPUNIT_ASSERT( img.LoadFile(fullname, (wxBitmapType)type) == false ); CPPUNIT_ASSERT( img.LoadFile(fullname, (wxBitmapType)type) == false );
// test with all other possible wxBITMAP_TYPE_* flags // test with all other possible wxBITMAP_TYPE_* flags
@ -106,7 +108,7 @@ void GarbageTestCase::DoLoadFile(const wxString& fullname)
CPPUNIT_ASSERT( bmp.LoadFile(fullname) == false ); CPPUNIT_ASSERT( bmp.LoadFile(fullname) == false );
// test with the default wxBITMAP_TYPE_ANY // test with the default wxBITMAP_TYPE_ANY
for (int type = wxBITMAP_TYPE_BMP; type < wxBITMAP_TYPE_ANY; type++) for (type = wxBITMAP_TYPE_BMP; type < wxBITMAP_TYPE_ANY; type++)
CPPUNIT_ASSERT( bmp.LoadFile(fullname, (wxBitmapType)type) == false ); CPPUNIT_ASSERT( bmp.LoadFile(fullname, (wxBitmapType)type) == false );
// test with all other possible wxBITMAP_TYPE_* flags // test with all other possible wxBITMAP_TYPE_* flags
@ -115,7 +117,7 @@ void GarbageTestCase::DoLoadFile(const wxString& fullname)
CPPUNIT_ASSERT( icon.LoadFile(fullname) == false ); CPPUNIT_ASSERT( icon.LoadFile(fullname) == false );
// test with the default wxICON_DEFAULT_TYPE // test with the default wxICON_DEFAULT_TYPE
for (int type = wxBITMAP_TYPE_BMP; type < wxBITMAP_TYPE_ANY; type++) for (type = wxBITMAP_TYPE_BMP; type < wxBITMAP_TYPE_ANY; type++)
CPPUNIT_ASSERT( icon.LoadFile(fullname, (wxBitmapType)type) == false ); CPPUNIT_ASSERT( icon.LoadFile(fullname, (wxBitmapType)type) == false );
// test with all other possible wxBITMAP_TYPE_* flags // test with all other possible wxBITMAP_TYPE_* flags
@ -125,7 +127,7 @@ void GarbageTestCase::DoLoadFile(const wxString& fullname)
CPPUNIT_ASSERT( anim.LoadFile(fullname) == false ); CPPUNIT_ASSERT( anim.LoadFile(fullname) == false );
// test with the default wxANIMATION_TYPE_ANY // test with the default wxANIMATION_TYPE_ANY
for (int type = wxANIMATION_TYPE_INVALID+1; type < wxANIMATION_TYPE_ANY; type++) for (type = wxANIMATION_TYPE_INVALID+1; type < wxANIMATION_TYPE_ANY; type++)
CPPUNIT_ASSERT( anim.LoadFile(fullname, (wxAnimationType)type) == false ); CPPUNIT_ASSERT( anim.LoadFile(fullname, (wxAnimationType)type) == false );
// test with all other possible wxANIMATION_TYPE_* flags // test with all other possible wxANIMATION_TYPE_* flags
@ -152,6 +154,8 @@ void GarbageTestCase::DoLoadFile(const wxString& fullname)
void GarbageTestCase::DoLoadStream(wxInputStream& stream) void GarbageTestCase::DoLoadStream(wxInputStream& stream)
{ {
int type;
// NOTE: not all classes tested by DoLoadFile() supports loading // NOTE: not all classes tested by DoLoadFile() supports loading
// from an input stream! // from an input stream!
@ -160,7 +164,7 @@ void GarbageTestCase::DoLoadStream(wxInputStream& stream)
CPPUNIT_ASSERT( img.LoadFile(stream) == false ); CPPUNIT_ASSERT( img.LoadFile(stream) == false );
// test with the default wxBITMAP_TYPE_ANY // test with the default wxBITMAP_TYPE_ANY
for (int type = wxBITMAP_TYPE_INVALID+1; type < wxBITMAP_TYPE_ANY; type++) for (type = wxBITMAP_TYPE_INVALID+1; type < wxBITMAP_TYPE_ANY; type++)
CPPUNIT_ASSERT( img.LoadFile(stream, (wxBitmapType)type) == false ); CPPUNIT_ASSERT( img.LoadFile(stream, (wxBitmapType)type) == false );
// test with all other possible wxBITMAP_TYPE_* flags // test with all other possible wxBITMAP_TYPE_* flags
@ -170,7 +174,7 @@ void GarbageTestCase::DoLoadStream(wxInputStream& stream)
CPPUNIT_ASSERT( anim.Load(stream) == false ); CPPUNIT_ASSERT( anim.Load(stream) == false );
// test with the default wxANIMATION_TYPE_ANY // test with the default wxANIMATION_TYPE_ANY
for (int type = wxANIMATION_TYPE_INVALID+1; type < wxANIMATION_TYPE_ANY; type++) for (type = wxANIMATION_TYPE_INVALID+1; type < wxANIMATION_TYPE_ANY; type++)
CPPUNIT_ASSERT( anim.Load(stream, (wxAnimationType)type) == false ); CPPUNIT_ASSERT( anim.Load(stream, (wxAnimationType)type) == false );
// test with all other possible wxANIMATION_TYPE_* flags // test with all other possible wxANIMATION_TYPE_* flags
/* /*