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

implement deprecated wxStripExtension() in terms of new wxFileName::StripExtension() (closes #10634)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59868 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-03-26 15:55:01 +00:00
parent 62714742f3
commit 181dd701fa
6 changed files with 42 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
tests/filename/filenametest.cpp
View File

@@ -454,35 +454,15 @@ void FileNameTestCase::TestReplace()
fn.GetFullPath(wxPATH_UNIX) );
}
#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
CPPUNIT_ASSERT_EQUAL( wxString(_T("")), wxTestStripExtension(_T("")) );
//others
CPPUNIT_ASSERT_EQUAL( wxString(_T("")), wxTestStripExtension(_T(".")) );
CPPUNIT_ASSERT_EQUAL( wxString(_T("")), wxTestStripExtension(_T(".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( "", wxFileName::StripExtension(_T("")) );
CPPUNIT_ASSERT_EQUAL( ".", wxFileName::StripExtension(_T(".")) );
CPPUNIT_ASSERT_EQUAL( ".vimrc", wxFileName::StripExtension(_T(".vimrc")) );
CPPUNIT_ASSERT_EQUAL( "bad", wxFileName::StripExtension(_T("bad")) );
CPPUNIT_ASSERT_EQUAL( "good", wxFileName::StripExtension(_T("good.wav")) );
CPPUNIT_ASSERT_EQUAL( "good.wav", wxFileName::StripExtension(_T("good.wav.wav")) );
}
#endif // WXWIN_COMPATIBILITY_2_8
#ifdef __WINDOWS__