compilation fix

[wxWidgets.git] / src / mac / dirmac.cpp

diff --git a/src/mac/dirmac.cpp b/src/mac/dirmac.cpp
index c1b010f5f77966e0a30f3e41744d223d73567c11..0f250ccd5ec17ed9f1e2fa38afb3fbfdf57aec91 100644 (file)
--- a/src/mac/dirmac.cpp
+++ b/src/mac/dirmac.cpp
@@ -40,8 +40,14 @@
   #include <windows.h>
 #endif
 
-#include "MoreFiles.h"
-#include "MoreFilesExtras.h"
+#include "wx/mac/private.h"
+
+#ifdef __DARWIN__
+#  include "MoreFilesX.h"
+#else
+#  include "MoreFiles.h"
+#  include "MoreFilesExtras.h"
+#endif
 
 // ----------------------------------------------------------------------------
 // constants
@@ -100,6 +106,8 @@ private:
 wxDirData::wxDirData(const wxString& dirname)
          : m_dirname(dirname)
 {
+    OSErr err;
+    
     // throw away the trailing slashes
     size_t n = m_dirname.length();
     wxCHECK_RET( n, _T("empty dir name in wxDir") );
@@ -108,15 +116,27 @@ wxDirData::wxDirData(const wxString& dirname)
         ;
 
     m_dirname.Truncate(n + 1);
+    
+#ifdef __DARWIN__
+    FSRef theRef;
+
+    // get the FSRef associated with the POSIX path
+    err = FSPathMakeRef((const UInt8 *) m_dirname.c_str(), &theRef, NULL);
+    FSGetVRefNum(&theRef, &(m_CPB.hFileInfo.ioVRefNum));
+    
+    err = FSGetNodeID( &theRef , &m_dirId , &m_isDir ) ;
+#else
+    FSSpec fsspec ;
 
-       FSSpec fsspec ;
+    wxMacFilename2FSSpec( m_dirname , &fsspec ) ;
+    m_CPB.hFileInfo.ioVRefNum = fsspec.vRefNum ;
 
-       wxMacFilename2FSSpec( m_dirname , &fsspec ) ;
-       m_CPB.hFileInfo.ioVRefNum = fsspec.vRefNum ;
-       m_CPB.hFileInfo.ioNamePtr = m_name ;
-       m_index = 0 ;
+    err = FSpGetDirectoryID( &fsspec , &m_dirId , &m_isDir ) ;
+#endif
+    wxASSERT_MSG( (err == noErr) || (err == nsvErr) , "Error accessing directory " + m_dirname) ;
 
-       FSpGetDirectoryID( &fsspec , &m_dirId , &m_isDir ) ;
+    m_CPB.hFileInfo.ioNamePtr = m_name ;
+    m_index = 0 ;
 }
 
 wxDirData::~wxDirData()
@@ -138,63 +158,75 @@ bool wxDirData::Read(wxString *filename)
 #endif
     wxString result;
 
-       short err = noErr ;
+    short err = noErr ;
        
