Remove identic implementations of wxDir::Exists from platform-specific files and...

Add wxDir::Make() and wxDir::Remove() for coherency with wxDir::Exists() and document them as simple aliases to wxFileName functions, just a bit more readable.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@64632 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/dir.h b/include/wx/dir.h
index fa50bb25682eabaac950e390fab9392048517403..980e5f2138287892c1f139de57a30b8dfadf9ccb 100644 (file)
--- a/include/wx/dir.h
+++ b/include/wx/dir.h
@@ -83,8 +83,6 @@ class WXDLLIMPEXP_FWD_BASE wxDirData;
 class WXDLLIMPEXP_BASE wxDir
 {
 public:
-    // test for existence of a directory with the given name
-    static bool Exists(const wxString& dir);
 
     // ctors
     // -----
@@ -106,6 +104,7 @@ public:
 
     // get the full name of the directory (without '/' at the end)
     wxString GetName() const;
+    
 
     // file enumeration routines
     // -------------------------
@@ -151,6 +150,20 @@ public:
     static wxULongLong GetTotalSize(const wxString &dir, wxArrayString *filesSkipped = NULL);
 #endif // wxUSE_LONGLONG
 
+
+    // static utilities for directory management
+    // (alias to wxFileName's functions for dirs)
+    // -----------------------------------------
+    
+    // test for existence of a directory with the given name
+    static bool Exists(const wxString& dir);
+
+    static bool Make(const wxString &dir, int perm = wxS_DIR_DEFAULT,
+                     int flags = 0);
+
+    static bool Remove(const wxString &dir, int flags = 0);
+    
+
 private:
     friend class wxDirData;
 

diff --git a/interface/wx/dir.h b/interface/wx/dir.h
index 1b9ba583135fc1b0f51042109ec4ed835b8ed568..213db2b3fc7211050cb69666ecd0b91579e6222a 100644 (file)
--- a/interface/wx/dir.h
+++ b/interface/wx/dir.h
@@ -266,12 +266,29 @@ public:
     */
     bool IsOpened() const;
 
+    /**
+        Creates a directory.
+        
+        This is just an alias for wxFileName::Mkdir(); refer to that function
+        for more info.
+    */
+    static bool Make(const wxString &dir, int perm = wxS_DIR_DEFAULT,
+                     int flags = 0);
+
     /**
         Open the directory for enumerating, returns @true on success or @false
         if an error occurred.
     */
     bool Open(const wxString& dir);
 
+    /**
+        Removes a directory.
+        
+        This is just an alias for wxFileName::Rmdir(); refer to that function
+        for more info.
+    */
+    static bool Remove(const wxString &dir, int flags = 0);
+    
     /**
         Enumerate all files and directories under the given directory
         recursively calling the element of the provided wxDirTraverser object

diff --git a/interface/wx/filename.h b/interface/wx/filename.h
index 0e78b2d38fa7933ff004c1ce0e0b8061afbb0311..8cbf0c3b4486bd2959cc3d77a53ead9ee88c0775 100644 (file)
--- a/interface/wx/filename.h
+++ b/interface/wx/filename.h
@@ -456,7 +456,7 @@ public:
     bool DirExists() const;
 
     /**
-        Returns @true if the directory with this name exists.
+        Returns @true if the directory with name @a dir exists.
     */
     static bool DirExists(const wxString& dir);
 
@@ -475,7 +475,7 @@ public:
     bool FileExists() const;
 
     /**
-        Returns @true if the file with this name exists.
+        Returns @true if the file with name @a file exists.
 
         @see DirExists()
     */

diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index 79ce97e0a3814549c45cf619eac4b24ec838500a..20d22684b90ee3d97dd90bfa982a6fdedebad134 100644 (file)
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -356,4 +356,26 @@ wxULongLong wxDir::GetTotalSize(const wxString &dirname, wxArrayString *filesSki
     return traverser.GetTotalSize();
 }
 
+// ----------------------------------------------------------------------------
+// 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);
+}
+    
 #endif // wxUSE_LONGLONG

diff --git a/src/mgl/dirmgl.cpp b/src/mgl/dirmgl.cpp
index cc28a6aa594a312865862471e619482391b9551c..8405be0bdd18981a8ed3a22d2058880a20ae7565 100644 (file)
--- a/src/mgl/dirmgl.cpp
+++ b/src/mgl/dirmgl.cpp
@@ -179,17 +179,6 @@ bool wxDirData::Read(wxString *filename)
     return true;
 }
 
-
-// ----------------------------------------------------------------------------
-// wxDir helpers
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDir::Exists(const wxString& dir)
-{
-    return wxDirExists(dir);
-}
-
 // ----------------------------------------------------------------------------
 // wxDir construction/destruction
 // ----------------------------------------------------------------------------

diff --git a/src/msdos/dir.cpp b/src/msdos/dir.cpp
index d62fadd3cb95246868f0168c69a1121aadfb8b67..7693fb10b4e588b96b5099a76ac6d26450cf9257 100644 (file)
--- a/src/msdos/dir.cpp
+++ b/src/msdos/dir.cpp
@@ -30,7 +30,6 @@
 #endif // PCH
 
 #include "wx/dir.h"
