X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..47e175a24f862aa8b7ca7dd4a2bb5957991e7f2d:/src/osx/carbon/dirmac.cpp diff --git a/src/osx/carbon/dirmac.cpp b/src/osx/carbon/dirmac.cpp index 1fabdec5cd..71e6436625 100644 --- a/src/osx/carbon/dirmac.cpp +++ b/src/osx/carbon/dirmac.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: mac/dirmac.cpp +// Name: src/osx/carbon/dirmac.cpp // Purpose: wxDir implementation for Mac // Author: Stefan Csomor // Modified by: @@ -31,7 +31,6 @@ #include "wx/log.h" #endif // PCH -#include "wx/filefn.h" // for wxDirExists() #include "wx/filename.h" #include "wx/osx/private.h" @@ -135,9 +134,9 @@ bool wxDirData::Read(wxString *filename) ItemCount fetched = 0; err = FSGetCatalogInfoBulk( m_iterator, 1, &fetched, NULL, kFSCatInfoNodeFlags | kFSCatInfoFinderInfo , &catalogInfo , &fileRef, NULL, &uniname ); - - // expected error codes - + + // expected error codes + if ( errFSNoMoreItems == err ) return false ; if ( afpAccessDenied == err ) @@ -185,16 +184,6 @@ bool wxDirData::Read(wxString *filename) return true; } -// ---------------------------------------------------------------------------- -// wxDir helpers -// ---------------------------------------------------------------------------- - -/* static */ -bool wxDir::Exists(const wxString& dir) -{ - return wxDirExists(dir); -} - // ---------------------------------------------------------------------------- // wxDir construction/destruction // ---------------------------------------------------------------------------- @@ -237,8 +226,7 @@ wxString wxDir::GetName() const wxDir::~wxDir() { - delete m_data; - m_data = NULL; + wxDELETE(m_data); } // ----------------------------------------------------------------------------