Added new build option wxUSE_WEBVIEW_EDGE
This commit is contained in:
@@ -420,6 +420,7 @@ if(WIN32)
|
|||||||
wx_option(wxUSE_TASKBARICON_BALLOONS "enable wxTaskBarIcon::ShowBalloon() method (Win32 only)")
|
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_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_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)")
|
wx_option(wxUSE_WXDIB "use wxDIB class (Win32 only)")
|
||||||
if(MSVC_VERSION GREATER 1600 AND NOT CMAKE_VS_PLATFORM_TOOLSET MATCHES "_xp$")
|
if(MSVC_VERSION GREATER 1600 AND NOT CMAKE_VS_PLATFORM_TOOLSET MATCHES "_xp$")
|
||||||
set(wxUSE_WINRT_DEFAULT ON)
|
set(wxUSE_WINRT_DEFAULT ON)
|
||||||
|
@@ -336,6 +336,8 @@
|
|||||||
#cmakedefine01 wxUSE_WEBVIEW_IE
|
#cmakedefine01 wxUSE_WEBVIEW_IE
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#cmakedefine01 wxUSE_WEBVIEW_EDGE
|
||||||
|
|
||||||
#if (defined(__WXGTK__) && !defined(__WXGTK3__)) || defined(__WXOSX__)
|
#if (defined(__WXGTK__) && !defined(__WXGTK3__)) || defined(__WXOSX__)
|
||||||
#cmakedefine01 wxUSE_WEBVIEW_WEBKIT
|
#cmakedefine01 wxUSE_WEBVIEW_WEBKIT
|
||||||
#else
|
#else
|
||||||
|
@@ -759,6 +759,13 @@
|
|||||||
#define wxUSE_WEBVIEW_IE 0
|
#define wxUSE_WEBVIEW_IE 0
|
||||||
#endif
|
#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
|
// Use the WebKit wxWebView backend
|
||||||
//
|
//
|
||||||
// Default is 1 on GTK and OSX
|
// Default is 1 on GTK and OSX
|
||||||
|
@@ -760,6 +760,13 @@
|
|||||||
#define wxUSE_WEBVIEW_IE 0
|
#define wxUSE_WEBVIEW_IE 0
|
||||||
#endif
|
#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
|
// Use the WebKit wxWebView backend
|
||||||
//
|
//
|
||||||
// Default is 1 on GTK and OSX
|
// Default is 1 on GTK and OSX
|
||||||
|
@@ -760,6 +760,13 @@
|
|||||||
#define wxUSE_WEBVIEW_IE 0
|
#define wxUSE_WEBVIEW_IE 0
|
||||||
#endif
|
#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
|
// Use the WebKit wxWebView backend
|
||||||
//
|
//
|
||||||
// Default is 1 on GTK and OSX
|
// Default is 1 on GTK and OSX
|
||||||
|
@@ -760,6 +760,13 @@
|
|||||||
#define wxUSE_WEBVIEW_IE 0
|
#define wxUSE_WEBVIEW_IE 0
|
||||||
#endif
|
#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
|
// Use the WebKit wxWebView backend
|
||||||
//
|
//
|
||||||
// Default is 1 on GTK and OSX
|
// Default is 1 on GTK and OSX
|
||||||
|
@@ -766,6 +766,13 @@
|
|||||||
#define wxUSE_WEBVIEW_IE 0
|
#define wxUSE_WEBVIEW_IE 0
|
||||||
#endif
|
#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
|
// Use the WebKit wxWebView backend
|
||||||
//
|
//
|
||||||
// Default is 1 on GTK and OSX
|
// Default is 1 on GTK and OSX
|
||||||
|
@@ -756,6 +756,13 @@
|
|||||||
#define wxUSE_WEBVIEW_IE 0
|
#define wxUSE_WEBVIEW_IE 0
|
||||||
#endif
|
#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
|
// Use the WebKit wxWebView backend
|
||||||
//
|
//
|
||||||
// Default is 1 on GTK and OSX
|
// Default is 1 on GTK and OSX
|
||||||
|
@@ -759,6 +759,13 @@
|
|||||||
#define wxUSE_WEBVIEW_IE 0
|
#define wxUSE_WEBVIEW_IE 0
|
||||||
#endif
|
#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
|
// Use the WebKit wxWebView backend
|
||||||
//
|
//
|
||||||
// Default is 1 on GTK and OSX
|
// Default is 1 on GTK and OSX
|
||||||
|
@@ -336,6 +336,8 @@
|
|||||||
#define wxUSE_WEBVIEW_IE 0
|
#define wxUSE_WEBVIEW_IE 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define wxUSE_WEBVIEW_EDGE 0
|
||||||
|
|
||||||
#if (defined(__WXGTK__) && !defined(__WXGTK3__)) || defined(__WXOSX__)
|
#if (defined(__WXGTK__) && !defined(__WXGTK3__)) || defined(__WXOSX__)
|
||||||
#define wxUSE_WEBVIEW_WEBKIT 0
|
#define wxUSE_WEBVIEW_WEBKIT 0
|
||||||
#else
|
#else
|
||||||
|
Reference in New Issue
Block a user