Ensure that we have an available backend for wxWebView compilation.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69060 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/webview.h b/include/wx/webview.h
index a58fd87f979aec202adba6d8c843f199f892363c..0eef3f6b6a496525fa117dc502d6c0932a481dd7 100644 (file)
--- a/include/wx/webview.h
+++ b/include/wx/webview.h
@@ -12,7 +12,7 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

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

 
 #include "wx/control.h"
 #include "wx/event.h"
 
 #include "wx/control.h"
 #include "wx/event.h"


@@ -230,6 +230,6 @@ typedef void (wxEvtHandler::*wxWebViewEventFunction)
     wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, id, \
                      wxWebViewEventHandler(fn))
 
     wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, id, \
                      wxWebViewEventHandler(fn))
 

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

 
 #endif // _WX_WEB_VIEW_H_
 
 #endif // _WX_WEB_VIEW_H_

diff --git a/include/wx/webviewarchivehandler.h b/include/wx/webviewarchivehandler.h
index a0d02b6f27223a17d1846b7b5754347a3a79cf09..46d639e523d32c4d2670b69e1f288b198296d4d0 100644 (file)
--- a/include/wx/webviewarchivehandler.h
+++ b/include/wx/webviewarchivehandler.h
@@ -12,7 +12,7 @@
 
 #include "wx/setup.h"
 
 
 #include "wx/setup.h"
 

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

 
 class wxFSFile;
 class wxFileSystem;
 
 class wxFSFile;
 class wxFileSystem;


@@ -32,6 +32,6 @@ private:
     wxFileSystem* m_fileSystem;
 };
 
     wxFileSystem* m_fileSystem;
 };
 

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

 
 #endif // _WX_WEB_VIEW_FILE_HANDLER_H_
 
 #endif // _WX_WEB_VIEW_FILE_HANDLER_H_

diff --git a/src/common/webview.cpp b/src/common/webview.cpp
index 63f5f2b34317c16181aa4aa4338948909ab269df..49c9c317404531eea05e5adfa9dccf30f8f735d1 100644 (file)
--- a/src/common/webview.cpp
+++ b/src/common/webview.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
+#if wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)

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


@@ -112,4 +112,4 @@ wxWebView* wxWebView::New(wxWindow* parent,
     }
 }
 
     }
 }
 

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

diff --git a/src/common/webviewarchivehandler.cpp b/src/common/webviewarchivehandler.cpp
index 10f15df7e07918728c78ec6ee622ca06bfb55840..2d8f16d633061b93e30fc9d18b3b01d7c0f4d173 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
+#if wxUSE_WEBVIEW && (wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)

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


@@ -110,4 +110,4 @@ wxFSFile* wxWebViewArchiveHandler::GetFile(const wxString &uri)
     }
 }
 
     }
 }
 

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