X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bedaf53eaf4e2a860b34d4ff5e0b1928ce8fa5c9..1c469f7f4e85bd5212bf0409be0384a7b89405df:/src/mac/carbon/dirmac.cpp

diff --git a/src/mac/carbon/dirmac.cpp b/src/mac/carbon/dirmac.cpp
index 2a3e4c7221..5aed922f84 100644
--- a/src/mac/carbon/dirmac.cpp
+++ b/src/mac/carbon/dirmac.cpp
@@ -36,16 +36,12 @@
 #include "wx/dir.h"
 #include "wx/filefn.h"          // for wxPathExists()
 
-#ifndef __WXMAC_X__
+#ifndef __DARWIN__
   #include <windows.h>
 #endif
 
-#if defined(__WXMAC__) && !defined(__UNIX__)
-  #include "morefile.h"
-  #include "moreextr.h"
-  #include "fullpath.h"
-  #include "fspcompa.h"
-#endif
+#include "MoreFiles.h"
+#include "MoreFilesExtras.h"
 
 // ----------------------------------------------------------------------------
 // constants
@@ -78,6 +74,8 @@ public:
     bool Read(wxString *filename); // reads the next 
     void Rewind() ;
 
+    const wxString& GetName() const { return m_dirname; }
+
 private:
 	CInfoPBRec			m_CPB ;
 	wxInt16				m_index ;
@@ -118,11 +116,7 @@ wxDirData::wxDirData(const wxString& dirname)
 	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
 }
 
 wxDirData::~wxDirData()
@@ -239,6 +233,22 @@ bool wxDir::IsOpened() const
     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()
 {
     delete M_DIR;