-       while ( err == noErr )
-       {
-               m_index++ ;
-               m_CPB.dirInfo.ioFDirIndex = m_index;
-               m_CPB.dirInfo.ioDrDirID = m_dirId;      /* we need to do this every time */
-               err = PBGetCatInfoSync((CInfoPBPtr)&m_CPB);
-               if ( err != noErr )
-                       break ;
-
+    while ( err == noErr )
+    {
+        m_index++ ;
+        m_CPB.dirInfo.ioFDirIndex = m_index;
+        m_CPB.dirInfo.ioDrDirID = m_dirId;     /* we need to do this every time */
+        err = PBGetCatInfoSync((CInfoPBPtr)&m_CPB);
+        if ( err != noErr )
+            break ;
+        
 #if TARGET_CARBON
-               p2cstrcpy( c_name, m_name ) ;
-               strcpy( (char *)m_name, c_name);
+        p2cstrcpy( c_name, m_name ) ;
+        strcpy( (char *)m_name, c_name);
 #else
-               p2cstr( m_name ) ;
+        p2cstr( m_name ) ;
 #endif
-               if ( ( m_CPB.dirInfo.ioFlAttrib & ioDirMask) != 0 && (m_flags & wxDIR_DIRS) ) //  we have a directory
-                       break ;
-                       
-               if ( ( m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(m_flags & wxDIR_FILES ) ) // its a file but we don't want it
-                       continue ;
-                        
-        if ( ( m_CPB.hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible ) && !(m_flags & wxDIR_HIDDEN) ) // its hidden but we don't want it
-                       continue ;
-
-               wxString file( m_name ) ;
-               if ( m_filespec.IsEmpty() || m_filespec == "*.*" || m_filespec == "*" )
-               {
-               }
-               else if ( m_filespec.Length() > 1 && m_filespec.Left(1) =="*" )
-               {
-                       if ( file.Right( m_filespec.Length() - 1 ).Upper() != m_filespec.Mid(1).Upper() )
-                       {
-                               continue ;
-                       }
-               }
-               else if ( m_filespec.Length() > 1 && m_filespec.Right(1) == "*" )
-               {
-                       if ( file.Left( m_filespec.Length() - 1 ).Upper() != m_filespec.Left( m_filespec.Length() - 1 ).Upper() )
-                       {
-                               continue ;
-                       }
-               }
-               else if ( file.Upper() != m_filespec.Upper() )
-               {
-                       continue ;
-               }
-
-               break ;
-       }
-       if ( err != noErr )
-       {
-               return FALSE ;
-       }
-
-       *filename = (char*) m_name ;
+        // its hidden but we don't want it
+        if ( ( m_CPB.hFileInfo.ioFlFndrInfo.fdFlags & kIsInvisible ) && !(m_flags & wxDIR_HIDDEN) )
+            continue ;
+#ifdef __DARWIN__
+        // under X, names that start with '.' are hidden
+        if ( ( m_name[0] == '.' ) && !(m_flags & wxDIR_HIDDEN) )
+            continue;
+#endif
+#if TARGET_CARBON
+        // under X thats the way the mounting points look like
+        if ( ( m_CPB.dirInfo.ioDrDirID == 0 ) && ( m_flags & wxDIR_DIRS) )
+            break ;
+#endif
+        //  we have a directory
+        if ( ( m_CPB.dirInfo.ioFlAttrib & ioDirMask) != 0 && (m_flags & wxDIR_DIRS) )
+            break ;
+        
+        // its a file but we don't want it
+        if ( ( m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(m_flags & wxDIR_FILES ) )
+            continue ;
+        
+        wxString file( m_name ) ;
+        if ( m_filespec.IsEmpty() || m_filespec == "*.*" || m_filespec == "*" )
+        {
+        }
+        else if ( m_filespec.Length() > 1 && m_filespec.Left(1) =="*" )
+        {
+            if ( file.Right( m_filespec.Length() - 1 ).Upper() != m_filespec.Mid(1).Upper() )
+            {
+                continue ;
+            }
+        }
+        else if ( m_filespec.Length() > 1 && m_filespec.Right(1) == "*" )
+        {
+            if ( file.Left( m_filespec.Length() - 1 ).Upper() != m_filespec.Left( m_filespec.Length() - 1 ).Upper() )
+            {
+                continue ;
+            }
+        }
+        else if ( file.Upper() != m_filespec.Upper() )
+        {
+            continue ;
+        }
+        
+        break ;
+    }
+    if ( err != noErr )
+    {
+        return FALSE ;
+    }
+    
+    *filename = (char*) m_name ;
 
     return TRUE;
 }
@@ -251,7 +283,10 @@ wxString wxDir::GetName() const
 
 wxDir::~wxDir()
 {
-    delete M_DIR;
+    if (M_DIR != NULL) {
+        delete M_DIR;
+        m_data = NULL;
+    }
 }
 
 // ----------------------------------------------------------------------------