minor changes to wxDir test code

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18893 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2003-01-24 00:07:42 +00:00
parent 182c0f4675
commit 2f0c19d0a8

View File

@@ -94,7 +94,7 @@
#undef TEST_ALL #undef TEST_ALL
static const bool TEST_ALL = TRUE; static const bool TEST_ALL = TRUE;
#else #else
#define TEST_TEXTSTREAM #define TEST_DIR
static const bool TEST_ALL = FALSE; static const bool TEST_ALL = FALSE;
#endif #endif
@@ -279,7 +279,7 @@ static void TestCmdLineConvert()
#ifdef __UNIX__ #ifdef __UNIX__
static const wxChar *ROOTDIR = _T("/"); static const wxChar *ROOTDIR = _T("/");
static const wxChar *TESTDIR = _T("/usr"); static const wxChar *TESTDIR = _T("/usr/local/share");
#elif defined(__WXMSW__) #elif defined(__WXMSW__)
static const wxChar *ROOTDIR = _T("c:\\"); static const wxChar *ROOTDIR = _T("c:\\");
static const wxChar *TESTDIR = _T("d:\\"); static const wxChar *TESTDIR = _T("d:\\");
@@ -406,6 +406,7 @@ static void TestDirTraverse()
} }
// enum again with custom traverser // enum again with custom traverser
wxPuts(_T("Now enumerating directories:"));
wxDir dir(TESTDIR); wxDir dir(TESTDIR);
DirPrintTraverser traverser; DirPrintTraverser traverser;
dir.Traverse(traverser, _T(""), wxDIR_DIRS | wxDIR_HIDDEN); dir.Traverse(traverser, _T(""), wxDIR_DIRS | wxDIR_HIDDEN);
@@ -6375,9 +6376,9 @@ int main(int argc, char **argv)
if ( TEST_ALL ) if ( TEST_ALL )
{ {
TestDirExists(); TestDirExists();
TestDirTraverse(); TestDirEnum();
} }
TestDirEnum(); TestDirTraverse();
#endif // TEST_DIR #endif // TEST_DIR
#ifdef TEST_DLLLOADER #ifdef TEST_DLLLOADER