X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b838cfc9151aea38402ad2b1ba5d2f97cf94e973..8c5b1f0faff5b26bc9b2d9052069e951e7b41c74:/src/common/filesys.cpp?ds=sidebyside

diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp
index d154b75f73..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,33 +155,24 @@ bool wxLocalFSHandler::CanOpen(const wxString& location)
 
 wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& location)
 {
+    // location has Unix path separators
     wxString right = GetRightLocation(location);
- #ifdef __WXMAC__
-    if ( right[0] != '.' && right[0] != '/' && right.Find( '/' ) != wxNOT_FOUND ) {
-      right = "./" + right ;
-    }
-    right = wxUnix2MacFilename( right ) ;
- #endif
-    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() )));
 
 }
 
 wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
 {
     wxString right = GetRightLocation(spec);
- #ifdef __WXMAC__
-    if ( right[0] != '.' && right[0] != '/' && right.Find( '/' ) != wxNOT_FOUND ) {
-      right = "./" + right ;
-    }
-    right = wxUnix2MacFilename( right ) ;
- #endif
     return wxFindFirstFile(right, flags);
 }