X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7520f3da332d64a676b6f7d27a56004fabf2db36..6a62b2c6eddef047009cf2c14365b7012fc418ec:/src/mgl/dirmgl.cpp diff --git a/src/mgl/dirmgl.cpp b/src/mgl/dirmgl.cpp index bd6e21b38a..8c1e79f339 100644 --- a/src/mgl/dirmgl.cpp +++ b/src/mgl/dirmgl.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/mgl/dir.cpp +// Name: src/mgl/dirmgl.cpp // Purpose: wxDir implementation for MGL // Author: Vaclav Slavik, Vadim Zeitlin // Modified by: @@ -87,7 +87,7 @@ wxDirData::wxDirData(const wxString& dirname) // throw away the trailing slashes size_t n = m_dirname.length(); - wxCHECK_RET( n, _T("empty dir name in wxDir") ); + wxCHECK_RET( n, wxT("empty dir name in wxDir") ); while ( n > 0 && m_dirname[--n] == wxFILE_SEP_PATH ) {} @@ -104,7 +104,7 @@ void wxDirData::SetFileSpec(const wxString& filespec) { #ifdef __DOS__ if ( filespec.empty() ) - m_filespec = _T("*.*"); + m_filespec = wxT("*.*"); else #endif m_filespec = filespec; @@ -179,17 +179,6 @@ bool wxDirData::Read(wxString *filename) return true; } - -// ---------------------------------------------------------------------------- -// wxDir helpers -// ---------------------------------------------------------------------------- - -/* static */ -bool wxDir::Exists(const wxString& dir) -{ - return wxDirExists(dir); -} - // ---------------------------------------------------------------------------- // wxDir construction/destruction // ---------------------------------------------------------------------------- @@ -250,7 +239,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, wxT("must wxDir::Open() first") ); M_DIR->Rewind(); @@ -262,9 +251,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, wxT("must wxDir::Open() first") ); - wxCHECK_MSG( filename, false, _T("bad pointer in wxDir::GetNext()") ); + wxCHECK_MSG( filename, false, wxT("bad pointer in wxDir::GetNext()") ); return M_DIR->Read(filename); }