-#include "wx/filefn.h"          // for wxDirExists()
 
 // ----------------------------------------------------------------------------
 // define the types and functions used for file searching
@@ -58,16 +57,6 @@
 // implementation
 // ============================================================================
 
-// ----------------------------------------------------------------------------
-// wxDir helpers
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDir::Exists(const wxString& WXUNUSED(dir))
-{
-    return false;
-}
-
 // ----------------------------------------------------------------------------
 // wxDir construction/destruction
 // ----------------------------------------------------------------------------

diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp
index d7302d23c749eda291b961b80996b4b61cf10678..81c312e825794dc1490a35e17080e3cb223fe7cf 100644 (file)
--- a/src/msw/dir.cpp
+++ b/src/msw/dir.cpp
@@ -30,7 +30,6 @@
 #endif // PCH
 
 #include "wx/dir.h"
-#include "wx/filefn.h"          // for wxDirExists()
 
 #ifdef __WINDOWS__
     #include "wx/msw/private.h"
@@ -287,16 +286,6 @@ bool wxDirData::Read(wxString *filename)
     return true;
 }
 
-// ----------------------------------------------------------------------------
-// wxDir helpers
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDir::Exists(const wxString& dir)
-{
-    return wxDirExists(dir);
-}
-
 // ----------------------------------------------------------------------------
 // wxDir construction/destruction
 // ----------------------------------------------------------------------------

diff --git a/src/os2/dir.cpp b/src/os2/dir.cpp
index f0ec71d6706c2f6fe231d7a1900dbd495ced6900..1b81050082d0567e24be43d710a8dbaa92e4fd50 100644 (file)
--- a/src/os2/dir.cpp
+++ b/src/os2/dir.cpp
@@ -308,18 +308,6 @@ bool wxDirData::Read(
     return true;
 } // end of wxDirData::Read
 
-// ----------------------------------------------------------------------------
-// wxDir helpers
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDir::Exists(
-  const wxString&                   rsDir
-)
-{
-    return wxDirExists(rsDir);
-} // end of wxDir::Exists
-
 // ----------------------------------------------------------------------------
 // wxDir construction/destruction
 // ----------------------------------------------------------------------------

diff --git a/src/osx/carbon/dirmac.cpp b/src/osx/carbon/dirmac.cpp
index 6ac3a147f54ed2e3b127e2898ecb654dfefadbe7..493829f1f6c3fd2351fada1bd2ee8328bd94b6c1 100644 (file)
--- a/src/osx/carbon/dirmac.cpp
+++ b/src/osx/carbon/dirmac.cpp
@@ -31,7 +31,6 @@
     #include "wx/log.h"
 #endif // PCH
 
-#include "wx/filefn.h"          // for wxDirExists()
 #include "wx/filename.h"
 #include "wx/osx/private.h"
 
@@ -185,16 +184,6 @@ bool wxDirData::Read(wxString *filename)
     return true;
 }
 
-// ----------------------------------------------------------------------------
-// wxDir helpers
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDir::Exists(const wxString& dir)
-{
-    return wxDirExists(dir);
-}
-
 // ----------------------------------------------------------------------------
 // wxDir construction/destruction
 // ----------------------------------------------------------------------------

diff --git a/src/palmos/dir.cpp b/src/palmos/dir.cpp
index 0ad3719ceca99daeb27d0c2b417f3abf7d072634..6e1d49069dc424748306a88cbbe6f09d14a05df5 100644 (file)
--- a/src/palmos/dir.cpp
+++ b/src/palmos/dir.cpp
@@ -30,7 +30,6 @@
 #endif // PCH
 
 #include "wx/dir.h"
-#include "wx/filefn.h"          // for wxDirExists()
 
 #include "pfall.h"
 
@@ -198,16 +197,6 @@ bool wxDirData::Read(wxString *filename)
     return true;
 }
 
-// ----------------------------------------------------------------------------
-// wxDir helpers
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDir::Exists(const wxString& dir)
-{
-    return wxDirExists(dir);
-}
-
 // ----------------------------------------------------------------------------
 // wxDir construction/destruction
 // ----------------------------------------------------------------------------

diff --git a/src/unix/dir.cpp b/src/unix/dir.cpp
index 5a0554edf49c66cd2dccb3f1d3cee7c98fee3b10..d016047cb196dc9c98326f297a23d3bba3ed4cbe 100644 (file)
--- a/src/unix/dir.cpp
+++ b/src/unix/dir.cpp
@@ -197,16 +197,6 @@ bool wxDirData::Read(wxString * WXUNUSED(filename))
 
 #endif // not or new VMS/old VMS
 
-// ----------------------------------------------------------------------------
-// wxDir helpers
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDir::Exists(const wxString& dir)
-{
-    return wxDirExists(dir);
-}
-
 // ----------------------------------------------------------------------------
 // wxDir construction/destruction
 // ----------------------------------------------------------------------------