Don't define __STRICT_ANSI__, we should build both with and without it.

[wxWidgets.git] / include / wx / dir.h

diff --git a/include/wx/dir.h b/include/wx/dir.h
index b7389f17087d625568d7f361a70d5d69798020e9..f23862e0a943f4013101fff45725f000a16c98ac 100644 (file)
--- a/include/wx/dir.h
+++ b/include/wx/dir.h
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.12.99
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     08.12.99

-// RCS-ID:      $Id$

 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////


@@ -14,6 +13,7 @@
 
 #include "wx/longlong.h"
 #include "wx/string.h"
 
 #include "wx/longlong.h"
 #include "wx/string.h"

+#include "wx/filefn.h"      // for wxS_DIR_DEFAULT

 
 class WXDLLIMPEXP_FWD_BASE wxArrayString;
 
 
 class WXDLLIMPEXP_FWD_BASE wxArrayString;
 


@@ -21,14 +21,17 @@ class WXDLLIMPEXP_FWD_BASE wxArrayString;
 // constants
 // ----------------------------------------------------------------------------
 
 // constants
 // ----------------------------------------------------------------------------
 

-// these flags define what kind of filenames is included in the list of files
-// enumerated by GetFirst/GetNext
-enum
+// These flags affect the behaviour of GetFirst/GetNext() and Traverse().
+// They define what types are included in the list of items they produce.
+// Note that wxDIR_NO_FOLLOW is relevant only on Unix and ignored under systems
+// not supporting symbolic links.
+enum wxDirFlags

 {
     wxDIR_FILES     = 0x0001,       // include files
     wxDIR_DIRS      = 0x0002,       // include directories
     wxDIR_HIDDEN    = 0x0004,       // include hidden files
     wxDIR_DOTDOT    = 0x0008,       // include '.' and '..'
 {
     wxDIR_FILES     = 0x0001,       // include files
     wxDIR_DIRS      = 0x0002,       // include directories
     wxDIR_HIDDEN    = 0x0004,       // include hidden files
     wxDIR_DOTDOT    = 0x0008,       // include '.' and '..'

+    wxDIR_NO_FOLLOW = 0x0010,       // don't dereference any symlink

 
     // by default, enumerate everything except '.' and '..'
     wxDIR_DEFAULT   = wxDIR_FILES | wxDIR_DIRS | wxDIR_HIDDEN
 
     // by default, enumerate everything except '.' and '..'
     wxDIR_DEFAULT   = wxDIR_FILES | wxDIR_DIRS | wxDIR_HIDDEN


@@ -83,8 +86,6 @@ class WXDLLIMPEXP_FWD_BASE wxDirData;
 class WXDLLIMPEXP_BASE wxDir
 {
 public:
 class WXDLLIMPEXP_BASE wxDir
 {
 public:

-    // test for existence of a directory with the given name
-    static bool Exists(const wxString& dir);

 
     // ctors
     // -----
 
     // ctors
     // -----


@@ -95,18 +96,26 @@ public:
     // opens the directory for enumeration, use IsOpened() to test success
     wxDir(const wxString& dir);
 
     // opens the directory for enumeration, use IsOpened() to test success
     wxDir(const wxString& dir);
 

-    // dtor cleans up the associated resources
-    ~wxDir();
+    // dtor calls Close() automatically
+    ~wxDir() { Close(); }

 
     // open the directory for enumerating
     bool Open(const wxString& dir);
 
 
     // open the directory for enumerating
     bool Open(const wxString& dir);
 

+    // close the directory, Open() can be called again later
+    void Close();
+

     // returns true if the directory was successfully opened
     bool IsOpened() const;
 
     // get the full name of the directory (without '/' at the end)
     wxString GetName() const;
 
     // returns true if the directory was successfully opened
     bool IsOpened() const;
 
     // get the full name of the directory (without '/' at the end)
     wxString GetName() const;
 

+    // Same as GetName() but does include the trailing separator, unless the
+    // string is empty (only for invalid directories).
+    wxString GetNameWithSep() const;
+
+

     // file enumeration routines
     // -------------------------
 
     // file enumeration routines
     // -------------------------
 


@@ -151,6 +160,20 @@ public:
     static wxULongLong GetTotalSize(const wxString &dir, wxArrayString *filesSkipped = NULL);
 #endif // wxUSE_LONGLONG
 
     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;
 
 private:
     friend class wxDirData;