Fix for non-CG mode

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

diff --git a/src/mac/carbon/dirmac.cpp b/src/mac/carbon/dirmac.cpp
index 9ea9415df48423cec0c40edba9b8af9045c6b541..979f68a40e18da8724bf6df5e11fe4de796a4b43 100644 (file)
--- a/src/mac/carbon/dirmac.cpp
+++ b/src/mac/carbon/dirmac.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        msw/dir.cpp
+// Name:        mac/dirmac.cpp

 // Purpose:     wxDir implementation for Mac
 // Author:      Stefan Csomor
 // Modified by:
 // Purpose:     wxDir implementation for Mac
 // Author:      Stefan Csomor
 // Modified by:


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "dir.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,41 +24,17 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/dir.h"
+

 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif // PCH
 
 #ifndef WX_PRECOMP
     #include "wx/intl.h"
     #include "wx/log.h"
 #endif // PCH
 

-#include "wx/dir.h"
-#include "wx/filefn.h"          // for wxPathExists()
-
-#ifndef __DARWIN__
-  #include <windows.h>
-#endif
-
+#include "wx/filefn.h"          // for wxDirExists()
+#include "wx/filename.h"

 #include "wx/mac/private.h"
 
 #include "wx/mac/private.h"
 

-#ifdef __DARWIN__
-#  include "MoreFilesX.h"
-#else
-#  include "MoreFiles.h"
-#  include "MoreFilesExtras.h"
-#endif
-
-// ----------------------------------------------------------------------------
-// constants
-// ----------------------------------------------------------------------------
-
-#ifndef MAX_PATH
-    #define MAX_PATH 260        // from VC++ headers
-#endif
-
-// ----------------------------------------------------------------------------
-// macros
-// ----------------------------------------------------------------------------
-
-#define M_DIR       ((wxDirData *)m_data)
-

 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // private classes
 // ----------------------------------------------------------------------------


@@ -74,20 +46,17 @@ public:
     wxDirData(const wxString& dirname);
     ~wxDirData();
 
     wxDirData(const wxString& dirname);
     ~wxDirData();
 

+    void Close() ;

     void SetFileSpec(const wxString& filespec) { m_filespec = filespec; }
     void SetFlags(int flags) { m_flags = flags; }
 
     void SetFileSpec(const wxString& filespec) { m_filespec = filespec; }
     void SetFlags(int flags) { m_flags = flags; }
 

-    bool Read(wxString *filename); // reads the next 
+    bool Read(wxString *filename); // reads the next

     void Rewind() ;
 
     const wxString& GetName() const { return m_dirname; }
 
 private:
     void Rewind() ;
 
     const wxString& GetName() const { return m_dirname; }
 
 private:

-    CInfoPBRec            m_CPB ;
-    wxInt16                m_index ;
-    long                m_dirId ;
-    Str255                m_name ;
-    Boolean                m_isDir ;
+    FSIterator              m_iterator ;

 
     wxString m_dirname;
     wxString m_filespec;
 
     wxString m_dirname;
     wxString m_filespec;


@@ -106,8 +75,6 @@ private:
 wxDirData::wxDirData(const wxString& dirname)
          : m_dirname(dirname)
 {
 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") );
     // throw away the trailing slashes
     size_t n = m_dirname.length();
     wxCHECK_RET( n, _T("empty dir name in wxDir") );


@@ -116,119 +83,104 @@ wxDirData::wxDirData(const wxString& dirname)
         ;
 
     m_dirname.Truncate(n + 1);
         ;
 
     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 ;
-
-    wxMacFilename2FSSpec( m_dirname , &fsspec ) ;
-    m_CPB.hFileInfo.ioVRefNum = fsspec.vRefNum ;
-
-    err = FSpGetDirectoryID( &fsspec , &m_dirId , &m_isDir ) ;
-#endif
-    wxASSERT_MSG( (err == noErr) || (err == nsvErr) , "Error accessing directory " + m_dirname) ;
-
-    m_CPB.hFileInfo.ioNamePtr = m_name ;
-    m_index = 0 ;
+    m_iterator = NULL ;

 }
 
 wxDirData::~wxDirData()
 {
 }
 
 wxDirData::~wxDirData()
 {

+    Close() ;

 }
 
 }
 

