Don't use "Cancel" button in the about dialog of the listctrl sample.

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

diff --git a/src/common/webviewarchivehandler.cpp b/src/common/webviewarchivehandler.cpp
index 2d8f16d633061b93e30fc9d18b3b01d7c0f4d173..6b9bdd5c24fc17ded56cd68c3e611e1aaed6b552 100644 (file)
--- a/src/common/webviewarchivehandler.cpp
+++ b/src/common/webviewarchivehandler.cpp
@@ -10,7 +10,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 

-#if wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
+#if wxUSE_WEBVIEW

 
 #if defined(__BORLANDC__)
     #pragma hdrstop
 
 #if defined(__BORLANDC__)
     #pragma hdrstop


@@ -50,6 +50,11 @@ wxWebViewArchiveHandler::wxWebViewArchiveHandler(const wxString& scheme) :
     m_fileSystem = new wxFileSystem();
 }
 
     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
 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 +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


@@ -104,10 +109,10 @@ 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);
     }
 }
 

-#endif // wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
+#endif // wxUSE_WEBVIEW