Only define wxUSE_WEBVIEW if wxWebView is really available.
Don't define wxUSE_WEBVIEW in configure if WebKit is not available under Unix (we should also check for wxUSE_WEBVIEW_IE under Windows later) and add the check that either wxUSE_WEBVIEW_WEBKIT or wxUSE_WEBVIEW_IE is defined if wxUSE_WEBVIEW is to wx/chkconf.h. This makes it possible to just check for wxUSE_WEBVIEW instead of checking for wxUSE_WEBVIEW && (wxUSE_WEBVIEW_IE || wxUSE_WEBVIEW_WEBKIT) as the code did previously which was ugly and error-prone. Also, define wxUSE_WEBVIEW_IE in configure under MSW. Currently this supposes that the required IE headers/libraries are available which is probably wrong, we should add checks for them later. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69108 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -2154,6 +2154,15 @@
|
||||
# endif
|
||||
#endif /* wxUSE_TREELISTCTRL */
|
||||
|
||||
#if wxUSE_WEBVIEW && !(wxUSE_WEBVIEW_WEBKIT || wxUSE_WEBVIEW_IE)
|
||||
# ifdef wxABORT_ON_CONFIG_ERROR
|
||||
# error "wxUSE_WEBVIEW requires at least one backend"
|
||||
# else
|
||||
# undef wxUSE_WEBVIEW
|
||||
# define wxUSE_WEBVIEW 0
|
||||
# endif
|
||||
#endif /* wxUSE_WEBVIEW && !any web view backend */
|
||||
|
||||
#endif /* wxUSE_GUI */
|
||||
|
||||
#endif /* _WX_CHKCONF_H_ */
|
||||
|
Reference in New Issue
Block a user