added wxDir::FindFirst() (modified patch 1525502)

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

diff --git a/docs/changes.txt b/docs/changes.txt
index 060487d33c372e587ef64e03cab205aeb6b2834c..694bd0ccd6ad53e569fc3a88f2985396d4d66282 100644 (file)
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -48,6 +48,10 @@ Major changes in 2.7 release
 2.7.1
 -----
 
+All:
+
+- Added wxDir::FindFirst() (Francesco Montorsi)
+
 All (GUI):
 
 - Added wxID_PAGE_SETUP standard id

diff --git a/docs/latex/wx/dir.tex b/docs/latex/wx/dir.tex
index ed5c9d44bf03772236bc8347a6f1a4eb3ac0686f..efc0792a5bea70731c03b69dcdbe0e88599b75b4 100644 (file)
--- a/docs/latex/wx/dir.tex
+++ b/docs/latex/wx/dir.tex
@@ -116,6 +116,22 @@ subdirectories (both flags are included in the value by default).
 See also: \helpref{Traverse}{wxdirtraverse}
 
 
+\membersection{wxDir::FindFirst}\label{wxdirfindfirst}
+
+\func{static wxString}{FindFirst}{\param{const wxString\& }{dirname}, \param{const wxString\& }{filespec}, \param{int }{flags = wxDIR\_DEFAULT}}
+
+The function returns the path of the first file matching the given \arg{filespec}
+or an empty string if there are no files matching it.
+
+The \arg{flags} parameter may or may not include {\tt wxDIR\_FILES}, the
+function always behaves as if it were specified. By default, \arg{flags} 
+includes {\tt wxDIR\_DIRS} and so the function recurses into the subdirectories
+but if this flag is not specified, the function restricts the search only to
+the directory \arg{dirname} itself.
+
+See also: \helpref{Traverse}{wxdirtraverse}
+
+
 \membersection{wxDir::GetFirst}\label{wxdirgetfirst}
 
 \constfunc{bool}{GetFirst}{\param{wxString* }{filename}, \param{const wxString\& }{filespec = wxEmptyString}, \param{int }{flags = wxDIR\_DEFAULT}}

diff --git a/include/wx/dir.h b/include/wx/dir.h
index c87b753f6d39be2084253ccac0f01d2aaabb87ae..212d0586a2d0c75e2e81c7d33acc75827ba4b041 100644 (file)
--- a/include/wx/dir.h
+++ b/include/wx/dir.h
@@ -138,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;
 

diff --git a/src/common/dircmn.cpp b/src/common/dircmn.cpp
index 9b385e5a188c62d23211bb01812802ae27ddcebb..bed42a56a98ea1c1300c432e899406ef38a6211f 100644 (file)
--- a/src/common/dircmn.cpp
+++ b/src/common/dircmn.cpp
@@ -236,3 +236,51 @@ size_t wxDir::GetAllFiles(const wxString& dirname,
 
     return nFiles;
 }
+
+// ----------------------------------------------------------------------------
+// wxDir::FindFirst()
+// ----------------------------------------------------------------------------
+
+class wxDirTraverserFindFirst : public wxDirTraverser
+{
+public:
+    wxDirTraverserFindFirst() { }
+
+    virtual wxDirTraverseResult OnFile(const wxString& filename)
+    {
+        m_file = filename;
+        return wxDIR_STOP;
+    }
+
+    virtual wxDirTraverseResult OnDir(const wxString& WXUNUSED(dirname))
+    {
+        return wxDIR_CONTINUE;
+    }
+
+    const wxString& GetFile() const
+    {
+        return m_file;
+    }
+
+private:
+    wxString m_file;
+
+    DECLARE_NO_COPY_CLASS(wxDirTraverserFindFirst)
+};
+
+/* static */
+wxString wxDir::FindFirst(const wxString& dirname,
+                          const wxString& filespec,
+                          int flags)
+{
+    wxDir dir(dirname);
+    if ( dir.IsOpened() )
+    {
+        wxDirTraverserFindFirst traverser;
+
+        dir.Traverse(traverser, filespec, flags | wxDIR_FILES);
+        return traverser.GetFile();
+    }
+
+    return wxEmptyString;
+}