X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/401eb3dec29c09b9afcc843842cba48b33a5089b..50679f941ec64c417c39582b276068fef8ca59cb:/src/unix/dir.cpp

diff --git a/src/unix/dir.cpp b/src/unix/dir.cpp
index 7be4969c30..d87bf47002 100644
--- a/src/unix/dir.cpp
+++ b/src/unix/dir.cpp
@@ -6,7 +6,7 @@
 // Created:     08.12.99
 // RCS-ID:      $Id$
 // Copyright:   (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-    #pragma implementation "dir.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -120,18 +116,26 @@ wxDirData::~wxDirData()
 bool wxDirData::Read(wxString *filename)
 {
     dirent *de = (dirent *)NULL;    // just to silence compiler warnings
-    bool matches = FALSE;
+    bool matches = false;
 
     // speed up string concatenation in the loop a bit
     wxString path = m_dirname;
     path += _T('/');
     path.reserve(path.length() + 255);
 
+    wxString de_d_name;
+
     while ( !matches )
     {
         de = readdir(m_dir);
         if ( !de )
-            return FALSE;
+            return false;
+
+#if wxUSE_UNICODE
+        de_d_name = wxConvFileName->cMB2WC( de->d_name );
+#else
+        de_d_name = de->d_name;
+#endif
 
         // don't return "." and ".." unless asked for
         if ( de->d_name[0] == '.' &&
@@ -146,12 +150,12 @@ bool wxDirData::Read(wxString *filename)
         }
 
         // check the type now
-        if ( !(m_flags & wxDIR_FILES) && !wxDir::Exists(path + de->d_name) )
+        if ( !(m_flags & wxDIR_FILES) && !wxDir::Exists(path + de_d_name) )
         {
             // it's a file, but we don't want them
             continue;
         }
-        else if ( !(m_flags & wxDIR_DIRS) && wxDir::Exists(path + de->d_name) )
+        else if ( !(m_flags & wxDIR_DIRS) && wxDir::Exists(path + de_d_name) )
         {
             // it's a dir, and we don't want it
             continue;
@@ -160,19 +164,19 @@ bool wxDirData::Read(wxString *filename)
         // finally, check the name
         if ( m_filespec.empty() )
         {
-            matches = m_flags & wxDIR_HIDDEN ? TRUE : de->d_name[0] != '.';
+            matches = m_flags & wxDIR_HIDDEN ? true : de->d_name[0] != '.';
         }
         else
         {
             // test against the pattern
-            matches = wxMatchWild(m_filespec, de->d_name,
+            matches = wxMatchWild(m_filespec, de_d_name,
                                   !(m_flags & wxDIR_HIDDEN));
         }
     }
 
-    *filename = de->d_name;
+    *filename = de_d_name;
 
-    return TRUE;
+    return true;
 }
 
 #else // old VMS (TODO)
@@ -188,7 +192,7 @@ wxDirData::~wxDirData()
 
 bool wxDirData::Read(wxString * WXUNUSED(filename))
 {
-    return FALSE;
+    return false;
 }
 
 #endif // not or new VMS/old VMS
@@ -200,7 +204,7 @@ bool wxDirData::Read(wxString * WXUNUSED(filename))
 /* static */
 bool wxDir::Exists(const wxString& dir)
 {
-    return wxPathExists(dir);
+    return wxDirExists(dir);
 }
 
 // ----------------------------------------------------------------------------
@@ -227,10 +231,10 @@ bool wxDir::Open(const wxString& dirname)
         delete M_DIR;
         m_data = NULL;
 
-        return FALSE;
+        return false;
     }
 
-    return TRUE;
+    return true;
 }
 
 bool wxDir::IsOpened() const
@@ -267,7 +271,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, _T("must wxDir::Open() first") );
 
     M_DIR->Rewind();
 
@@ -279,16 +283,16 @@ bool wxDir::GetFirst(wxString *filename,
 
 bool wxDir::GetNext(wxString *filename) const
 {
-    wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") );
+    wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
 
-    wxCHECK_MSG( filename, FALSE, _T("bad pointer in wxDir::GetNext()") );
+    wxCHECK_MSG( filename, false, _T("bad pointer in wxDir::GetNext()") );
 
     return M_DIR->Read(filename);
 }
 
 bool wxDir::HasSubDirs(const wxString& spec)
 {
-    wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") );
+    wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
 
     if ( spec.empty() )
     {
@@ -303,13 +307,13 @@ bool wxDir::HasSubDirs(const wxString& spec)
         // caller will learn it soon enough when it calls GetFirst(wxDIR)
         // anyhow
         wxStructStat stBuf;
-        if ( wxStat(M_DIR->GetName().fn_str(), &stBuf) == 0 )
+        if ( wxStat(M_DIR->GetName().c_str(), &stBuf) == 0 )
         {
             switch ( stBuf.st_nlink )
             {
                 case 2:
                     // just "." and ".."
-                    return FALSE;
+                    return false;
 
                 case 0:
                 case 1:
@@ -321,7 +325,7 @@ bool wxDir::HasSubDirs(const wxString& spec)
                     // assume we have subdirs - may turn out to be wrong if we
                     // have other hard links to this directory but it's not
                     // that bad as explained above
-                    return TRUE;
+                    return true;
             }
         }
     }