X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/9a83f860948059b0273b5cc6d9e43fadad3ebfca..57ab6f2314860f6efd2d1339913c91a302020a8e:/src/msw/dir.cpp diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp index 5404038be8..672397394b 100644 --- a/src/msw/dir.cpp +++ b/src/msw/dir.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: msw/dir.cpp +// Name: src/msw/dir.cpp // Purpose: wxDir implementation for Win32 // Author: Vadim Zeitlin // Modified by: @@ -30,7 +30,6 @@ #endif // PCH #include "wx/dir.h" -#include "wx/filefn.h" // for wxDirExists() #ifdef __WINDOWS__ #include "wx/msw/private.h" @@ -68,7 +67,7 @@ inline void FreeFindData(FIND_DATA fd) inline FIND_DATA FindFirst(const wxString& spec, FIND_STRUCT *finddata) { - return ::FindFirstFile(spec.fn_str(), finddata); + return ::FindFirstFile(spec.t_str(), finddata); } inline bool FindNext(FIND_DATA fd, FIND_STRUCT *finddata) @@ -287,16 +286,6 @@ bool wxDirData::Read(wxString *filename) return true; } -// ---------------------------------------------------------------------------- -// wxDir helpers -// ---------------------------------------------------------------------------- - -/* static */ -bool wxDir::Exists(const wxString& dir) -{ - return wxDirExists(dir); -} - // ---------------------------------------------------------------------------- // wxDir construction/destruction // ---------------------------------------------------------------------------- @@ -311,7 +300,7 @@ wxDir::wxDir(const wxString& dirname) bool wxDir::Open(const wxString& dirname) { delete M_DIR; - + // The Unix code does a similar test if (wxDirExists(dirname)) { @@ -322,7 +311,7 @@ bool wxDir::Open(const wxString& dirname) else { m_data = NULL; - + return false; } }