Avoid warnings from VC++ 5.0

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

diff --git a/include/wx/dir.h b/include/wx/dir.h
index 317ad785930f8a352d44645beb9f5bd7e61c86cc..212d0586a2d0c75e2e81c7d33acc75827ba4b041 100644 (file)
--- a/include/wx/dir.h
+++ b/include/wx/dir.h
@@ -12,13 +12,9 @@
 #ifndef _WX_DIR_H_
 #define _WX_DIR_H_
 
 #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
 
 // ----------------------------------------------------------------------------
 // constants


@@ -49,9 +45,11 @@ enum wxDirTraverseResult
 // wxDirTraverser: helper class for wxDir::Traverse()
 // ----------------------------------------------------------------------------
 
 // wxDirTraverser: helper class for wxDir::Traverse()
 // ----------------------------------------------------------------------------
 

-class WXDLLEXPORT_BASE wxDirTraverser
+class WXDLLIMPEXP_BASE wxDirTraverser

 {
 public:
 {
 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


@@ -79,9 +77,9 @@ public:
 // wxDir: portable equivalent of {open/read/close}dir functions
 // ----------------------------------------------------------------------------
 
 // 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
 {
 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);
 
     // 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)


@@ -112,7 +110,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;


@@ -140,6 +138,13 @@ 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);
+

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