Return NULL from wxWindow::GetCapture() when the capture is being lost.

[wxWidgets.git] / src / common / webviewarchivehandler.cpp

diff --git a/src/common/webviewarchivehandler.cpp b/src/common/webviewarchivehandler.cpp
index 10f15df7e07918728c78ec6ee622ca06bfb55840..cb8f608a29b576e988d6de1dd5278a94abefe2e1 100644 (file)
--- a/src/common/webviewarchivehandler.cpp
+++ b/src/common/webviewarchivehandler.cpp
@@ -2,7 +2,6 @@
 // Name:        webviewfilehandler.cpp
 // Purpose:     Custom webview handler to allow archive browsing
 // Author:      Steven Lamerton
-// Id:          $Id$
 // Copyright:   (c) 2011 Steven Lamerton
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -50,6 +49,11 @@ wxWebViewArchiveHandler::wxWebViewArchiveHandler(const wxString& scheme) :
     m_fileSystem = new wxFileSystem();
 }
 
+wxWebViewArchiveHandler::~wxWebViewArchiveHandler()
+{
+    wxDELETE(m_fileSystem);
+}
+
 wxFSFile* wxWebViewArchiveHandler::GetFile(const wxString &uri)
 {
     //If there is a fragment at the end of the path then we need to strip it
@@ -81,7 +85,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
@@ -104,7 +108,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);
     }