Use path separator, not "/"

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

diff --git a/src/mac/dirmac.cpp b/src/mac/dirmac.cpp
index 2a3e4c7221b64db7bb4dfa4eb64c7391b821b6b0..0ccaf0b8e953dc4029c279023ba179d12e627803 100644 (file)
--- a/src/mac/dirmac.cpp
+++ b/src/mac/dirmac.cpp
@@ -36,16 +36,14 @@
 #include "wx/dir.h"
 #include "wx/filefn.h"          // for wxPathExists()
 
 #include "wx/dir.h"
 #include "wx/filefn.h"          // for wxPathExists()
 

-#ifndef __WXMAC_X__
+#ifndef __DARWIN__

   #include <windows.h>
 #endif
 
   #include <windows.h>
 #endif
 

-#if defined(__WXMAC__) && !defined(__UNIX__)
-  #include "morefile.h"
-  #include "moreextr.h"
-  #include "fullpath.h"
-  #include "fspcompa.h"
-#endif
+#include "wx/mac/private.h"
+
+#include "MoreFiles.h"
+#include "MoreFilesExtras.h"

 
 // ----------------------------------------------------------------------------
 // constants
 
 // ----------------------------------------------------------------------------
 // constants


@@ -78,6 +76,8 @@ public:
     bool Read(wxString *filename); // reads the next 
     void Rewind() ;
 
     bool Read(wxString *filename); // reads the next 
     void Rewind() ;
 

+    const wxString& GetName() const { return m_dirname; }
+

 private:
        CInfoPBRec                      m_CPB ;
        wxInt16                         m_index ;
 private:
        CInfoPBRec                      m_CPB ;
        wxInt16                         m_index ;


@@ -118,11 +118,8 @@ wxDirData::wxDirData(const wxString& dirname)
        m_CPB.hFileInfo.ioNamePtr = m_name ;
        m_index = 0 ;
 
        m_CPB.hFileInfo.ioNamePtr = m_name ;
        m_index = 0 ;
 

-#ifdef __WXMAC_X__
-       // TODO: what are we supposed to do for Mac OS X
-#else
-       FSpGetDirectoryID( &fsspec , &m_dirId , &m_isDir ) ;
-#endif
+       OSErr err = FSpGetDirectoryID( &fsspec , &m_dirId , &m_isDir ) ;
+        wxASSERT_MSG( err == noErr , "Error accessing directory") ;

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


@@ -160,6 +157,11 @@ bool wxDirData::Read(wxString *filename)
                strcpy( (char *)m_name, c_name);
 #else
                p2cstr( m_name ) ;
                strcpy( (char *)m_name, c_name);
 #else
                p2cstr( m_name ) ;

+#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
                if ( ( m_CPB.dirInfo.ioFlAttrib & ioDirMask) != 0 && (m_flags & wxDIR_DIRS) ) //  we have a directory
                        break ;
 #endif
                if ( ( m_CPB.dirInfo.ioFlAttrib & ioDirMask) != 0 && (m_flags & wxDIR_DIRS) ) //  we have a directory
                        break ;


@@ -171,7 +173,7 @@ bool wxDirData::Read(wxString *filename)
                        continue ;
 
                wxString file( m_name ) ;
                        continue ;
 
                wxString file( m_name ) ;

-               if ( m_filespec.IsEmpty() || m_filespec == "*.*" )
+               if ( m_filespec.IsEmpty() || m_filespec == "*.*" || m_filespec == "*" )

                {
                }
                else if ( m_filespec.Length() > 1 && m_filespec.Left(1) =="*" )
                {
                }
                else if ( m_filespec.Length() > 1 && m_filespec.Left(1) =="*" )


@@ -239,9 +241,28 @@ bool wxDir::IsOpened() const
     return m_data != NULL;
 }
 
     return m_data != NULL;
 }
 

+wxString wxDir::GetName() const
+{
+    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);
+       }
+    }
+
+    return name;
+}
+

 wxDir::~wxDir()
 {
 wxDir::~wxDir()
 {

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

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