/////////////////////////////////////////////////////////////////////////////
-// Name: unix/dir.cpp
+// Name: src/unix/dir.cpp
// Purpose: wxDir implementation for Unix/POSIX systems
// Author: Vadim Zeitlin
// Modified by:
// throw away the trailing slashes
size_t n = m_dirname.length();
- wxCHECK_RET( n, _T("empty dir name in wxDir") );
+ wxCHECK_RET( n, wxT("empty dir name in wxDir") );
while ( n > 0 && m_dirname[--n] == '/' )
;
{
if ( closedir(m_dir) != 0 )
{
- wxLogLastError(_T("closedir"));
+ wxLogLastError(wxT("closedir"));
}
}
}
bool wxDirData::Read(wxString *filename)
{
- dirent *de = (dirent *)NULL; // just to silence compiler warnings
+ dirent *de = NULL; // just to silence compiler warnings
bool matches = false;
// speed up string concatenation in the loop a bit
wxString path = m_dirname;
- path += _T('/');
+ path += wxT('/');
path.reserve(path.length() + 255);
wxString de_d_name;
wxDirData::wxDirData(const wxString& WXUNUSED(dirname))
{
- wxFAIL_MSG(_T("not implemented"));
+ wxFAIL_MSG(wxT("not implemented"));
}
wxDirData::~wxDirData()
#endif // not or new VMS/old VMS
-// ----------------------------------------------------------------------------
-// wxDir helpers
-// ----------------------------------------------------------------------------
-
-/* static */
-bool wxDir::Exists(const wxString& dir)
-{
- return wxDirExists(dir);
-}
-
// ----------------------------------------------------------------------------
// wxDir construction/destruction
// ----------------------------------------------------------------------------
if ( m_data )
{
name = M_DIR->GetName();
- if ( !name.empty() && (name.Last() == _T('/')) )
+
+ // Notice that we need to check for length > 1 as we shouldn't remove
+ // the last slash from the root directory!
+ if ( name.length() > 1 && (name.Last() == wxT('/')) )
{
- // chop off the last (back)slash
- name.Truncate(name.length() - 1);
+ // chop off the last slash
+ name.RemoveLast();
}
}
const wxString& filespec,
int flags) const
{
- wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
+ wxCHECK_MSG( IsOpened(), false, wxT("must wxDir::Open() first") );
M_DIR->Rewind();
bool wxDir::GetNext(wxString *filename) const
{
- wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
+ wxCHECK_MSG( IsOpened(), false, wxT("must wxDir::Open() first") );
- wxCHECK_MSG( filename, false, _T("bad pointer in wxDir::GetNext()") );
+ wxCHECK_MSG( filename, false, wxT("bad pointer in wxDir::GetNext()") );
return M_DIR->Read(filename);
}
bool wxDir::HasSubDirs(const wxString& spec) const
{
- wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
+ wxCHECK_MSG( IsOpened(), false, wxT("must wxDir::Open() first") );
if ( spec.empty() )
{
// caller will learn it soon enough when it calls GetFirst(wxDIR)
// anyhow
wxStructStat stBuf;
- if ( wxStat(M_DIR->GetName().c_str(), &stBuf) == 0 )
+ if ( wxStat(M_DIR->GetName(), &stBuf) == 0 )
{
switch ( stBuf.st_nlink )
{