diff --git a/include/wx/msw/wrl/EventToken.h b/include/wx/msw/wrl/EventToken.h index 3b79b3a26d..8d178baa5a 100644 --- a/include/wx/msw/wrl/EventToken.h +++ b/include/wx/msw/wrl/EventToken.h @@ -7,6 +7,9 @@ // Licence: wxWindows licence /////////////////////////////////////////////////////////////////////////////// +// Note: this include guard uses the same name as winrt/EventToken.h in the +// Windows SDK to prevent a struct type redefinition when both headers are +// included. #ifndef __eventtoken_h__ #define __eventtoken_h__ diff --git a/interface/wx/webview.h b/interface/wx/webview.h index 18581d2c9a..1df97b3d1a 100644 --- a/interface/wx/webview.h +++ b/interface/wx/webview.h @@ -320,7 +320,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 WebView2 SDK