From 7912e6332f65d8c975df0a7bd64a0c2d8445c63f Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sat, 7 Dec 2002 09:18:44 +0000 Subject: [PATCH 1/1] Correction to path/URL code git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18092 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/filesys.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/src/common/filesys.cpp b/src/common/filesys.cpp index 97d2f78d4b..d335bf7e7a 100644 --- a/src/common/filesys.cpp +++ b/src/common/filesys.cpp @@ -431,7 +431,7 @@ wxString wxFileSystem::URLToNativePath( const wxString& url ) path = path.Mid(7) ; } -/* +#ifndef __UNIX__ // 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 @@ -439,15 +439,13 @@ wxString wxFileSystem::URLToNativePath( const wxString& url ) { path = path.Mid(1) ; } -#ifdef __WXMSW__ else if ( (url.Find(wxT("file://")) == 0) && (path.Find(wxT('/')) != wxNOT_FOUND) && (path.Length() > 1) && (path[1u] != wxT(':')) ) { - path = wxT("\\\\") + path ; + path = wxT("//") + path ; } #endif -*/ path.Replace(g_unixPathString, g_nativePathString) ; @@ -459,7 +457,6 @@ wxString wxFileSystem::NativePathToURL( const wxString& path ) { wxString url = path ; -/* #ifdef __WXMSW__ // unc notation if ( url.Find(wxT("\\\\")) == 0 ) @@ -471,7 +468,6 @@ wxString wxFileSystem::NativePathToURL( const wxString& path ) { url = wxT("/") + url ; } -*/ url.Replace(g_nativePathString, g_unixPathString) ; url = wxT("file://") + url ; -- 2.47.2