From: Steve Lamerton Date: Thu, 6 Oct 2011 10:01:17 +0000 (+0000) Subject: Ensure we pass the correct type of string to EscapeFileNameCharsInURL in wxWebViewArc... X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/2bcada5f33151d366b9d4c9e5e37c706dab23b27 Ensure we pass the correct type of string to EscapeFileNameCharsInURL in wxWebViewArchiveHandler. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/src/common/webviewarchivehandler.cpp b/src/common/webviewarchivehandler.cpp index 438426b203..6b9bdd5c24 100644 --- a/src/common/webviewarchivehandler.cpp +++ b/src/common/webviewarchivehandler.cpp @@ -86,7 +86,7 @@ wxFSFile* wxWebViewArchiveHandler::GetFile(const wxString &uri) return NULL; wxString fspath = "file:" + - EscapeFileNameCharsInURL(path.substr(doubleslash + 2)); + EscapeFileNameCharsInURL(path.substr(doubleslash + 2).c_str()); return m_fileSystem->OpenFile(fspath); } //Otherwise we need to extract the protocol @@ -109,7 +109,7 @@ wxFSFile* wxWebViewArchiveHandler::GetFile(const wxString &uri) return NULL; wxString fspath = "file:" + - EscapeFileNameCharsInURL(mainpath.substr(doubleslash + 2)) + EscapeFileNameCharsInURL(mainpath.substr(doubleslash + 2).c_str()) + "#" + protocol +":" + archivepath; return m_fileSystem->OpenFile(fspath); }