From 1afeaa324d7e463d9fce73769f2a82332d91e5b9 Mon Sep 17 00:00:00 2001 From: Tobias Taschner Date: Thu, 9 Jan 2020 13:19:51 +0100 Subject: [PATCH] Added new build option wxUSE_WEBVIEW_EDGE --- build/cmake/options.cmake | 1 + build/cmake/setup.h.in | 2 ++ include/wx/android/setup.h | 7 +++++++ include/wx/gtk/setup0.h | 7 +++++++ include/wx/motif/setup0.h | 7 +++++++ include/wx/msw/setup0.h | 7 +++++++ include/wx/osx/setup0.h | 7 +++++++ include/wx/setup_inc.h | 7 +++++++ include/wx/univ/setup0.h | 7 +++++++ setup.h.in | 2 ++ 10 files changed, 54 insertions(+) diff --git a/build/cmake/options.cmake b/build/cmake/options.cmake index c9196f766e..1c0cfb8c82 100644 --- a/build/cmake/options.cmake +++ b/build/cmake/options.cmake @@ -420,6 +420,7 @@ if(WIN32) wx_option(wxUSE_TASKBARICON_BALLOONS "enable wxTaskBarIcon::ShowBalloon() method (Win32 only)") wx_option(wxUSE_UXTHEME "enable support for Windows XP themed look (Win32 only)") wx_option(wxUSE_WEBVIEW_IE "use wxWebView IE backend (Win32 only)") + wx_option(wxUSE_WEBVIEW_EDGE "use wxWebView Edge (Chromium) backend (Windows 7+ only)" OFF) wx_option(wxUSE_WXDIB "use wxDIB class (Win32 only)") if(MSVC_VERSION GREATER 1600 AND NOT CMAKE_VS_PLATFORM_TOOLSET MATCHES "_xp$") set(wxUSE_WINRT_DEFAULT ON) diff --git a/build/cmake/setup.h.in b/build/cmake/setup.h.in index 2b5c6a29a1..abc2bfba7e 100644 --- a/build/cmake/setup.h.in +++ b/build/cmake/setup.h.in @@ -336,6 +336,8 @@ #cmakedefine01 wxUSE_WEBVIEW_IE #endif +#cmakedefine01 wxUSE_WEBVIEW_EDGE + #if (defined(__WXGTK__) && !defined(__WXGTK3__)) || defined(__WXOSX__) #cmakedefine01 wxUSE_WEBVIEW_WEBKIT #else diff --git a/include/wx/android/setup.h b/include/wx/android/setup.h index 0906ca46b3..485b3c11dd 100644 --- a/include/wx/android/setup.h +++ b/include/wx/android/setup.h @@ -759,6 +759,13 @@ #define wxUSE_WEBVIEW_IE 0 #endif +// Use the Edge (Chromium) wxWebView backend (Requires WebView2 SDK) +// +// Default is 0 +// +// Recommended setting: 1 when building for Windows with WebView2 SDK +#define wxUSE_WEBVIEW_EDGE 0 + // Use the WebKit wxWebView backend // // Default is 1 on GTK and OSX diff --git a/include/wx/gtk/setup0.h b/include/wx/gtk/setup0.h index 8355fbf4b3..230560034a 100644 --- a/include/wx/gtk/setup0.h +++ b/include/wx/gtk/setup0.h @@ -760,6 +760,13 @@ #define wxUSE_WEBVIEW_IE 0 #endif +// Use the Edge (Chromium) wxWebView backend (Requires WebView2 SDK) +// +// Default is 0 +// +// Recommended setting: 1 when building for Windows with WebView2 SDK +#define wxUSE_WEBVIEW_EDGE 0 + // Use the WebKit wxWebView backend // // Default is 1 on GTK and OSX diff --git a/include/wx/motif/setup0.h b/include/wx/motif/setup0.h index 8d9bc1f23d..922189d5cb 100644 --- a/include/wx/motif/setup0.h +++ b/include/wx/motif/setup0.h @@ -760,6 +760,13 @@ #define wxUSE_WEBVIEW_IE 0 #endif +// Use the Edge (Chromium) wxWebView backend (Requires WebView2 SDK) +// +// Default is 0 +// +// Recommended setting: 1 when building for Windows with WebView2 SDK +#define wxUSE_WEBVIEW_EDGE 0 + // Use the WebKit wxWebView backend // // Default is 1 on GTK and OSX diff --git a/include/wx/msw/setup0.h b/include/wx/msw/setup0.h index 22ba9acf3b..471dd40401 100644 --- a/include/wx/msw/setup0.h +++ b/include/wx/msw/setup0.h @@ -760,6 +760,13 @@ #define wxUSE_WEBVIEW_IE 0 #endif +// Use the Edge (Chromium) wxWebView backend (Requires WebView2 SDK) +// +// Default is 0 +// +// Recommended setting: 1 when building for Windows with WebView2 SDK +#define wxUSE_WEBVIEW_EDGE 0 + // Use the WebKit wxWebView backend // // Default is 1 on GTK and OSX diff --git a/include/wx/osx/setup0.h b/include/wx/osx/setup0.h index dcf2fc0333..bcdab60411 100644 --- a/include/wx/osx/setup0.h +++ b/include/wx/osx/setup0.h @@ -766,6 +766,13 @@ #define wxUSE_WEBVIEW_IE 0 #endif +// Use the Edge (Chromium) wxWebView backend (Requires WebView2 SDK) +// +// Default is 0 +// +// Recommended setting: 1 when building for Windows with WebView2 SDK +#define wxUSE_WEBVIEW_EDGE 0 + // Use the WebKit wxWebView backend // // Default is 1 on GTK and OSX diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h index 76b0149ffe..ed372c2b68 100644 --- a/include/wx/setup_inc.h +++ b/include/wx/setup_inc.h @@ -756,6 +756,13 @@ #define wxUSE_WEBVIEW_IE 0 #endif +// Use the Edge (Chromium) wxWebView backend (Requires WebView2 SDK) +// +// Default is 0 +// +// Recommended setting: 1 when building for Windows with WebView2 SDK +#define wxUSE_WEBVIEW_EDGE 0 + // Use the WebKit wxWebView backend // // Default is 1 on GTK and OSX diff --git a/include/wx/univ/setup0.h b/include/wx/univ/setup0.h index 35f85aa0a2..00f7923f77 100644 --- a/include/wx/univ/setup0.h +++ b/include/wx/univ/setup0.h @@ -759,6 +759,13 @@ #define wxUSE_WEBVIEW_IE 0 #endif +// Use the Edge (Chromium) wxWebView backend (Requires WebView2 SDK) +// +// Default is 0 +// +// Recommended setting: 1 when building for Windows with WebView2 SDK +#define wxUSE_WEBVIEW_EDGE 0 + // Use the WebKit wxWebView backend // // Default is 1 on GTK and OSX diff --git a/setup.h.in b/setup.h.in index b2491c00df..6164e14d8d 100644 --- a/setup.h.in +++ b/setup.h.in @@ -336,6 +336,8 @@ #define wxUSE_WEBVIEW_IE 0 #endif +#define wxUSE_WEBVIEW_EDGE 0 + #if (defined(__WXGTK__) && !defined(__WXGTK3__)) || defined(__WXOSX__) #define wxUSE_WEBVIEW_WEBKIT 0 #else