From: Vadim Zeitlin Date: Sun, 1 Feb 2009 22:20:59 +0000 (+0000) Subject: disable warning about using deprecated wxStripExtension() for MSVC X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/b3f76d404f5efa9bd1e282fa8d341fb357ec2531 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 --- diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp index a57b3089de..9132c0e3ea 100644 --- a/tests/filename/filenametest.cpp +++ b/tests/filename/filenametest.cpp @@ -455,12 +455,22 @@ void FileNameTestCase::TestReplace() } #if WXWIN_COMPATIBILITY_2_8 + +#ifdef __VISUALC__ + // disable warning about using deprecated wxStripExtension() + #pragma warning(disable:4996) +#endif + wxString wxTestStripExtension(wxString szFile) { wxStripExtension(szFile); return szFile; } +#ifdef __VISUALC__ + #pragma warning(default:4996) +#endif + void FileNameTestCase::TestStrip() { //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.wav")), wxTestStripExtension(_T("good.wav.wav")) ); } -#endif +#endif // WXWIN_COMPATIBILITY_2_8 #ifdef __WINDOWS__