X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/51485b7601f6d01b5e7bf546e28ea7b3358f7a02..3b01b1fe4cb656f39290bf7f3891667855abe601:/src/common/dircmn.cpp diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp index e613a8b038..7a14d42bd9 100644 --- a/src/common/dircmn.cpp +++ b/src/common/dircmn.cpp @@ -37,6 +37,7 @@ #include "wx/filefn.h" #endif //WX_PRECOMP +#include "wx/arrstr.h" #include "wx/dir.h" // ============================================================================ @@ -66,7 +67,7 @@ bool wxDir::HasFiles(const wxString& spec) } // we have a (much) faster version for Unix -#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__WXMAC__) +#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__EMX__) bool wxDir::HasSubDirs(const wxString& spec) { @@ -98,7 +99,7 @@ size_t wxDir::Traverse(wxDirTraverser& sink, if ( flags & wxDIR_DIRS ) { wxString dirname; - for ( bool cont = GetFirst(&dirname, _T(""), wxDIR_DIRS | wxDIR_HIDDEN); + for ( bool cont = GetFirst(&dirname, _T(""), wxDIR_DIRS | (flags & wxDIR_HIDDEN) ); cont; cont = cont && GetNext(&dirname) ) {