// headers
// ----------------------------------------------------------------------------
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
- #pragma implementation "dir.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
bool wxDirData::Read(wxString *filename)
{
- dirent *de = (dirent *)NULL; // just to silence compiler warnings
- bool matches = FALSE;
+ 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.reserve(path.length() + 255);
-
+
wxString de_d_name;
while ( !matches )
{
de = readdir(m_dir);
if ( !de )
- return FALSE;
-
+ return false;
+
#if wxUSE_UNICODE
- de_d_name = wxConvLibc.cMB2WC( de->d_name );
+ de_d_name = wxString(de->d_name, *wxConvFileName);
#else
de_d_name = de->d_name;
-#endif
+#endif
// don't return "." and ".." unless asked for
if ( de->d_name[0] == '.' &&
// finally, check the name
if ( m_filespec.empty() )
{
- matches = m_flags & wxDIR_HIDDEN ? TRUE : de->d_name[0] != '.';
+ matches = m_flags & wxDIR_HIDDEN ? true : de->d_name[0] != '.';
}
else
{
*filename = de_d_name;
- return TRUE;
+ return true;
}
#else // old VMS (TODO)
bool wxDirData::Read(wxString * WXUNUSED(filename))
{
- return FALSE;
+ return false;
}
#endif // not or new VMS/old VMS
/* static */
bool wxDir::Exists(const wxString& dir)
{
- return wxPathExists(dir);
+ return wxDirExists(dir);
}
// ----------------------------------------------------------------------------
if ( !M_DIR->IsOk() )
{
- wxLogSysError(_("Can not enumerate files in directory '%s'"),
- dirname.c_str());
-
delete M_DIR;
m_data = NULL;
- return FALSE;
+ return false;
}
- return TRUE;
+ return true;
}
bool wxDir::IsOpened() const
const wxString& filespec,
int flags) const
{
- wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") );
+ wxCHECK_MSG( IsOpened(), false, _T("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, _T("must wxDir::Open() first") );
- wxCHECK_MSG( filename, FALSE, _T("bad pointer in wxDir::GetNext()") );
+ wxCHECK_MSG( filename, false, _T("bad pointer in wxDir::GetNext()") );
return M_DIR->Read(filename);
}
-bool wxDir::HasSubDirs(const wxString& spec)
+bool wxDir::HasSubDirs(const wxString& spec) const
{
- wxCHECK_MSG( IsOpened(), FALSE, _T("must wxDir::Open() first") );
+ wxCHECK_MSG( IsOpened(), false, _T("must wxDir::Open() first") );
if ( spec.empty() )
{
{
case 2:
// just "." and ".."
- return FALSE;
+ return false;
case 0:
case 1:
// assume we have subdirs - may turn out to be wrong if we
// have other hard links to this directory but it's not
// that bad as explained above
- return TRUE;
+ return true;
}
}
}