-void wxDirData::Rewind() 
+void wxDirData::Close()

 {
 {

-    m_index = 0 ;
+    if ( m_iterator )
+    {
+        FSCloseIterator( m_iterator ) ;
+        m_iterator = NULL ;
+    }
+}
+
+void wxDirData::Rewind()
+{
+    Close() ;

 }
 
 bool wxDirData::Read(wxString *filename)
 {
 }
 
 bool wxDirData::Read(wxString *filename)
 {

-    if ( !m_isDir )
-        return FALSE ;
-        
-#if TARGET_CARBON
-    char c_name[256] ;
-#endif

     wxString result;
     wxString result;

+    OSStatus err = noErr ;
+    if ( NULL == m_iterator )
+    {
+        FSRef dirRef;
+        err = wxMacPathToFSRef( m_dirname , &dirRef ) ;
+        if ( err == noErr )
+        {
+            err = FSOpenIterator(&dirRef, kFSIterateFlat, &m_iterator);
+        }
+        if ( err )
+        {
+            Close() ;
+            return false ;
+        }
+    }
+
+    wxString name ;

 
 

-    short err = noErr ;
-    
-    while ( err == noErr )
+    while( noErr == err )

     {
     {

-        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 ;
+        HFSUniStr255 uniname ;
+        FSRef fileRef;
+        FSCatalogInfo catalogInfo;
+        ItemCount fetched = 0;
+
+        err = FSGetCatalogInfoBulk( m_iterator, 1, &fetched, NULL, kFSCatInfoNodeFlags | kFSCatInfoFinderInfo , &catalogInfo , &fileRef, NULL, &uniname );

         
         

-#if TARGET_CARBON
-        p2cstrcpy( c_name, m_name ) ;
-        strcpy( (char *)m_name, c_name);
-#else
-        p2cstr( m_name ) ;
-#endif
-        // 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 ;
+        // expected error codes 

         
         

+        if ( errFSNoMoreItems == err )
+            return false ;
+        if ( afpAccessDenied == err )
+            return false ;
+
+        if ( noErr != err )
+            break ;
+
+        name = wxMacHFSUniStrToString( &uniname ) ;
+
+        if ( ( name == wxT(".") || name == wxT("..") ) && !(m_flags & wxDIR_DOTDOT) )
+            continue;
+
+        if ( ( name[0U] == '.' ) && !(m_flags & wxDIR_HIDDEN ) )
+            continue ;
+
+        if ( (((FileInfo*)&catalogInfo.finderInfo)->finderFlags & kIsInvisible ) && !(m_flags & wxDIR_HIDDEN ) )
+            continue ;
+
+        // its a dir and we don't want it
+        if ( (catalogInfo.nodeFlags & kFSNodeIsDirectoryMask)  && !(m_flags & wxDIR_DIRS) )
+            continue ;
+

         // its a file but we don't want it
         // its a file but we don't want it

-        if ( ( m_CPB.dirInfo.ioFlAttrib & ioDirMask) == 0 && !(m_flags & wxDIR_FILES ) )
+        if ( (catalogInfo.nodeFlags & kFSNodeIsDirectoryMask) == 0  && !(m_flags & wxDIR_FILES ) )

             continue ;
             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 ( m_filespec.empty() || m_filespec == wxT("*.*") || m_filespec == wxT("*") )

         {
         {

-            if ( file.Left( m_filespec.Length() - 1 ).Upper() != m_filespec.Left( m_filespec.Length() - 1 ).Upper() )
-            {
-                continue ;
-            }

         }
         }

-        else if ( file.Upper() != m_filespec.Upper() )
+        else if ( !wxMatchWild(m_filespec, name , false) )

         {
             continue ;
         }
         {
             continue ;
         }

-        
+

         break ;
     }
     if ( err != noErr )
     {
         break ;
     }
     if ( err != noErr )
     {

-        return FALSE ;
+        return false ;

     }
     }

-    
-    *filename = (char*) m_name ;

 
 

-    return TRUE;
+    *filename = name ;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -238,7 +190,7 @@ bool wxDirData::Read(wxString *filename)
 /* static */
 bool wxDir::Exists(const wxString& dir)
 {
 /* static */
 bool wxDir::Exists(const wxString& dir)
 {

-    return wxPathExists(dir);
+    return wxDirExists(dir);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -254,10 +206,10 @@ wxDir::wxDir(const wxString& dirname)
 
 bool wxDir::Open(const wxString& dirname)
 {
 
 bool wxDir::Open(const wxString& dirname)
 {

-    delete M_DIR;
+    delete m_data;

     m_data = new wxDirData(dirname);
 
     m_data = new wxDirData(dirname);
 

-    return TRUE;
+    return true;

 }
 
 bool wxDir::IsOpened() const
 }
 
 bool wxDir::IsOpened() const


@@ -270,12 +222,12 @@ wxString wxDir::GetName() const
     wxString name;
     if ( m_data )
     {
     wxString name;
     if ( m_data )
     {

-    name = M_DIR->GetName();
-    if ( !name.empty() && (name.Last() == _T('/')) )
-    {
-        // chop off the last (back)slash
-        name.Truncate(name.length() - 1);
-    }
+        name = m_data->GetName();
+        if ( !name.empty() && (name.Last() == _T('/')) )
+        {
+            // chop off the last (back)slash
+            name.Truncate(name.length() - 1);
+        }

     }
 
     return name;
     }
 
     return name;


@@ -283,10 +235,8 @@ wxString wxDir::GetName() const
 
 wxDir::~wxDir()
 {
 
 wxDir::~wxDir()
 {

-    if (M_DIR != NULL) {
-        delete M_DIR;
-        m_data = NULL;
-    }
+    delete m_data;
+    m_data = NULL;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -297,21 +247,21 @@ bool wxDir::GetFirst(wxString *filename,
                      const wxString& filespec,
                      int flags) const
 {
                      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();
+    m_data->Rewind();

 
 

-    M_DIR->SetFileSpec(filespec);
-    M_DIR->SetFlags(flags);
+    m_data->SetFileSpec(filespec);
+    m_data->SetFlags(flags);

 
     return GetNext(filename);
 }
 
 bool wxDir::GetNext(wxString *filename) const
 {
 
     return GetNext(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);
+    return m_data->Read(filename);

 }
 }