changing to wxDC, so that wxGCDC can be used as well

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

diff --git a/include/wx/dir.h b/include/wx/dir.h
index 4a49f7c6bc9db6619efc6aa012482725ccb1b4e4..e41495513d76d487f96f633442f833feab782abf 100644 (file)
--- a/include/wx/dir.h
+++ b/include/wx/dir.h
@@ -12,15 +12,10 @@
 #ifndef _WX_DIR_H_
 #define _WX_DIR_H_
 
 #ifndef _WX_DIR_H_
 #define _WX_DIR_H_
 

-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma interface "dir.h"
-#endif
+#include "wx/longlong.h"
+#include "wx/string.h"

 
 

-#ifndef WX_PRECOMP
-    #include "wx/string.h"
-#endif
-
-class WXDLLIMPEXP_BASE wxArrayString;
+class WXDLLIMPEXP_FWD_BASE wxArrayString;

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -54,6 +49,8 @@ enum wxDirTraverseResult
 class WXDLLIMPEXP_BASE wxDirTraverser
 {
 public:
 class WXDLLIMPEXP_BASE wxDirTraverser
 {
 public:

+    /// a virtual dtor has been provided since this class has virtual members
+    virtual ~wxDirTraverser() { }

     // called for each file found by wxDir::Traverse()
     //
     // return wxDIR_STOP or wxDIR_CONTINUE from here (wxDIR_IGNORE doesn't
     // called for each file found by wxDir::Traverse()
     //
     // return wxDIR_STOP or wxDIR_CONTINUE from here (wxDIR_IGNORE doesn't


@@ -81,7 +78,7 @@ public:
 // wxDir: portable equivalent of {open/read/close}dir functions
 // ----------------------------------------------------------------------------
 
 // wxDir: portable equivalent of {open/read/close}dir functions
 // ----------------------------------------------------------------------------
 

-class WXDLLIMPEXP_BASE wxDirData;
+class WXDLLIMPEXP_FWD_BASE wxDirData;

 
 class WXDLLIMPEXP_BASE wxDir
 {
 
 class WXDLLIMPEXP_BASE wxDir
 {


@@ -104,7 +101,7 @@ public:
     // open the directory for enumerating
     bool Open(const wxString& dir);
 
     // open the directory for enumerating
     bool Open(const wxString& dir);
 

-    // returns TRUE if the directory was successfully opened
+    // returns true if the directory was successfully opened

     bool IsOpened() const;
 
     // get the full name of the directory (without '/' at the end)
     bool IsOpened() const;
 
     // get the full name of the directory (without '/' at the end)


@@ -114,7 +111,7 @@ public:
     // -------------------------
 
     // start enumerating all files matching filespec (or all files if it is
     // -------------------------
 
     // start enumerating all files matching filespec (or all files if it is

-    // empty) and flags, return TRUE on success
+    // empty) and flags, return true on success

     bool GetFirst(wxString *filename,
                   const wxString& filespec = wxEmptyString,
                   int flags = wxDIR_DEFAULT) const;
     bool GetFirst(wxString *filename,
                   const wxString& filespec = wxEmptyString,
                   int flags = wxDIR_DEFAULT) const;


@@ -142,6 +139,18 @@ public:
                               const wxString& filespec = wxEmptyString,
                               int flags = wxDIR_DEFAULT);
 
                               const wxString& filespec = wxEmptyString,
                               int flags = wxDIR_DEFAULT);
 

+    // check if there any files matching the given filespec under the given
+    // directory (i.e. searches recursively), return the file path if found or
+    // empty string otherwise
+    static wxString FindFirst(const wxString& dirname,
+                              const wxString& filespec,
+                              int flags = wxDIR_DEFAULT);
+
+#if wxUSE_LONGLONG
+    // returns the size of all directories recursively found in given path
+    static wxULongLong GetTotalSize(const wxString &dir, wxArrayString *filesSkipped = NULL);
+#endif // wxUSE_LONGLONG
+

 private:
     friend class wxDirData;
 
 private:
     friend class wxDirData;