]> git.saurik.com Git - wxWidgets.git/commitdiff
Ensure we pass the correct type of string to EscapeFileNameCharsInURL in wxWebViewArc...
authorSteve Lamerton <steve.lamerton@gmail.com>
Thu, 6 Oct 2011 10:01:17 +0000 (10:01 +0000)
committerSteve Lamerton <steve.lamerton@gmail.com>
Thu, 6 Oct 2011 10:01:17 +0000 (10:01 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69317 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/common/webviewarchivehandler.cpp

index 438426b20327b999794016fe0d64bed4b8459bb9..6b9bdd5c24fc17ded56cd68c3e611e1aaed6b552 100644 (file)
@@ -86,7 +86,7 @@ wxFSFile* wxWebViewArchiveHandler::GetFile(const wxString &uri)
             return NULL;
 
         wxString fspath = "file:" + 
             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
         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:" + 
             return NULL;
 
         wxString fspath = "file:" + 
-                          EscapeFileNameCharsInURL(mainpath.substr(doubleslash + 2))
+                          EscapeFileNameCharsInURL(mainpath.substr(doubleslash + 2).c_str())
                           + "#" + protocol +":" + archivepath;
         return m_fileSystem->OpenFile(fspath);
     }
                           + "#" + protocol +":" + archivepath;
         return m_fileSystem->OpenFile(fspath);
     }