X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/886dd7d28e50c003cc88b81b968d487a3c17b0d7..ac55e0a1a8c344626a94bc055e018630ed77b004:/include/wx/dir.h?ds=inline

diff --git a/include/wx/dir.h b/include/wx/dir.h
index 317ad78593..212d0586a2 100644
--- a/include/wx/dir.h
+++ b/include/wx/dir.h
@@ -12,13 +12,9 @@
 #ifndef _WX_DIR_H_
 #define _WX_DIR_H_
 
-#if defined(__GNUG__) && !defined(__APPLE__)
-    #pragma interface "dir.h"
-#endif
+#include "wx/string.h"
 
-#ifndef WX_PRECOMP
-    #include  "wx/string.h"
-#endif
+class WXDLLIMPEXP_BASE wxArrayString;
 
 // ----------------------------------------------------------------------------
 // constants
@@ -49,9 +45,11 @@ enum wxDirTraverseResult
 // wxDirTraverser: helper class for wxDir::Traverse()
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT_BASE wxDirTraverser
+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
@@ -79,9 +77,9 @@ public:
 // wxDir: portable equivalent of {open/read/close}dir functions
 // ----------------------------------------------------------------------------
 
-class WXDLLEXPORT_BASE wxDirData;
+class WXDLLIMPEXP_BASE wxDirData;
 
-class WXDLLEXPORT_BASE wxDir
+class WXDLLIMPEXP_BASE wxDir
 {
 public:
     // test for existence of a directory with the given name
@@ -102,7 +100,7 @@ public:
     // 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)
@@ -112,7 +110,7 @@ public:
     // -------------------------
 
     // 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;
@@ -140,6 +138,13 @@ public:
                               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);
+
 private:
     friend class wxDirData;