solemnwarning/wxwidgets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge remote-tracking branch 'MaartenBent/chromium' into webview-chromium

Browse source 
Fix CMake support.
This commit is contained in:
Vadim Zeitlin 2023-12-28 18:57:07 +01:00
commit a942fb1774
18 changed files with 258 additions and 167 deletions
Download patch file Download diff file Expand all files Collapse all files

8
include/wx/msw/chkconf.h
View file

@ -339,12 +339,12 @@
# define wxUSE_MEDIACTRL 0
# endif
# endif
# if wxUSE_WEBVIEW
# if wxUSE_WEBVIEW && wxUSE_WEBVIEW_IE
# ifdef wxABORT_ON_CONFIG_ERROR
# error "wxWebView requires wxActiveXContainer under MSW"
# error "wxWebViewIE requires wxActiveXContainer under MSW"
# else
# undef wxUSE_WEBVIEW
# define wxUSE_WEBVIEW 0
# undef wxUSE_WEBVIEW_IE
# define wxUSE_WEBVIEW_IE 0
# endif
# endif
#endif /* !wxUSE_ACTIVEX */