X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..404b319a85dadd7decf7a5a5331020520031a41c:/src/msw/dir.cpp?ds=sidebyside

diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp
index 79635bd446..2eea8fe7ff 100644
--- a/src/msw/dir.cpp
+++ b/src/msw/dir.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        msw/dir.cpp
+// Name:        src/msw/dir.cpp
 // Purpose:     wxDir implementation for Win32
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -30,7 +30,6 @@
 #endif // PCH
 
 #include "wx/dir.h"
-#include "wx/filefn.h"          // for wxDirExists()
 
 #ifdef __WINDOWS__
     #include "wx/msw/private.h"
@@ -40,56 +39,64 @@
 // define the types and functions used for file searching
 // ----------------------------------------------------------------------------
 
+namespace
+{
+
 typedef WIN32_FIND_DATA FIND_STRUCT;
 typedef HANDLE FIND_DATA;
 typedef DWORD FIND_ATTR;
 
-static inline FIND_DATA InitFindData() { return INVALID_HANDLE_VALUE; }
+inline FIND_DATA InitFindData()
+{
+    return INVALID_HANDLE_VALUE;
+}
 
-static inline bool IsFindDataOk(FIND_DATA fd)
+inline bool IsFindDataOk(FIND_DATA fd)
 {
         return fd != INVALID_HANDLE_VALUE;
 }
 
-static inline void FreeFindData(FIND_DATA fd)
+inline void FreeFindData(FIND_DATA fd)
 {
-        if ( !::FindClose(fd) )
-        {
-            wxLogLastError(_T("FindClose"));
-        }
+    if ( !::FindClose(fd) )
+    {
+        wxLogLastError(wxT("FindClose"));
+    }
 }
 
-static inline FIND_DATA FindFirst(const wxString& spec,
-                                      FIND_STRUCT *finddata)
+inline FIND_DATA FindFirst(const wxString& spec,
+                           FIND_STRUCT *finddata)
 {
-        return ::FindFirstFile(spec, finddata);
+    return ::FindFirstFile(spec.t_str(), finddata);
 }
 
-static inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata)
+inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata)
 {
-        return ::FindNextFile(fd, finddata) != 0;
+    return ::FindNextFile(fd, finddata) != 0;
 }
 
-static const wxChar *GetNameFromFindData(FIND_STRUCT *finddata)
+const wxChar *GetNameFromFindData(FIND_STRUCT *finddata)
 {
-        return finddata->cFileName;
+    return finddata->cFileName;
 }
 
-static const FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)
+inline FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)
 {
-        return finddata->dwFileAttributes;
+    return finddata->dwFileAttributes;
 }
 
-static inline bool IsDir(FIND_ATTR attr)
+inline bool IsDir(FIND_ATTR attr)
 {
-        return (attr & FILE_ATTRIBUTE_DIRECTORY) != 0;
+    return (attr & FILE_ATTRIBUTE_DIRECTORY) != 0;
 }
 
-static inline bool IsHidden(FIND_ATTR attr)
+inline bool IsHidden(FIND_ATTR attr)
 {
-        return (attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0;
+    return (attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0;
 }
 
+} // anonymous namespace
+
 // ----------------------------------------------------------------------------
 // constants
 // ----------------------------------------------------------------------------
@@ -132,7 +139,7 @@ private:
 
     int      m_flags;
 
-    DECLARE_NO_COPY_CLASS(wxDirData)
+    wxDECLARE_NO_COPY_CLASS(wxDirData);
 };
 
 // ============================================================================
@@ -182,9 +189,12 @@ bool wxDirData::Read(wxString *filename)
         wxString filespec = m_dirname;
         if ( !wxEndsWithPathSeparator(filespec) )
         {
-            filespec += _T('\\');
+            filespec += wxT('\\');
         }
-        filespec += (!m_filespec ? _T("*.*") : m_filespec.c_str());
+        if ( !m_filespec )
+            filespec += wxT("*.*");
+        else
+            filespec += m_filespec;
 
         m_finddata = FindFirst(filespec, PTR_TO_FINDDATA);
 
@@ -196,9 +206,9 @@ bool wxDirData::Read(wxString *filename)
 #ifdef __WIN32__
         DWORD err = ::GetLastError();
 
