made wxArrayString::assign(iterator, iterator) a template function; also fixed a...

[wxWidgets.git] / tests / filename / filenametest.cpp

diff --git a/tests/filename/filenametest.cpp b/tests/filename/filenametest.cpp
index a57b3089dedfbfb8aeb3b69d3195811cdf7aedef..9132c0e3eaaa5d26251cb876c417175a23fe3a95 100644 (file)
--- 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__