Merge branch 'master' into webview_script_message

2021-03-01 09:57:13 +01:00
parent 5e35e6c635 401d547b2a
commit 80c04e3941
23 changed files with 477 additions and 296 deletions
--- a/interface/wx/webview.h
+++ b/interface/wx/webview.h
@@ -333,7 +333,7 @@ public:
    virtual filesystems, custom urls.

    This backend is not enabled by default, to build it follow these steps:
-    - Visual Studio 2015, or newer, is required
+    - Visual Studio 2015 or newer, or GCC/Clang with c++11 is required
    - With CMake just enable @c wxUSE_WEBVIEW_EDGE
    - When not using CMake:
        - Download the <a href="https://aka.ms/webviewnuget">WebView2 SDK</a>