Rename wxUSE_WEB to wxUSE_WEBVIEW to reflect that actually it specifically toggles...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/configure.in b/configure.in
index 9c35b151ce440821df6cbf64325673bd60814edc..64fcb9ace4cfddc10d1faeebb2fe39366ef5634f 100644 (file)
--- a/configure.in
+++ b/configure.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

diff --git a/include/wx/setup_inc.h b/include/wx/setup_inc.h
index 22f38675a23086cedb452f5d81806f9c9efe9d05..c96db8881df6b27bca26a96bb1ac10ab2ea26407 100644 (file)
--- a/include/wx/setup_inc.h
+++ b/include/wx/setup_inc.h
@@ -706,7 +706,7 @@
 // Default is 1
 //
 // Recommended setting: 1
-#define wxUSE_WEB 1
+#define wxUSE_WEBVIEW 1
 
 // Use the IE wxWebView backend
 //

diff --git a/include/wx/webview.h b/include/wx/webview.h
index 7c9c4e8276492931dc050079b1c16e8165fe6aea..ced86a7df91b0ce6ff2a214660626650c5176d7d 100644 (file)
--- a/include/wx/webview.h
+++ b/include/wx/webview.h
@@ -12,7 +12,7 @@
 
 #include "wx/setup.h"
 
-#if wxUSE_WEB
+#if wxUSE_WEBVIEW
 
 #include "wx/control.h"
 #include "wx/event.h"
@@ -229,6 +229,6 @@ typedef void (wxEvtHandler::*wxWebViewEventFunction)
     wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, id, \
                      wxWebViewEventHandler(fn))
 
-#endif // wxUSE_WEB
+#endif // wxUSE_WEBVIEW
 
 #endif // _WX_WEB_VIEW_H_

diff --git a/include/wx/webviewarchivehandler.h b/include/wx/webviewarchivehandler.h
index da8a9267945d28d8228b36cc2ef1a2cfab6658b3..305219f02b79de53372c875ba2e3389648a9ea66 100644 (file)
--- a/include/wx/webviewarchivehandler.h
+++ b/include/wx/webviewarchivehandler.h
@@ -12,7 +12,7 @@
 
 #include "wx/setup.h"
 
-#if wxUSE_WEB
+#if wxUSE_WEBVIEW
 
 class wxFSFile;
 class wxFileSystem;
@@ -31,6 +31,6 @@ private:
     wxFileSystem* m_fileSystem;
 };
 
-#endif
+#endif // wxUSE_WEBVIEW
 
 #endif // _WX_WEB_VIEW_FILE_HANDLER_H_

diff --git a/setup.h.in b/setup.h.in
index 54288e8af764bf7971607f719df681dd565de3fa..6921bbf89005c09e8ffcb51b23e5831662202de1 100644 (file)
--- a/setup.h.in
+++ b/setup.h.in
@@ -331,7 +331,7 @@
 
 #define wxUSE_STC 0
 
-#define wxUSE_WEB 0
+#define wxUSE_WEBVIEW 0
 
 #define wxUSE_WEBVIEW_WEBKIT 0
 

diff --git a/src/common/webview.cpp b/src/common/webview.cpp
index 525feeddd9b794a1604bb64e38222d4464732338..258c891ce185c3f68c110585b64056185da46eb6 100644 (file)
--- a/src/common/webview.cpp
+++ b/src/common/webview.cpp
@@ -10,7 +10,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#if wxUSE_WEB
+#if wxUSE_WEBVIEW
 
 #if defined(__BORLANDC__)
     #pragma hdrstop
@@ -112,4 +112,4 @@ wxWebView* wxWebView::New(wxWindow* parent,
     }
 }
 
-#endif // wxUSE_WEB
+#endif // wxUSE_WEBVIEW

diff --git a/src/common/webviewarchivehandler.cpp b/src/common/webviewarchivehandler.cpp
index 9a445526c39896cd21938d7f5feb5cedd6ee7049..10f15df7e07918728c78ec6ee622ca06bfb55840 100644 (file)
--- a/src/common/webviewarchivehandler.cpp
+++ b/src/common/webviewarchivehandler.cpp
@@ -10,7 +10,7 @@
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
-#if wxUSE_WEB
+#if wxUSE_WEBVIEW
 
 #if defined(__BORLANDC__)
     #pragma hdrstop
@@ -110,4 +110,4 @@ wxFSFile* wxWebViewArchiveHandler::GetFile(const wxString &uri)
     }
 }
 
-#endif // wxUSE_WEB
+#endif // wxUSE_WEBVIEW

diff --git a/tests/controls/webtest.cpp b/tests/controls/webtest.cpp
index ae4cfe224571521ce30e2b13da621dea3e1ff154..0d6bbc5347b7fb791562ad6fa59540caf58b661c 100644 (file)
--- a/tests/controls/webtest.cpp
+++ b/tests/controls/webtest.cpp
@@ -9,7 +9,7 @@
 
 #include "testprec.h"
 
-#if wxUSE_WEB
+#if wxUSE_WEBVIEW
 
 #ifdef __BORLANDC__
     #pragma hdrstop
@@ -244,4 +244,4 @@ void WebTestCase::RunScript()
     CPPUNIT_ASSERT_EQUAL("Hello World!", m_browser->GetPageText());
 }
 
-#endif //wxUSE_WEB
+#endif //wxUSE_WEBVIEW