Applied patch [ 1183157 ] Compilation with GCC 4.0

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

diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index 246df8fb3abfa159ffa09314abf90f097275f360..5705a920fd72891bf53fd4cefdfa20700bd3d386 100644 (file)
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -18,7 +18,7 @@
 // ----------------------------------------------------------------------------
 
 /* this is done in platform-specific files
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "dir.h"
 #endif
 */
@@ -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,9 +99,9 @@ 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 = GetNext(&dirname) )
+              cont = cont && GetNext(&dirname) )
         {
             const wxString fulldirname = prefix + dirname;
 
@@ -206,7 +207,7 @@ public:
 
     virtual wxDirTraverseResult OnFile(const wxString& filename)
     {
-        m_files.Add(filename);
+        m_files.push_back(filename);
         return wxDIR_CONTINUE;
     }
 
@@ -217,6 +218,8 @@ public:
 
 private:
     wxArrayString& m_files;
+
+    DECLARE_NO_COPY_CLASS(wxDirTraverserSimple)
 };
 
 /* static */