Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix checks for wxUSE_WEBVIEW in MSW config checks

Browse Source 
This fixes -Wundef warnings about "wxUSE_WEB" being not defined when OLE
support is disabled.
This commit is contained in:
stahta01
2017-02-17 16:02:17 -05:00
committed by VZ
parent bac4d24bf9
commit c9fad20b7b
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/wx/msw/chkconf.h
View File

@@ -383,12 +383,12 @@
# define wxUSE_MEDIACTRL 0 # define wxUSE_MEDIACTRL 0
# endif # endif
# endif # endif
# if wxUSE_WEB # if wxUSE_WEBVIEW
# ifdef wxABORT_ON_CONFIG_ERROR # ifdef wxABORT_ON_CONFIG_ERROR
# error "wxWebView requires wxActiveXContainer under MSW" # error "wxWebView requires wxActiveXContainer under MSW"
# else # else
# undef wxUSE_WEB # undef wxUSE_WEBVIEW
# define wxUSE_WEB 0 # define wxUSE_WEBVIEW 0
# endif # endif
# endif # endif
#endif /* !wxUSE_ACTIVEX */ #endif /* !wxUSE_ACTIVEX */
@@ -431,12 +431,12 @@
#if !wxUSE_OLE_AUTOMATION #if !wxUSE_OLE_AUTOMATION
# if wxUSE_WEB # if wxUSE_WEBVIEW
# ifdef wxABORT_ON_CONFIG_ERROR # ifdef wxABORT_ON_CONFIG_ERROR
# error "wxWebView requires wxUSE_OLE_AUTOMATION under MSW" # error "wxWebView requires wxUSE_OLE_AUTOMATION under MSW"
# else # else
# undef wxUSE_WEB # undef wxUSE_WEBVIEW
# define wxUSE_WEB 0 # define wxUSE_WEBVIEW 0
# endif # endif
# endif # endif
#endif /* !wxUSE_OLE_AUTOMATION */ #endif /* !wxUSE_OLE_AUTOMATION */