Rename wxUSE_WEB to wxUSE_WEBVIEW to reflect that actually it specifically toggles the wxWebView class and associated features.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -848,7 +848,7 @@ WX_ARG_FEATURE(richtext, [ --enable-richtext use wxRichTextCtrl], wxUS
|
||||
WX_ARG_FEATURE(postscript, [ --enable-postscript use wxPostscriptDC device context (default for gtk+)], wxUSE_POSTSCRIPT)
|
||||
WX_ARG_FEATURE(printarch, [ --enable-printarch use printing architecture], wxUSE_PRINTING_ARCHITECTURE)
|
||||
WX_ARG_FEATURE(svg, [ --enable-svg use wxSVGFileDC device context], wxUSE_SVG)
|
||||
WX_ARG_FEATURE(web, [ --enable-web use wxWeb library], wxUSE_WEB)
|
||||
WX_ARG_FEATURE(webview, [ --enable-webview use wxWeb library], wxUSE_WEBVIEW)
|
||||
|
||||
dnl wxDC is implemented in terms of wxGraphicsContext in wxOSX so the latter
|
||||
dnl can't be disabled, don't even provide an option to do it
|
||||
@@ -7354,8 +7354,8 @@ if test "$wxUSE_RICHTEXT" = "yes"; then
|
||||
fi
|
||||
|
||||
USE_WEB=0
|
||||
if test "$wxUSE_WEB" = "yes"; then
|
||||
AC_DEFINE(wxUSE_WEB)
|
||||
if test "$wxUSE_WEBVIEW" = "yes"; then
|
||||
AC_DEFINE(wxUSE_WEBVIEW)
|
||||
USE_WEB=1
|
||||
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS web"
|
||||
|
||||
@@ -7803,7 +7803,7 @@ if test "$wxUSE_GUI" = "yes"; then
|
||||
if test "$wxUSE_STC" = "yes" ; then
|
||||
BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
|
||||
fi
|
||||
if test "$wxUSE_WEB" = "yes" ; then
|
||||
if test "$wxUSE_WEBVIEW" = "yes" ; then
|
||||
STD_GUI_LIBS="web $STD_GUI_LIBS"
|
||||
BUILT_WX_LIBS="web $BUILT_WX_LIBS"
|
||||
fi
|
||||
|
Reference in New Issue
Block a user