explicit scrollbar style flags needed

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

diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index 801e2d1f9f9b059c89490de38bc91286ea6f64f3..c81991c43b3e623cdc5485830374db58f2d932cb 100644 (file)
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -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)
 {


@@ -100,7 +101,7 @@ size_t wxDir::Traverse(wxDirTraverser& sink,
         wxString dirname;
         for ( bool cont = GetFirst(&dirname, _T(""), wxDIR_DIRS | wxDIR_HIDDEN);
               cont;
         wxString dirname;
         for ( bool cont = GetFirst(&dirname, _T(""), wxDIR_DIRS | wxDIR_HIDDEN);
               cont;

-              cont = GetNext(&dirname) )
+              cont = cont && GetNext(&dirname) )

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