disable warning about using deprecated wxStripExtension() for MSVC
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
b2238cc315
commit
b3f76d404f
@ -455,12 +455,22 @@ void FileNameTestCase::TestReplace()
|
|||||||
}
|
}
|
||||||
|
|
||||||
#if WXWIN_COMPATIBILITY_2_8
|
#if WXWIN_COMPATIBILITY_2_8
|
||||||
|
|
||||||
|
#ifdef __VISUALC__
|
||||||
|
// disable warning about using deprecated wxStripExtension()
|
||||||
|
#pragma warning(disable:4996)
|
||||||
|
#endif
|
||||||
|
|
||||||
wxString wxTestStripExtension(wxString szFile)
|
wxString wxTestStripExtension(wxString szFile)
|
||||||
{
|
{
|
||||||
wxStripExtension(szFile);
|
wxStripExtension(szFile);
|
||||||
return szFile;
|
return szFile;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef __VISUALC__
|
||||||
|
#pragma warning(default:4996)
|
||||||
|
#endif
|
||||||
|
|
||||||
void FileNameTestCase::TestStrip()
|
void FileNameTestCase::TestStrip()
|
||||||
{
|
{
|
||||||
//test a crash
|
//test a crash
|
||||||
@ -472,7 +482,7 @@ void FileNameTestCase::TestStrip()
|
|||||||
CPPUNIT_ASSERT_EQUAL( wxString(_T("good")), wxTestStripExtension(_T("good.wav")) );
|
CPPUNIT_ASSERT_EQUAL( wxString(_T("good")), wxTestStripExtension(_T("good.wav")) );
|
||||||
CPPUNIT_ASSERT_EQUAL( wxString(_T("good.wav")), wxTestStripExtension(_T("good.wav.wav")) );
|
CPPUNIT_ASSERT_EQUAL( wxString(_T("good.wav")), wxTestStripExtension(_T("good.wav.wav")) );
|
||||||
}
|
}
|
||||||
#endif
|
#endif // WXWIN_COMPATIBILITY_2_8
|
||||||
|
|
||||||
#ifdef __WINDOWS__
|
#ifdef __WINDOWS__
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user