// Created: 08.12.99
// RCS-ID: $Id$
// Copyright: (c) 1999 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
// headers
// ----------------------------------------------------------------------------
-#ifdef __GNUG__
- #pragma implementation "dir.h"
-#endif
-
// For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h"
#pragma hdrstop
#endif
-// For _A_SUBDIR, etc.
-#if defined(__BORLANDC__) && defined(__WIN16__)
-#include <dos.h>
-#endif
-
#ifndef WX_PRECOMP
#include "wx/intl.h"
#include "wx/log.h"
#endif // PCH
#include "wx/dir.h"
-#include "wx/filefn.h" // for wxPathExists()
+#include "wx/filefn.h" // for wxDirExists()
+
+#ifdef __WINDOWS__
+ #include "wx/msw/private.h"
+#endif
// ----------------------------------------------------------------------------
// define the types and functions used for file searching
// ----------------------------------------------------------------------------
-// under Win16 use compiler-specific functions
-#ifdef __WIN16__
- #ifdef __VISUALC__
- #include <dos.h>
- #include <errno.h>
-
- typedef struct _find_t FIND_STRUCT;
- #elif defined(__BORLANDC__)
- #include <dir.h>
-
- typedef struct ffblk FIND_STRUCT;
- #else
- #error "No directory searching functions for this compiler"
- #endif
-
- typedef FIND_STRUCT *FIND_DATA;
- typedef char FIND_ATTR;
-
- static inline FIND_DATA InitFindData() { return (FIND_DATA)NULL; }
- static inline bool IsFindDataOk(FIND_DATA fd) { return fd != NULL; }
- static inline void FreeFindData(FIND_DATA fd) { free(fd); }
-
- static inline FIND_DATA FindFirst(const wxString& spec,
- FIND_STRUCT * WXUNUSED(finddata))
- {
- // attribute to find all files
- static const FIND_ATTR attr = 0x3F;
-
- FIND_DATA fd = (FIND_DATA)malloc(sizeof(FIND_STRUCT));
-
- if (
- #ifdef __VISUALC__
- _dos_findfirst(spec, attr, fd) == 0
- #else // Borland
- findfirst(spec, fd, attr) == 0
- #endif
- )
- {
- return fd;
- }
- else
- {
- free(fd);
-
- return NULL;
- }
- }
+typedef WIN32_FIND_DATA FIND_STRUCT;
+typedef HANDLE FIND_DATA;
+typedef DWORD FIND_ATTR;
- static inline bool FindNext(FIND_DATA fd, FIND_STRUCT * WXUNUSED(finddata))
- {
- #ifdef __VISUALC__
- return _dos_findnext(fd) == 0;
- #else // Borland
- return findnext(fd) == 0;
- #endif
- }
-
- static const wxChar *GetNameFromFindData(FIND_STRUCT *finddata)
- {
- #ifdef __VISUALC__
- return finddata->name;
- #else // Borland
- return finddata->ff_name;
- #endif
- }
+static inline FIND_DATA InitFindData() { return INVALID_HANDLE_VALUE; }
- static const FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)
- {
- #ifdef __VISUALC__
- return finddata->attrib;
- #else // Borland
- return finddata->ff_attrib;
- #endif
- }
-
- static inline bool IsDir(FIND_ATTR attr)
- {
- return (attr & _A_SUBDIR) != 0;
- }
-
- static inline bool IsHidden(FIND_ATTR attr)
- {
- return (attr & (_A_SYSTEM | _A_HIDDEN)) != 0;
- }
-#else // Win32
- #include <windows.h>
-
- typedef WIN32_FIND_DATA FIND_STRUCT;
- typedef HANDLE FIND_DATA;
- typedef DWORD FIND_ATTR;
-
- static inline FIND_DATA InitFindData() { return INVALID_HANDLE_VALUE; }
-
- static inline bool IsFindDataOk(FIND_DATA fd)
- {
+static inline bool IsFindDataOk(FIND_DATA fd)
+{
return fd != INVALID_HANDLE_VALUE;
- }
+}
- static inline void FreeFindData(FIND_DATA fd)
- {
+static inline void FreeFindData(FIND_DATA fd)
+{
if ( !::FindClose(fd) )
{
wxLogLastError(_T("FindClose"));
}
- }
+}
- static inline FIND_DATA FindFirst(const wxString& spec,
+static inline FIND_DATA FindFirst(const wxString& spec,
FIND_STRUCT *finddata)
- {
- return ::FindFirstFile(spec, finddata);
- }
+{
+ return ::FindFirstFile(spec.fn_str(), finddata);
+}
- static inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata)
- {
+static inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata)
+{
return ::FindNextFile(fd, finddata) != 0;
- }
+}
- static const wxChar *GetNameFromFindData(FIND_STRUCT *finddata)
- {
+static const wxChar *GetNameFromFindData(FIND_STRUCT *finddata)
+{
return finddata->cFileName;
- }
+}
- static const FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)
- {
+static const FIND_ATTR GetAttrFromFindData(FIND_STRUCT *finddata)
+{
return finddata->dwFileAttributes;
- }
+}
- static inline bool IsDir(FIND_ATTR attr)
- {
+static inline bool IsDir(FIND_ATTR attr)
+{
return (attr & FILE_ATTRIBUTE_DIRECTORY) != 0;
- }
+}
- static inline bool IsHidden(FIND_ATTR attr)
- {
+static inline bool IsHidden(FIND_ATTR attr)
+{
return (attr & (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0;
- }
-#endif // __WIN16__
+}
// ----------------------------------------------------------------------------
// constants
void Rewind();
bool Read(wxString *filename);
+ const wxString& GetName() const { return m_dirname; }
+
private:
FIND_DATA m_finddata;
wxString m_filespec;
int m_flags;
+
+ DECLARE_NO_COPY_CLASS(wxDirData)
};
// ============================================================================
bool wxDirData::Read(wxString *filename)
{
- bool first = FALSE;
+ bool first = false;
-#ifdef __WIN32__
WIN32_FIND_DATA finddata;
#define PTR_TO_FINDDATA (&finddata)
-#else // Win16
- #define PTR_TO_FINDDATA (m_finddata)
-#endif
if ( !IsFindDataOk(m_finddata) )
{
{
filespec += _T('\\');
}
- filespec += (!m_filespec ? _T("*.*") : m_filespec.c_str());
+ if ( !m_filespec )
+ filespec += _T("*.*");
+ else
+ filespec += m_filespec;
m_finddata = FindFirst(filespec, PTR_TO_FINDDATA);
- first = TRUE;
+ first = true;
}
if ( !IsFindDataOk(m_finddata) )
#ifdef __WIN32__
DWORD err = ::GetLastError();
- if ( err != ERROR_FILE_NOT_FOUND )
+ if ( err != ERROR_FILE_NOT_FOUND && err != ERROR_NO_MORE_FILES )
{
wxLogSysError(err, _("Can not enumerate files in directory '%s'"),
m_dirname.c_str());
#endif // __WIN32__
//else: not an error, just no (such) files
- return FALSE;
+ return false;
}
const wxChar *name;
{
if ( first )
{
- first = FALSE;
+ first = false;
}
else
{
#endif // __WIN32__
//else: not an error, just no more (such) files
- return FALSE;
+ return false;
}
}
break;
}
- return TRUE;
+ return true;
}
// ----------------------------------------------------------------------------
/* static */
bool wxDir::Exists(const wxString& dir)
{
- return wxPathExists(dir);
+ return wxDirExists(dir);
}
// ----------------------------------------------------------------------------
delete M_DIR;
m_data = new wxDirData(dirname);
- return TRUE;
+ return true;
}
bool wxDir::IsOpened() const
return m_data != NULL;
}
+wxString wxDir::GetName() const
+{
+ wxString name;
+ if ( m_data )
+ {
+ name = M_DIR->GetName();
+ if ( !name.empty() )
+ {
+ // bring to canonical Windows form
+ name.Replace(_T("/"), _T("\\"));
+
+ if ( name.Last() == _T('\\') )
+ {
+ // chop off the last (back)slash
+ name.Truncate(name.length() - 1);
+ }
+ }
+ }
+
+ return name;
+}
+
wxDir::~wxDir()
{
delete M_DIR;
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);
}
+
+// ----------------------------------------------------------------------------
+// wxGetDirectoryTimes: used by wxFileName::GetTimes()
+// ----------------------------------------------------------------------------
+
+#ifdef __WIN32__
+
+extern bool
+wxGetDirectoryTimes(const wxString& dirname,
+ FILETIME *ftAccess, FILETIME *ftCreate, FILETIME *ftMod)
+{
+#ifdef __WXWINCE__
+ // FindFirst() is going to fail
+ wxASSERT_MSG( !dirname.empty(),
+ _T("incorrect directory name format in wxGetDirectoryTimes") );
+#else
+ // FindFirst() is going to fail
+ wxASSERT_MSG( !dirname.empty() && dirname.Last() != _T('\\'),
+ _T("incorrect directory name format in wxGetDirectoryTimes") );
+#endif
+
+ FIND_STRUCT fs;
+ FIND_DATA fd = FindFirst(dirname, &fs);
+ if ( !IsFindDataOk(fd) )
+ {
+ return false;
+ }
+
+ *ftAccess = fs.ftLastAccessTime;
+ *ftCreate = fs.ftCreationTime;
+ *ftMod = fs.ftLastWriteTime;
+
+ FindClose(fd);
+
+ return true;
+}
+
+#endif // __WIN32__
+
projects / wxWidgets.git / blobdiff