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

Use __WINDOWS__ for OS checks and __WXMSW__ for GUI checks (round 2).

Browse Source 
This is continuation of r70796 and serves the same purpose.

Closes #14065, #14066.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@70808 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-03-04 20:31:42 +00:00
parent 3a1ec1d5dc
commit bb5a951418
33 changed files with 69 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/file/dir.cpp
View File

@@ -178,7 +178,7 @@ void DirTestCase::DirExists()
{ ".", true },
{ "..", true },
{ "$USER_DOCS_DIR", true },
#if defined(__WXMSW__)
#if defined(__WINDOWS__)
{ "$USER_DOCS_DIR\\", true },
{ "$USER_DOCS_DIR\\\\", true },
{ "..\\..", true },
@@ -202,20 +202,20 @@ void DirTestCase::DirExists()
#endif
};
#ifdef __WXMSW__
#ifdef __WINDOWS__
wxString homedrive = wxGetenv("HOMEDRIVE");
if ( homedrive.empty() )
homedrive = "c:";
#endif // __WXMSW__
#endif // __WINDOWS__
for ( size_t n = 0; n < WXSIZEOF(testData); n++ )
{
wxString dirname = testData[n].dirname;
dirname.Replace("$USER_DOCS_DIR", wxStandardPaths::Get().GetDocumentsDir());
#ifdef __WXMSW__
#ifdef __WINDOWS__
dirname.Replace("$MSW_DRIVE", homedrive);
#endif // __WXMSW__
#endif // __WINDOWS__
std::string errDesc = wxString::Format("failed on directory '%s'", dirname).ToStdString();
CPPUNIT_ASSERT_EQUAL_MESSAGE(errDesc, testData[n].shouldExist, wxDir::Exists(dirname));