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

Rename wxUSE_WEB to wxUSE_WEBVIEW to reflect that actually it specifically toggles the wxWebView class and associated features.

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/SOC2011_WEBVIEW@68788 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Steve Lamerton
2011-08-19 09:15:06 +00:00
parent 000a9e77b0
commit e7aef23e7b
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
configure.in
View File

@@ -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(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(printarch, [ --enable-printarch use printing architecture], wxUSE_PRINTING_ARCHITECTURE)
WX_ARG_FEATURE(svg, [ --enable-svg use wxSVGFileDC device context], wxUSE_SVG) 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 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 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 fi
USE_WEB=0 USE_WEB=0
if test "$wxUSE_WEB" = "yes"; then if test "$wxUSE_WEBVIEW" = "yes"; then
AC_DEFINE(wxUSE_WEB) AC_DEFINE(wxUSE_WEBVIEW)
USE_WEB=1 USE_WEB=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS web" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS web"
@@ -7803,7 +7803,7 @@ if test "$wxUSE_GUI" = "yes"; then
if test "$wxUSE_STC" = "yes" ; then if test "$wxUSE_STC" = "yes" ; then
BUILT_WX_LIBS="stc $BUILT_WX_LIBS" BUILT_WX_LIBS="stc $BUILT_WX_LIBS"
fi fi
if test "$wxUSE_WEB" = "yes" ; then if test "$wxUSE_WEBVIEW" = "yes" ; then
STD_GUI_LIBS="web $STD_GUI_LIBS" STD_GUI_LIBS="web $STD_GUI_LIBS"
BUILT_WX_LIBS="web $BUILT_WX_LIBS" BUILT_WX_LIBS="web $BUILT_WX_LIBS"
fi fi

2
include/wx/setup_inc.h
View File

@@ -706,7 +706,7 @@
// Default is 1 // Default is 1
// //
// Recommended setting: 1 // Recommended setting: 1
#define wxUSE_WEB 1 #define wxUSE_WEBVIEW 1
// Use the IE wxWebView backend // Use the IE wxWebView backend
// //

4
include/wx/webview.h
View File

@@ -12,7 +12,7 @@
#include "wx/setup.h" #include "wx/setup.h"
#if wxUSE_WEB #if wxUSE_WEBVIEW
#include "wx/control.h" #include "wx/control.h"
#include "wx/event.h" #include "wx/event.h"
@@ -229,6 +229,6 @@ typedef void (wxEvtHandler::*wxWebViewEventFunction)
wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, id, \ wx__DECLARE_EVT1(wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, id, \
wxWebViewEventHandler(fn)) wxWebViewEventHandler(fn))
#endif // wxUSE_WEB #endif // wxUSE_WEBVIEW
#endif // _WX_WEB_VIEW_H_ #endif // _WX_WEB_VIEW_H_

4
include/wx/webviewarchivehandler.h
View File

@@ -12,7 +12,7 @@
#include "wx/setup.h" #include "wx/setup.h"
#if wxUSE_WEB #if wxUSE_WEBVIEW
class wxFSFile; class wxFSFile;
class wxFileSystem; class wxFileSystem;
@@ -31,6 +31,6 @@ private:
wxFileSystem* m_fileSystem; wxFileSystem* m_fileSystem;
}; };
#endif #endif // wxUSE_WEBVIEW
#endif // _WX_WEB_VIEW_FILE_HANDLER_H_ #endif // _WX_WEB_VIEW_FILE_HANDLER_H_

2
setup.h.in
View File

@@ -331,7 +331,7 @@
#define wxUSE_STC 0 #define wxUSE_STC 0
#define wxUSE_WEB 0 #define wxUSE_WEBVIEW 0
#define wxUSE_WEBVIEW_WEBKIT 0 #define wxUSE_WEBVIEW_WEBKIT 0

4
src/common/webview.cpp
View File

@@ -10,7 +10,7 @@
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
#if wxUSE_WEB #if wxUSE_WEBVIEW
#if defined(__BORLANDC__) #if defined(__BORLANDC__)
#pragma hdrstop #pragma hdrstop
@@ -112,4 +112,4 @@ wxWebView* wxWebView::New(wxWindow* parent,
} }
} }
#endif // wxUSE_WEB #endif // wxUSE_WEBVIEW

4
src/common/webviewarchivehandler.cpp
View File

@@ -10,7 +10,7 @@
// For compilers that support precompilation, includes "wx.h". // For compilers that support precompilation, includes "wx.h".
#include "wx/wxprec.h" #include "wx/wxprec.h"
#if wxUSE_WEB #if wxUSE_WEBVIEW
#if defined(__BORLANDC__) #if defined(__BORLANDC__)
#pragma hdrstop #pragma hdrstop
@@ -110,4 +110,4 @@ wxFSFile* wxWebViewArchiveHandler::GetFile(const wxString &uri)
} }
} }
#endif // wxUSE_WEB #endif // wxUSE_WEBVIEW

4
tests/controls/webtest.cpp
View File

@@ -9,7 +9,7 @@
#include "testprec.h" #include "testprec.h"
#if wxUSE_WEB #if wxUSE_WEBVIEW
#ifdef __BORLANDC__ #ifdef __BORLANDC__
#pragma hdrstop #pragma hdrstop
@@ -244,4 +244,4 @@ void WebTestCase::RunScript()
CPPUNIT_ASSERT_EQUAL("Hello World!", m_browser->GetPageText()); CPPUNIT_ASSERT_EQUAL("Hello World!", m_browser->GetPageText());
} }
#endif //wxUSE_WEB #endif //wxUSE_WEBVIEW