X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03647350fc7cd141953c72e0284e928847d30f44..61b98a2dac629cb5dbe1a6834ace6a33ba4eb103:/src/msw/dir.cpp diff --git a/src/msw/dir.cpp b/src/msw/dir.cpp index d7302d23c7..bb059dc992 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) @@ -209,7 +208,7 @@ bool wxDirData::Read(wxString *filename) if ( err != ERROR_FILE_NOT_FOUND && err != ERROR_NO_MORE_FILES ) { - wxLogSysError(err, _("Can not enumerate files in directory '%s'"), + wxLogSysError(err, _("Cannot enumerate files in directory '%s'"), m_dirname.c_str()); } #endif // __WIN32__ @@ -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 // ----------------------------------------------------------------------------