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

merged 2.4 branch into the trunk

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18040 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-12-04 14:11:26 +00:00
parent 59a944cb63
commit 2b5f62a0b2
1057 changed files with 37805 additions and 24034 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
src/common/filesys.cpp
View File

@@ -13,7 +13,7 @@
#include "wx/wxprec.h"
#ifdef __BORDLANDC__
#ifdef __BORLANDC__
#pragma hdrstop
#endif
@@ -173,7 +173,8 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString&
{
// location has Unix path separators
wxString right = ms_root + GetRightLocation(location);
wxFileName fn(right, wxPATH_UNIX);
wxString nativePath = wxFileSystem::URLToNativePath(right);
wxFileName fn(nativePath, wxPATH_UNIX);
if (!wxFileExists(fn.GetFullPath()))
return (wxFSFile*) NULL;
@@ -417,7 +418,58 @@ void wxFileSystem::CleanUpHandlers()
m_Handlers.Clear();
}
const static wxString g_unixPathString(wxT("/"));
const static wxString g_nativePathString(wxFILE_SEP_PATH);
// Returns the native path for a file URL
wxString wxFileSystem::URLToNativePath( const wxString& url )
{
wxString path = url ;
if ( path.Find(wxT("file://")) == 0 )
{
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
if ( path[0u] == wxT('/') && path [1u] != wxT('/'))
{
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 ;
}
#endif
path.Replace(g_unixPathString, g_nativePathString) ;
return path ;
}
// Returns the file URL for a native path
wxString wxFileSystem::NativePathToURL( const wxString& path )
{
wxString url = path ;
#ifdef __WXMSW__
// unc notation
if ( url.Find(wxT("\\\\")) == 0 )
{
url = url.Mid(2) ;
}
else
#endif
{
url = wxT("/") + url ;
}
url.Replace(g_nativePathString, g_unixPathString) ;
url = wxT("file://") + url ;
return url ;
}
///// Module: