X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5d978d07a469d178e249b3f0f57ede3a674e2901..53a240f02bd45da218f46a43db81207a100f83ec:/src/common/filename.cpp diff --git a/src/common/filename.cpp b/src/common/filename.cpp index 342bdb88e2..cebec267bc 100644 --- a/src/common/filename.cpp +++ b/src/common/filename.cpp @@ -152,6 +152,13 @@ bool wxFileName::DirExists( const wxString &dir ) return ::wxDirExists( dir ); } +wxDateTime wxFileName::GetModificationTime() +{ + wxDateTime ret( wxFileModificationTime( GetFullPath() ) ); + + return ret; +} + // ---------------------------------------------------------------------------- // CWD and HOME stuff // ---------------------------------------------------------------------------- @@ -204,14 +211,47 @@ void wxFileName::AssignTempFileName( const wxString &prefix ) // directory operations // ---------------------------------------------------------------------------- -bool wxFileName::Mkdir( int perm ) +bool wxFileName::Mkdir( int perm, bool full ) { - return wxFileName::Mkdir( GetFullPath(), perm ); + return wxFileName::Mkdir( GetFullPath(), perm, full ); } -bool wxFileName::Mkdir( const wxString &dir, int perm ) +bool wxFileName::Mkdir( const wxString &dir, int perm, bool full ) { - return ::wxMkdir( dir, perm ); + if (full) + { + wxFileName filename(dir); + wxArrayString dirs = filename.GetDirs(); + dirs.Add(filename.GetName()); + + size_t count = dirs.GetCount(); + size_t i; + wxString currPath; + int noErrors = 0; + for ( i = 0; i < count; i++ ) + { + currPath += dirs[i]; + + if (currPath.Last() == wxT(':')) + { + // Can't create a root directory so continue to next dir + currPath += wxFILE_SEP_PATH; + continue; + } + + if (!DirExists(currPath)) + if (!wxMkdir(currPath, perm)) + noErrors ++; + + if ( (i < (count-1)) ) + currPath += wxFILE_SEP_PATH; + } + + return (noErrors == 0); + + } + else + return ::wxMkdir( dir, perm ); } bool wxFileName::Rmdir() @@ -538,7 +578,8 @@ wxString wxFileName::GetLongPath() const s_triedToLoad = TRUE; wxDllType dllKernel = wxDllLoader::LoadLibrary(_T("kernel32")); - if ( 0 ) // dllKernel ) + short avoidCompilerWarning = 0; + if ( avoidCompilerWarning ) // dllKernel ) { // may succeed or fail depending on the Windows version #ifdef _UNICODE @@ -588,7 +629,10 @@ wxString wxFileName::GetLongPath() const HANDLE hFind; pathOut = wxEmptyString; - size_t count = m_dirs.GetCount(); + wxArrayString dirs = GetDirs(); + dirs.Add(GetName()); + + size_t count = dirs.GetCount(); size_t i; wxString tmpPath; @@ -596,7 +640,7 @@ wxString wxFileName::GetLongPath() const { // We're using pathOut to collect the long-name path, // but using a temporary for appending the last path component which may be short-name - tmpPath = pathOut + m_dirs[i]; + tmpPath = pathOut + dirs[i]; if (tmpPath.Last() == wxT(':')) {