X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/14f355c2b5c71fc7c3d680aea366582d2ac60f7b..2353544718a1aff4e12c75c823aa4136d2304027:/src/msw/dir.cpp diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp index 156147b0ae..79635bd446 100644 --- a/src/msw/dir.cpp +++ b/src/msw/dir.cpp @@ -17,10 +17,6 @@ // 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" @@ -28,20 +24,15 @@ #pragma hdrstop #endif -// For _A_SUBDIR, etc. -#if defined(__BORLANDC__) && defined(__WIN16__) -#include -#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 __WXMSW__ +#ifdef __WINDOWS__ #include "wx/msw/private.h" #endif @@ -49,141 +40,55 @@ // define the types and functions used for file searching // ---------------------------------------------------------------------------- -// under Win16 use compiler-specific functions -#ifdef __WIN16__ - #ifdef __VISUALC__ - #include - #include - - typedef struct _find_t FIND_STRUCT; - #elif defined(__BORLANDC__) - #include +typedef WIN32_FIND_DATA FIND_STRUCT; +typedef HANDLE FIND_DATA; +typedef DWORD FIND_ATTR; - typedef struct ffblk FIND_STRUCT; - #else - #error "No directory searching functions for this compiler" - #endif +static inline FIND_DATA InitFindData() { return INVALID_HANDLE_VALUE; } - 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; - } - } - - 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 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 - 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); - } +} - 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 @@ -266,14 +171,10 @@ void wxDirData::Rewind() 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) ) { @@ -287,7 +188,7 @@ bool wxDirData::Read(wxString *filename) m_finddata = FindFirst(filespec, PTR_TO_FINDDATA); - first = TRUE; + first = true; } if ( !IsFindDataOk(m_finddata) ) @@ -303,7 +204,7 @@ bool wxDirData::Read(wxString *filename) #endif // __WIN32__ //else: not an error, just no (such) files - return FALSE; + return false; } const wxChar *name; @@ -313,7 +214,7 @@ bool wxDirData::Read(wxString *filename) { if ( first ) { - first = FALSE; + first = false; } else { @@ -329,7 +230,7 @@ bool wxDirData::Read(wxString *filename) #endif // __WIN32__ //else: not an error, just no more (such) files - return FALSE; + return false; } } @@ -372,7 +273,7 @@ bool wxDirData::Read(wxString *filename) break; } - return TRUE; + return true; } // ---------------------------------------------------------------------------- @@ -382,7 +283,7 @@ bool wxDirData::Read(wxString *filename) /* static */ bool wxDir::Exists(const wxString& dir) { - return wxPathExists(dir); + return wxDirExists(dir); } // ---------------------------------------------------------------------------- @@ -401,7 +302,7 @@ bool wxDir::Open(const wxString& dirname) delete M_DIR; m_data = new wxDirData(dirname); - return TRUE; + return true; } bool wxDir::IsOpened() const @@ -444,7 +345,7 @@ bool wxDir::GetFirst(wxString *filename, 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(); @@ -456,9 +357,9 @@ bool wxDir::GetFirst(wxString *filename, 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); } @@ -481,7 +382,7 @@ wxGetDirectoryTimes(const wxString& dirname, FIND_DATA fd = FindFirst(dirname, &fs); if ( !IsFindDataOk(fd) ) { - return FALSE; + return false; } *ftAccess = fs.ftLastAccessTime; @@ -490,7 +391,7 @@ wxGetDirectoryTimes(const wxString& dirname, FindClose(fd); - return TRUE; + return true; } #endif // __WIN32__