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

modifications to URL<->filename conversion: take wxFileName, rename

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@18116 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2002-12-08 20:28:12 +00:00
parent ec75d791f0
commit 9548c49a6a
3 changed files with 33 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/common/fs_zip.cpp
View File

@@ -89,9 +89,9 @@ wxFSFile* wxZipFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString& l
if (right.GetChar(0) == wxT('/')) right = right.Mid(1);
wxString leftFilename = wxFileSystem::URLToNativePath(left);
wxFileName leftFilename = wxFileSystem::URLToFileName(left);
s = new wxZipInputStream(leftFilename, right);
s = new wxZipInputStream(leftFilename.GetFullPath(), right);
if (s && s->IsOk() )
{
return new wxFSFile(s,
@@ -137,7 +137,8 @@ wxString wxZipFSHandler::FindFirst(const wxString& spec, int flags)
}
m_ZipFile = left;
m_Archive = (void*) unzOpen(m_ZipFile.mb_str());
wxString nativename = wxFileSystem::URLToFileName(m_ZipFile).GetFullPath();
m_Archive = (void*) unzOpen(nativename.mb_str());
m_Pattern = right.AfterLast(wxT('/'));
m_BaseDir = right.BeforeLast(wxT('/'));