X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f5c6eb5c178b44f4400495e06274ffd130635190..2fe212b0336512aac9eace69fab09ce856b0bf4b:/src/mac/carbon/dirmac.cpp?ds=inline diff --git a/src/mac/carbon/dirmac.cpp b/src/mac/carbon/dirmac.cpp index 36835cd68c..5aed922f84 100644 --- a/src/mac/carbon/dirmac.cpp +++ b/src/mac/carbon/dirmac.cpp @@ -40,12 +40,8 @@ #include #endif -#ifndef __DARWIN__ - #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 __DARWIN__ - // 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;