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

Correction to path/URL code

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2002-12-07 09:18:44 +00:00
parent dac7d53a83
commit 7912e6332f
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/filesys.cpp
View File

@@ -431,7 +431,7 @@ wxString wxFileSystem::URLToNativePath( const wxString& url )
path = path.Mid(7) ; path = path.Mid(7) ;
} }
/* #ifndef __UNIX__
// 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
@@ -439,15 +439,13 @@ wxString wxFileSystem::URLToNativePath( const wxString& url )
{ {
path = path.Mid(1) ; path = path.Mid(1) ;
} }
#ifdef __WXMSW__
else if ( (url.Find(wxT("file://")) == 0) && else if ( (url.Find(wxT("file://")) == 0) &&
(path.Find(wxT('/')) != wxNOT_FOUND) && (path.Find(wxT('/')) != wxNOT_FOUND) &&
(path.Length() > 1) && (path[1u] != wxT(':')) ) (path.Length() > 1) && (path[1u] != wxT(':')) )
{ {
path = wxT("\\\\") + path ; path = wxT("//") + path ;
} }
#endif #endif
*/
path.Replace(g_unixPathString, g_nativePathString) ; path.Replace(g_unixPathString, g_nativePathString) ;
@@ -459,7 +457,6 @@ 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 )
@@ -471,7 +468,6 @@ 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 ;