wxMac uses wxStandardPathsCF to mean wxStandardPaths in its wxBase

[wxWidgets.git] / src / common / dircmn.cpp

diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index d491ed9d530e4fcbe6d040d5982a134ce970d9e1..7a14d42bd9a467db502f312817c2f4571a876f87 100644 (file)
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 /* this is done in platform-specific files
 // ----------------------------------------------------------------------------
 
 /* this is done in platform-specific files

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "dir.h"
 #endif
 */
     #pragma implementation "dir.h"
 #endif
 */


@@ -37,6 +37,7 @@
     #include "wx/filefn.h"
 #endif //WX_PRECOMP
 
     #include "wx/filefn.h"
 #endif //WX_PRECOMP
 

+#include "wx/arrstr.h"

 #include "wx/dir.h"
 
 // ============================================================================
 #include "wx/dir.h"
 
 // ============================================================================


@@ -66,7 +67,7 @@ bool wxDir::HasFiles(const wxString& spec)
 }
 
 // we have a (much) faster version for Unix
 }
 
 // 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)
 {
 
 bool wxDir::HasSubDirs(const wxString& spec)
 {


@@ -98,9 +99,9 @@ size_t wxDir::Traverse(wxDirTraverser& sink,
     if ( flags & wxDIR_DIRS )
     {
         wxString dirname;
     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) )
+              cont = cont && GetNext(&dirname) )

         {
             const wxString fulldirname = prefix + dirname;
 
         {
             const wxString fulldirname = prefix + dirname;
 


@@ -217,6 +218,8 @@ public:
 
 private:
     wxArrayString& m_files;
 
 private:
     wxArrayString& m_files;

+
+    DECLARE_NO_COPY_CLASS(wxDirTraverserSimple)

 };
 
 /* static */
 };
 
 /* static */