X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/86b3203fb156247bae38d7c67a3a00fe27c5db11..8c5b1f0faff5b26bc9b2d9052069e951e7b41c74:/src/common/filesys.cpp diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index c06e2bebc2..8509d41a02 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -24,7 +24,7 @@ #include "wx/module.h" #include "wx/filesys.h" #include "wx/mimetype.h" - +#include "wx/filename.h" @@ -155,15 +155,18 @@ bool wxLocalFSHandler::CanOpen(const wxString& location) wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location) { + // location has Unix path separators wxString right = GetRightLocation(location); - if (!wxFileExists(right)) + wxFileName fn( right, wxPATH_UNIX ); + + if (!wxFileExists( fn.GetFullPath() )) return (wxFSFile*) NULL; - - return new wxFSFile(new wxFileInputStream(right), + + return new wxFSFile(new wxFileInputStream( fn.GetFullPath() ), right, GetMimeTypeFromExt(location), GetAnchor(location), - wxDateTime(wxFileModificationTime(right))); + wxDateTime(wxFileModificationTime( fn.GetFullPath() ))); }