was missing in xti merge

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

diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index a3862feb9d516f8b029c35a6918ab1e0b6d7cdd2..f5b0c9fe8a824b4c2f958312847dba67d8806976 100644 (file)
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -6,7 +6,7 @@
 // Created:     19.05.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Created:     19.05.01
 // RCS-ID:      $Id$
 // Copyright:   (c) 2001 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>

-// License:     wxWindows licence
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -300,11 +300,11 @@ public:
 
     virtual wxDirTraverseResult OnFile(const wxString& filename)
     {
 
     virtual wxDirTraverseResult OnFile(const wxString& filename)
     {

-        wxULongLong sz = wxFileName::GetSize(filename);
-

         // wxFileName::GetSize won't use this class again as
         // we're passing it a file and not a directory;
         // thus we are sure to avoid an endless loop
         // wxFileName::GetSize won't use this class again as
         // we're passing it a file and not a directory;
         // thus we are sure to avoid an endless loop

+        wxULongLong sz = wxFileName::GetSize(filename);
+

         if (sz == wxInvalidSize)
         {
             // if the GetSize() failed (this can happen because e.g. a
         if (sz == wxInvalidSize)
         {
             // if the GetSize() failed (this can happen because e.g. a


@@ -327,7 +327,7 @@ public:
 
     wxULongLong GetTotalSize() const
         { return m_sz; }
 
     wxULongLong GetTotalSize() const
         { return m_sz; }

-    wxArrayString &FilesSkipped()
+    const wxArrayString& GetSkippedFiles() const

         { return m_skippedFiles; }
 
 protected:
         { return m_skippedFiles; }
 
 protected:


@@ -347,14 +347,36 @@ wxULongLong wxDir::GetTotalSize(const wxString &dirname, wxArrayString *filesSki
         return wxInvalidSize;
 
     wxDirTraverserSumSize traverser;
         return wxInvalidSize;
 
     wxDirTraverserSumSize traverser;

-    if (dir.Traverse(traverser) == (size_t)-1 ||
-        traverser.GetTotalSize() == 0)
+    if (dir.Traverse(traverser) == (size_t)-1 )

         return wxInvalidSize;
 
     if (filesSkipped)
         return wxInvalidSize;
 
     if (filesSkipped)

-        *filesSkipped = traverser.FilesSkipped();
+        *filesSkipped = traverser.GetSkippedFiles();

 
     return traverser.GetTotalSize();
 }
 
 #endif // wxUSE_LONGLONG
 
     return traverser.GetTotalSize();
 }
 
 #endif // wxUSE_LONGLONG

+
+// ----------------------------------------------------------------------------
+// wxDir helpers
+// ----------------------------------------------------------------------------
+
+/* static */
+bool wxDir::Exists(const wxString& dir)
+{
+    return wxFileName::DirExists(dir);
+}
+
+/* static */
+bool wxDir::Make(const wxString &dir, int perm, int flags)
+{
+    return wxFileName::Mkdir(dir, perm, flags);
+}
+
+/* static */
+bool wxDir::Remove(const wxString &dir, int flags)
+{
+    return wxFileName::Rmdir(dir, flags);
+}
+