-        if ( err != ERROR_FILE_NOT_FOUND )
+        if ( err != ERROR_FILE_NOT_FOUND && err != ERROR_NO_MORE_FILES )
         {
-            wxLogSysError(err, _("Can not enumerate files in directory '%s'"),
+            wxLogSysError(err, _("Cannot enumerate files in directory '%s'"),
                           m_dirname.c_str());
         }
 #endif // __WIN32__
@@ -225,7 +235,7 @@ bool wxDirData::Read(wxString *filename)
 
                 if ( err != ERROR_NO_MORE_FILES )
                 {
-                    wxLogLastError(_T("FindNext"));
+                    wxLogLastError(wxT("FindNext"));
                 }
 #endif // __WIN32__
                 //else: not an error, just no more (such) files
@@ -238,9 +248,9 @@ bool wxDirData::Read(wxString *filename)
         attr = GetAttrFromFindData(PTR_TO_FINDDATA);
 
         // don't return "." and ".." unless asked for
-        if ( name[0] == _T('.') &&
-             ((name[1] == _T('.') && name[2] == _T('\0')) ||
-              (name[1] == _T('\0'))) )
+        if ( name[0] == wxT('.') &&
+             ((name[1] == wxT('.') && name[2] == wxT('\0')) ||
+              (name[1] == wxT('\0'))) )
         {
             if ( !(m_flags & wxDIR_DOTDOT) )
                 continue;
@@ -276,16 +286,6 @@ bool wxDirData::Read(wxString *filename)
     return true;
 }
 
-// ----------------------------------------------------------------------------
-// wxDir helpers
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDir::Exists(const wxString& dir)
-{
-    return wxDirExists(dir);
-}
-
 // ----------------------------------------------------------------------------
 // wxDir construction/destruction
 // ----------------------------------------------------------------------------
@@ -300,9 +300,20 @@ wxDir::wxDir(const wxString& dirname)
 bool wxDir::Open(const wxString& dirname)
 {
     delete M_DIR;
-    m_data = new wxDirData(dirname);
 
-    return true;
+    // The Unix code does a similar test
+    if (wxDirExists(dirname))
+    {
+        m_data = new wxDirData(dirname);
+
+        return true;
+    }
+    else
+    {
+        m_data = NULL;
+
+        return false;
+    }
 }
 
 bool wxDir::IsOpened() const
@@ -319,9 +330,9 @@ wxString wxDir::GetName() const
         if ( !name.empty() )
         {
             // bring to canonical Windows form
-            name.Replace(_T("/"), _T("\\"));
+            name.Replace(wxT("/"), wxT("\\"));
 
-            if ( name.Last() == _T('\\') )
+            if ( name.Last() == wxT('\\') )
             {
                 // chop off the last (back)slash
                 name.Truncate(name.length() - 1);
@@ -332,9 +343,13 @@ wxString wxDir::GetName() const
     return name;
 }
 
-wxDir::~wxDir()
+void wxDir::Close()
 {
-    delete M_DIR;
+    if ( m_data )
+    {
+        delete m_data;
+        m_data = NULL;
+    }
 }
 
 // ----------------------------------------------------------------------------
@@ -345,7 +360,7 @@ bool wxDir::GetFirst(wxString *filename,
                      const wxString& filespec,
                      int flags) const
 {
-    wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
+    wxCHECK_MSG( IsOpened(), false, wxT("must wxDir::Open() first") );
 
     M_DIR->Rewind();
 
@@ -357,9 +372,9 @@ bool wxDir::GetFirst(wxString *filename,
 
 bool wxDir::GetNext(wxString *filename) const
 {
-    wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
+    wxCHECK_MSG( IsOpened(), false, wxT("must wxDir::Open() first") );
 
-    wxCHECK_MSG( filename, false, _T("bad pointer in wxDir::GetNext()") );
+    wxCHECK_MSG( filename, false, wxT("bad pointer in wxDir::GetNext()") );
 
     return M_DIR->Read(filename);
 }
@@ -374,9 +389,15 @@ extern bool
 wxGetDirectoryTimes(const wxString& dirname,
                     FILETIME *ftAccess, FILETIME *ftCreate, FILETIME *ftMod)
 {
+#ifdef __WXWINCE__
+    // FindFirst() is going to fail
+    wxASSERT_MSG( !dirname.empty(),
+                  wxT("incorrect directory name format in wxGetDirectoryTimes") );
+#else
     // FindFirst() is going to fail
-    wxASSERT_MSG( !dirname.empty() && dirname.Last() != _T('\\'),
-                  _T("incorrect directory name format in wxGetDirectoryTimes") );
+    wxASSERT_MSG( !dirname.empty() && dirname.Last() != wxT('\\'),
+                  wxT("incorrect directory name format in wxGetDirectoryTimes") );
+#endif
 
     FIND_STRUCT fs;
     FIND_DATA fd = FindFirst(dirname, &fs);