X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/86f8d1a8bbb08c7e74bb2819d5380ec6d40b73a5..f2c88494b6978bee502f4c856ba9dc7e3b7c3954:/src/common/dircmn.cpp diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp index c81991c43b..9b385e5a18 100644 --- a/src/common/dircmn.cpp +++ b/src/common/dircmn.cpp @@ -17,12 +17,6 @@ // headers // ---------------------------------------------------------------------------- -/* this is done in platform-specific files -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) - #pragma implementation "dir.h" -#endif -*/ - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" @@ -35,9 +29,9 @@ #include "wx/log.h" #include "wx/intl.h" #include "wx/filefn.h" + #include "wx/arrstr.h" #endif //WX_PRECOMP -#include "wx/arrstr.h" #include "wx/dir.h" // ============================================================================ @@ -67,7 +61,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__) || defined(__EMX__) +#if (defined(__CYGWIN__) && defined(__WINDOWS__)) || !defined(__UNIX_LIKE__) || defined(__WXMAC__) || defined(__EMX__) || defined(__WINE__) bool wxDir::HasSubDirs(const wxString& spec) { @@ -99,7 +93,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, wxEmptyString, wxDIR_DIRS | (flags & wxDIR_HIDDEN) ); cont; cont = cont && GetNext(&dirname) ) { @@ -242,4 +236,3 @@ size_t wxDir::GetAllFiles(const wxString& dirname, return nFiles; } -