Applied rowspan patch #15276 (dghart)

[wxWidgets.git] / include / wx / webviewarchivehandler.h

diff --git a/include/wx/webviewarchivehandler.h b/include/wx/webviewarchivehandler.h
index 46d639e523d32c4d2670b69e1f288b198296d4d0..454641c640be3a971d1f278bc388b3bac34bc881 100644 (file)
--- a/include/wx/webviewarchivehandler.h
+++ b/include/wx/webviewarchivehandler.h
@@ -7,12 +7,12 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef _WX_WEB_VIEW_FILE_HANDLER_H_
-#define _WX_WEB_VIEW_FILE_HANDLER_H_
+#ifndef _WX_WEBVIEW_FILE_HANDLER_H_
+#define _WX_WEBVIEW_FILE_HANDLER_H_
 
 #include "wx/setup.h"
 
-#if wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
+#if wxUSE_WEBVIEW
 
 class wxFSFile;
 class wxFileSystem;
@@ -20,18 +20,18 @@ class wxFileSystem;
 #include "wx/webview.h"
 
 //Loads from uris such as scheme:///C:/example/example.html or archives such as
-//scheme:///C:/example/example.zip;protocol=zip/example.html 
+//scheme:///C:/example/example.zip;protocol=zip/example.html
 
 class WXDLLIMPEXP_WEBVIEW wxWebViewArchiveHandler : public wxWebViewHandler
 {
 public:
     wxWebViewArchiveHandler(const wxString& scheme);
-    virtual ~wxWebViewArchiveHandler() {}
+    virtual ~wxWebViewArchiveHandler();
     virtual wxFSFile* GetFile(const wxString &uri);
 private:
     wxFileSystem* m_fileSystem;
 };
 
-#endif // wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
+#endif // wxUSE_WEBVIEW
 
-#endif // _WX_WEB_VIEW_FILE_HANDLER_H_
+#endif // _WX_WEBVIEW_FILE_HANDLER_H_