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

return URLs, not filenames, from wxFileSystem::FindFirst/FindNext() for the file: protocol

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@59510 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2009-03-13 15:04:05 +00:00
parent 2bb9a404fb
commit 8e63b7b8ea
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/filesys.cpp
View File

@@ -274,12 +274,18 @@ wxFSFile* wxLocalFSHandler::OpenFile(wxFileSystem& WXUNUSED(fs), const wxString&
wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags) wxString wxLocalFSHandler::FindFirst(const wxString& spec, int flags)
{ {
wxFileName fn = wxFileSystem::URLToFileName(GetRightLocation(spec)); wxFileName fn = wxFileSystem::URLToFileName(GetRightLocation(spec));
return wxFindFirstFile(ms_root + fn.GetFullPath(), flags); const wxString found = wxFindFirstFile(ms_root + fn.GetFullPath(), flags);
if ( found.empty() )
return found;
return wxFileSystem::FileNameToURL(found);
} }
wxString wxLocalFSHandler::FindNext() wxString wxLocalFSHandler::FindNext()
{ {
return wxFindNextFile(); const wxString found = wxFindNextFile();
if ( found.empty() )
return found;
return wxFileSystem::FileNameToURL(found);
} }