Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removed apparently erroneous manipulation of filename/URL

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18066 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-12-06 20:12:48 +00:00
parent 513e0cea96
commit 9b798c66c7
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/filesys.cpp
View File

@@ -431,6 +431,7 @@ wxString wxFileSystem::URLToNativePath( const wxString& url )
path = path.Mid(7) ; path = path.Mid(7) ;
} }
/*
// file urls either start with a forward slash (local harddisk), // file urls either start with a forward slash (local harddisk),
// otherwise they have a servername/sharename notation, // otherwise they have a servername/sharename notation,
// which only exists on msw and corresponds to a unc // which only exists on msw and corresponds to a unc
@@ -446,6 +447,8 @@ wxString wxFileSystem::URLToNativePath( const wxString& url )
path = wxT("\\\\") + path ; path = wxT("\\\\") + path ;
} }
#endif #endif
*/
path.Replace(g_unixPathString, g_nativePathString) ; path.Replace(g_unixPathString, g_nativePathString) ;
return path ; return path ;
@@ -455,6 +458,8 @@ wxString wxFileSystem::URLToNativePath( const wxString& url )
wxString wxFileSystem::NativePathToURL( const wxString& path ) wxString wxFileSystem::NativePathToURL( const wxString& path )
{ {
wxString url = path ; wxString url = path ;
/*
#ifdef __WXMSW__ #ifdef __WXMSW__
// unc notation // unc notation
if ( url.Find(wxT("\\\\")) == 0 ) if ( url.Find(wxT("\\\\")) == 0 )
@@ -466,6 +471,8 @@ wxString wxFileSystem::NativePathToURL( const wxString& path )
{ {
url = wxT("/") + url ; url = wxT("/") + url ;
} }
*/
url.Replace(g_nativePathString, g_unixPathString) ; url.Replace(g_nativePathString, g_unixPathString) ;
url = wxT("file://") + url ; url = wxT("file://") + url ;
return url ; return url ;