From: Julian Smart Date: Fri, 6 Dec 2002 20:12:48 +0000 (+0000) Subject: Removed apparently erroneous manipulation of filename/URL X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/9b798c66c749d0fa33e4a280c4b5d66ede364a6d Removed apparently erroneous manipulation of filename/URL git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 8e26b5d904..97d2f78d4b 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -431,6 +431,7 @@ wxString wxFileSystem::URLToNativePath( const wxString& url ) path = path.Mid(7) ; } +/* // file urls either start with a forward slash (local harddisk), // otherwise they have a servername/sharename notation, // which only exists on msw and corresponds to a unc @@ -446,6 +447,8 @@ wxString wxFileSystem::URLToNativePath( const wxString& url ) path = wxT("\\\\") + path ; } #endif +*/ + path.Replace(g_unixPathString, g_nativePathString) ; return path ; @@ -455,6 +458,8 @@ wxString wxFileSystem::URLToNativePath( const wxString& url ) wxString wxFileSystem::NativePathToURL( const wxString& path ) { wxString url = path ; + +/* #ifdef __WXMSW__ // unc notation if ( url.Find(wxT("\\\\")) == 0 ) @@ -466,6 +471,8 @@ wxString wxFileSystem::NativePathToURL( const wxString& path ) { url = wxT("/") + url ; } +*/ + url.Replace(g_nativePathString, g_unixPathString) ; url = wxT("file://") + url ; return url ;