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

Rename web library to webview.

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

2
build/bakefiles/build_cfg.bkl
View File

@@ -39,7 +39,7 @@
@echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE) @echo USE_THREADS=$(USE_THREADS) >>$(BUILD_CFG_FILE)
@echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE) @echo USE_GUI=$(USE_GUI) >>$(BUILD_CFG_FILE)
@echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE) @echo USE_HTML=$(USE_HTML) >>$(BUILD_CFG_FILE)
@echo USE_WEB=$(USE_WEB) >>$(BUILD_CFG_FILE) @echo USE_WEBVIEW=$(USE_WEBVIEW) >>$(BUILD_CFG_FILE)
@echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE) @echo USE_MEDIA=$(USE_MEDIA) >>$(BUILD_CFG_FILE)
@echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE) @echo USE_OPENGL=$(USE_OPENGL) >>$(BUILD_CFG_FILE)
@echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE) @echo USE_QA=$(USE_QA) >>$(BUILD_CFG_FILE)

4
build/bakefiles/common.bkl
View File

@@ -161,8 +161,8 @@
<set var="WXLIB_STC"> <set var="WXLIB_STC">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if> <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('stc')))</if>
</set> </set>
<set var="WXLIB_WEB"> <set var="WXLIB_WEBVIEW">
<if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('web')))</if> <if cond="MONOLITHIC=='0'">$(mk.evalExpr(wxwin.mkLibName('webview')))</if>
</set> </set>
<set var="WXLIB_MONO"> <set var="WXLIB_MONO">
<if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if> <if cond="MONOLITHIC=='1'">$(mk.evalExpr(wxwin.mkLibName('mono')))</if>

10
build/bakefiles/config.bkl
View File

@@ -200,11 +200,11 @@ Default is to use debug CRT if and only if BUILD==debug.
</description> </description>
</option> </option>
<option name="USE_WEB"> <option name="USE_WEBVIEW">
<values>0,1</values> <values>0,1</values>
<default-value>1</default-value> <default-value>1</default-value>
<description> <description>
Build wxWeb library (USE_GUI must be 1)? Build wxWebView library (USE_GUI must be 1)?
</description> </description>
</option> </option>
@@ -380,7 +380,7 @@ to run the tests, include CppUnit library here.
<option name="EXTRALIBS"/> <option name="EXTRALIBS"/>
<option name="EXTRALIBS_XML"/> <option name="EXTRALIBS_XML"/>
<option name="EXTRALIBS_HTML"/> <option name="EXTRALIBS_HTML"/>
<option name="EXTRALIBS_WEB"/> <option name="EXTRALIBS_WEBVIEW"/>
<option name="EXTRALIBS_MEDIA"/> <option name="EXTRALIBS_MEDIA"/>
<option name="EXTRALIBS_GUI"/> <option name="EXTRALIBS_GUI"/>
<option name="EXTRALIBS_OPENGL"/> <option name="EXTRALIBS_OPENGL"/>
@@ -441,7 +441,7 @@ it if SHARED=1 unless you know what you are doing.
<set var="EXTRALIBS"/> <set var="EXTRALIBS"/>
<set var="EXTRALIBS_XML"/> <set var="EXTRALIBS_XML"/>
<set var="EXTRALIBS_HTML"/> <set var="EXTRALIBS_HTML"/>
<set var="EXTRALIBS_WEB"/> <set var="EXTRALIBS_WEBVIEW"/>
<set var="EXTRALIBS_MEDIA"/> <set var="EXTRALIBS_MEDIA"/>
<set var="EXTRALIBS_GUI"/> <set var="EXTRALIBS_GUI"/>
<set var="EXTRALIBS_OPENGL"> <set var="EXTRALIBS_OPENGL">
@@ -490,7 +490,7 @@ Set the version of your Mingw installation here.
<set var="USE_RICHTEXT">1</set> <set var="USE_RICHTEXT">1</set>
<set var="USE_STC">1</set> <set var="USE_STC">1</set>
<set var="USE_HTML">1</set> <set var="USE_HTML">1</set>
<set var="USE_WEB">1</set> <set var="USE_WEBVIEW">1</set>
<set var="USE_MEDIA">1</set> <set var="USE_MEDIA">1</set>
<set var="USE_XRC">1</set> <set var="USE_XRC">1</set>
<set var="USE_OPENGL">1</set> <set var="USE_OPENGL">1</set>

16
build/bakefiles/files.bkl
View File

@@ -3346,21 +3346,21 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
</set> </set>
<!-- ====================================================================== --> <!-- ====================================================================== -->
<!-- wxWEB --> <!-- wxWEBVIEW -->
<!-- ====================================================================== --> <!-- ====================================================================== -->
<set var="WEB_SRC_PLATFORM"> <set var="WEBVIEW_SRC_PLATFORM">
<if cond="TOOLKIT=='MSW'">src/msw/webview_ie.cpp</if> <if cond="TOOLKIT=='MSW'">src/msw/webview_ie.cpp</if>
<if cond="PLATFORM_UNIX=='1'">src/gtk/webview_webkit.cpp</if> <if cond="PLATFORM_UNIX=='1'">src/gtk/webview_webkit.cpp</if>
<if cond="PLATFORM_MACOSX=='1'">src/osx/webview_webkit.mm</if> <if cond="PLATFORM_MACOSX=='1'">src/osx/webview_webkit.mm</if>
</set> </set>
<set var="WEB_SRC" hints="files"> <set var="WEBVIEW_SRC" hints="files">
$(WEB_SRC_PLATFORM) $(WEBVIEW_SRC_PLATFORM)
src/common/webview.cpp src/common/webview.cpp
src/common/webviewarchivehandler.cpp src/common/webviewarchivehandler.cpp
</set> </set>
<set var="WEB_HDR_PLATFORM" hints="files"> <set var="WEBVIEW_HDR_PLATFORM" hints="files">
<if cond="TOOLKIT=='MSW'"> <if cond="TOOLKIT=='MSW'">
wx/msw/webviewhistoryitem_ie.h wx/msw/webviewhistoryitem_ie.h
wx/msw/webview_ie.h wx/msw/webview_ie.h
@@ -3374,8 +3374,8 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
wx/osx/webview_webkit.h wx/osx/webview_webkit.h
</if> </if>
</set> </set>
<set var="WEB_HDR" hints="files"> <set var="WEBVIEW_HDR" hints="files">
$(WEB_HDR_PLATFORM) $(WEBVIEW_HDR_PLATFORM)
wx/webview.h wx/webview.h
wx/webviewarchivehandler.h wx/webviewarchivehandler.h
</set> </set>
@@ -3981,7 +3981,7 @@ IMPORTANT: please read docs/tech/tn0016.txt before modifying this file!
$(GUI_CORE_HEADERS) $(GUI_CORE_HEADERS)
$(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR) $(ADVANCED_HDR) $(MEDIA_HDR) $(HTML_HDR)
$(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR) $(OPENGL_HDR) $(QA_HDR) $(XRC_HDR) $(AUI_HDR) $(PROPGRID_HDR)
$(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) ${WEB_HDR} $(RIBBON_HDR) $(RICHTEXT_HDR) $(STC_HDR) ${WEBVIEW_HDR}
</if> </if>
</set> </set>

8
build/bakefiles/monolithic.bkl
View File

@@ -4,9 +4,9 @@
<set var="MONOLIB_GUI_SRC"> <set var="MONOLIB_GUI_SRC">
<if cond="USE_GUI=='1'"> <if cond="USE_GUI=='1'">
$(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(WEB_SRC) $(QA_SRC) $(CORE_SRC) $(ADVANCED_SRC) $(MEDIA_SRC) $(HTML_SRC) $(WEBVIEW_SRC)
$(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RIBBON_SRC) $(RICHTEXT_SRC) $(QA_SRC) $(XRC_SRC) $(AUI_SRC) $(PROPGRID_SRC) $(RIBBON_SRC)
$(STC_SRC) $(RICHTEXT_SRC) $(STC_SRC)
</if> </if>
</set> </set>
<set var="MONOLIB_SRC"> <set var="MONOLIB_SRC">
@@ -25,7 +25,7 @@
<define>WXMAKINGDLL</define> <define>WXMAKINGDLL</define>
<ldlibs>$(EXTRALIBS_XML)</ldlibs> <ldlibs>$(EXTRALIBS_XML)</ldlibs>
<ldlibs>$(EXTRALIBS_HTML)</ldlibs> <ldlibs>$(EXTRALIBS_HTML)</ldlibs>
<ldlibs>$(EXTRALIBS_WEB)</ldlibs> <ldlibs>$(EXTRALIBS_WEBVIEW)</ldlibs>
<ldlibs>$(EXTRALIBS_MEDIA)</ldlibs> <ldlibs>$(EXTRALIBS_MEDIA)</ldlibs>
<ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs> <ldlibs>$(PLUGIN_MONOLIB_EXTRALIBS)</ldlibs>
<library>$(wxscintilla_library_link)</library> <library>$(wxscintilla_library_link)</library>

24
build/bakefiles/multilib.bkl
View File

@@ -174,28 +174,28 @@
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set> <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">html=htmllib+htmldll</set>
<!-- ================================================================ --> <!-- ================================================================ -->
<!-- wxWEB --> <!-- wxWEBVIEW -->
<!-- ================================================================ --> <!-- ================================================================ -->
<dll id="webdll" template="wx_dll" <dll id="webviewdll" template="wx_dll"
cond="SHARED=='1' and USE_GUI=='1' and USE_WEB=='1' and MONOLITHIC=='0'"> cond="SHARED=='1' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
<define>WXUSINGDLL</define> <define>WXUSINGDLL</define>
<define>WXMAKINGDLL_WEB</define> <define>WXMAKINGDLL_WEBVIEW</define>
<sources>$(WEB_SRC)</sources> <sources>$(WEBVIEW_SRC)</sources>
<library>coredll</library> <library>coredll</library>
<library>basedll</library> <library>basedll</library>
<msvc-headers>$(WEB_HDR)</msvc-headers> <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
</dll> </dll>
<lib id="weblib" template="wx_lib" <lib id="webviewlib" template="wx_lib"
cond="SHARED=='0' and USE_GUI=='1' and USE_WEB=='1' and MONOLITHIC=='0'"> cond="SHARED=='0' and USE_GUI=='1' and USE_WEBVIEW=='1' and MONOLITHIC=='0'">
<sources>$(WEB_SRC)</sources> <sources>$(WEBVIEW_SRC)</sources>
<msvc-headers>$(WEB_HDR)</msvc-headers> <msvc-headers>$(WEBVIEW_HDR)</msvc-headers>
</lib> </lib>
<wxshortcut id="wxweb" cond="MONOLITHIC=='0' and USE_WEB=='1'"/> <wxshortcut id="wxwebview" cond="MONOLITHIC=='0' and USE_WEBVIEW=='1'"/>
<set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">web=weblib+webdll</set> <set var="MSVC6PRJ_MERGED_TARGETS_MULTILIB" append="1">webview=webviewlib+webviewdll</set>
<!-- ================================================================ --> <!-- ================================================================ -->
<!-- OpenGL --> <!-- OpenGL -->

4
build/bakefiles/wxpresets/presets/wx.bkl
View File

@@ -89,6 +89,7 @@
NOTE: as a reference here is a list of all wxWidgets libraries satisfying NOTE: as a reference here is a list of all wxWidgets libraries satisfying
the dependency constraints mentioned in <wx-lib> description: the dependency constraints mentioned in <wx-lib> description:
<wx-lib>webview</wx-lib>
<wx-lib>richtext</wx-lib> <wx-lib>richtext</wx-lib>
<wx-lib>aui</wx-lib> <wx-lib>aui</wx-lib>
<wx-lib>ribbon</wx-lib> <wx-lib>ribbon</wx-lib>
@@ -104,7 +105,6 @@
<wx-lib>xml</wx-lib> <wx-lib>xml</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>
<wx-lib>base</wx-lib> <wx-lib>base</wx-lib>
<wx-lib>web</wx-lib>
--> -->
@@ -125,7 +125,7 @@
tag definitions. tag definitions.
--> -->
<set var="WX_LIB_LIST"> <set var="WX_LIB_LIST">
base core net xml xrc html adv media gl qa aui ribbon propgrid richtext stc web base core net xml xrc html adv media gl qa aui ribbon propgrid richtext stc webview
</set> </set>
<!-- if you define this variable to 0 before including wx presets, the <!-- if you define this variable to 0 before including wx presets, the

4
build/bakefiles/wxwin.py
View File

@@ -39,12 +39,12 @@ def mk_wxid(id):
# All libs that are part of the main library: # All libs that are part of the main library:
MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net', 'web', MAIN_LIBS = ['mono', 'base', 'core', 'adv', 'html', 'xml', 'net', 'webview',
'media', 'qa', 'xrc', 'aui', 'ribbon', 'propgrid', 'richtext', 'stc'] 'media', 'qa', 'xrc', 'aui', 'ribbon', 'propgrid', 'richtext', 'stc']
# List of library names/ids for categories with different names: # List of library names/ids for categories with different names:
LIBS_NOGUI = ['xml', 'net'] LIBS_NOGUI = ['xml', 'net']
LIBS_GUI = ['core', 'adv', 'html', 'gl', 'qa', 'xrc', 'media', LIBS_GUI = ['core', 'adv', 'html', 'gl', 'qa', 'xrc', 'media',
'aui', 'propgrid', 'richtext', 'stc', 'ribbon', 'web'] 'aui', 'propgrid', 'richtext', 'stc', 'ribbon', 'webview']
# Additional libraries that must be linked in: # Additional libraries that must be linked in:
EXTRALIBS = { EXTRALIBS = {
'gl' : '$(EXTRALIBS_OPENGL)', 'gl' : '$(EXTRALIBS_OPENGL)',

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(webview, [ --enable-webview use wxWeb library], wxUSE_WEBVIEW) WX_ARG_FEATURE(webview, [ --enable-webview use wxWebView 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
@@ -7353,11 +7353,11 @@ if test "$wxUSE_RICHTEXT" = "yes"; then
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS richtext"
fi fi
USE_WEB=0 USE_WEBVIEW=0
if test "$wxUSE_WEBVIEW" = "yes"; then if test "$wxUSE_WEBVIEW" = "yes"; then
AC_DEFINE(wxUSE_WEBVIEW) AC_DEFINE(wxUSE_WEBVIEW)
USE_WEB=1 USE_WEBVIEW=1
SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS web" SAMPLES_SUBDIRS="$SAMPLES_SUBDIRS webview"
if test "$wxUSE_WEBVIEW_WEBKIT" = "yes" -a "$wxUSE_GTK" = 1; then if test "$wxUSE_WEBVIEW_WEBKIT" = "yes" -a "$wxUSE_GTK" = 1; then
AC_DEFINE(wxUSE_WEBVIEW_WEBKIT) AC_DEFINE(wxUSE_WEBVIEW_WEBKIT)

4
include/msvc/wx/setup.h
View File

@@ -187,8 +187,8 @@
#pragma comment(lib, wxMSW_LIB_NAME("stc")) #pragma comment(lib, wxMSW_LIB_NAME("stc"))
#pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla")) #pragma comment(lib, wx3RD_PARTY_LIB_NAME("scintilla"))
#endif #endif
#if wxUSE_WEB && !defined(wxNO_WEB_LIB) #if wxUSE_WEBVIEW && !defined(wxNO_WEBVIEW_LIB)
#pragma comment(lib, wxMSW_LIB_NAME("web")) #pragma comment(lib, wxMSW_LIB_NAME("webview"))
#endif #endif
#endif // wxUSE_GUI #endif // wxUSE_GUI

20
include/wx/dlimpexp.h
View File

@@ -102,7 +102,7 @@
# define WXMAKINGDLL_RICHTEXT # define WXMAKINGDLL_RICHTEXT
# define WXMAKINGDLL_MEDIA # define WXMAKINGDLL_MEDIA
# define WXMAKINGDLL_STC # define WXMAKINGDLL_STC
# define WXMAKINGDLL_WEB # define WXMAKINGDLL_WEBVIEW
#endif /* WXMAKINGDLL */ #endif /* WXMAKINGDLL */
/* /*
@@ -275,15 +275,15 @@
# define WXDLLIMPEXP_DATA_STC(type) type # define WXDLLIMPEXP_DATA_STC(type) type
#endif #endif
#ifdef WXMAKINGDLL_WEB #ifdef WXMAKINGDLL_WEBVIEW
# define WXDLLIMPEXP_WEB WXEXPORT # define WXDLLIMPEXP_WEBVIEW WXEXPORT
# define WXDLLIMPEXP_DATA_WEB(type) WXEXPORT type # define WXDLLIMPEXP_DATA_WEBVIEW(type) WXEXPORT type
#elif defined(WXUSINGDLL) #elif defined(WXUSINGDLL)
# define WXDLLIMPEXP_WEB WXIMPORT # define WXDLLIMPEXP_WEBVIEW WXIMPORT
# define WXDLLIMPEXP_DATA_WEB(type) WXIMPORT type # define WXDLLIMPEXP_DATA_WEBVIEW(type) WXIMPORT type
#else /* not making nor using DLL */ #else /* not making nor using DLL */
# define WXDLLIMPEXP_WEB # define WXDLLIMPEXP_WEBVIEW
# define WXDLLIMPEXP_DATA_WEB(type) type # define WXDLLIMPEXP_DATA_WEBVIEW(type) type
#endif #endif
/* /*
@@ -307,7 +307,7 @@
#define WXDLLIMPEXP_FWD_RICHTEXT #define WXDLLIMPEXP_FWD_RICHTEXT
#define WXDLLIMPEXP_FWD_MEDIA #define WXDLLIMPEXP_FWD_MEDIA
#define WXDLLIMPEXP_FWD_STC #define WXDLLIMPEXP_FWD_STC
#define WXDLLIMPEXP_FWD_WEB #define WXDLLIMPEXP_FWD_WEBVIEW
#else #else
#define WXDLLIMPEXP_FWD_BASE WXDLLIMPEXP_BASE #define WXDLLIMPEXP_FWD_BASE WXDLLIMPEXP_BASE
#define WXDLLIMPEXP_FWD_NET WXDLLIMPEXP_NET #define WXDLLIMPEXP_FWD_NET WXDLLIMPEXP_NET
@@ -323,7 +323,7 @@
#define WXDLLIMPEXP_FWD_RICHTEXT WXDLLIMPEXP_RICHTEXT #define WXDLLIMPEXP_FWD_RICHTEXT WXDLLIMPEXP_RICHTEXT
#define WXDLLIMPEXP_FWD_MEDIA WXDLLIMPEXP_MEDIA #define WXDLLIMPEXP_FWD_MEDIA WXDLLIMPEXP_MEDIA
#define WXDLLIMPEXP_FWD_STC WXDLLIMPEXP_STC #define WXDLLIMPEXP_FWD_STC WXDLLIMPEXP_STC
#define WXDLLIMPEXP_FWD_WEB WXDLLIMPEXP_WEB #define WXDLLIMPEXP_FWD_WEBVIEW WXDLLIMPEXP_WEBVIEW
#endif #endif
/* for backwards compatibility, define suffix-less versions too */ /* for backwards compatibility, define suffix-less versions too */

2
include/wx/gtk/webview_webkit.h
View File

@@ -22,7 +22,7 @@
// wxWebViewWebKit // wxWebViewWebKit
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
class WXDLLIMPEXP_WEB wxWebViewWebKit : public wxWebView class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView
{ {
public: public:
wxWebViewWebKit() { Init(); } wxWebViewWebKit() { Init(); }

2
include/wx/gtk/webviewhistoryitem_webkit.h
View File

@@ -16,7 +16,7 @@
#include "webkit/webkit.h" #include "webkit/webkit.h"
class WXDLLIMPEXP_WEB wxWebViewHistoryItem class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
{ {
public: public:
wxWebViewHistoryItem(const wxString& url, const wxString& title) : wxWebViewHistoryItem(const wxString& url, const wxString& title) :

2
include/wx/msw/webview_ie.h
View File

@@ -24,7 +24,7 @@
struct IHTMLDocument2; struct IHTMLDocument2;
class wxFSFile; class wxFSFile;
class WXDLLIMPEXP_WEB wxWebViewIE : public wxWebView class WXDLLIMPEXP_WEBVIEW wxWebViewIE : public wxWebView
{ {
public: public:

2
include/wx/msw/webviewhistoryitem_ie.h
View File

@@ -14,7 +14,7 @@
#if wxUSE_WEBVIEW_IE && defined(__WXMSW__) #if wxUSE_WEBVIEW_IE && defined(__WXMSW__)
class WXDLLIMPEXP_WEB wxWebViewHistoryItem class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
{ {
public: public:
wxWebViewHistoryItem(const wxString& url, const wxString& title) : wxWebViewHistoryItem(const wxString& url, const wxString& title) :

2
include/wx/osx/webview_webkit.h
View File

@@ -25,7 +25,7 @@
// Web Kit Control // Web Kit Control
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
class WXDLLIMPEXP_WEB wxWebViewWebKit : public wxWebView class WXDLLIMPEXP_WEBVIEW wxWebViewWebKit : public wxWebView
{ {
public: public:
wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit); wxDECLARE_DYNAMIC_CLASS(wxWebViewWebKit);

2
include/wx/osx/webviewhistoryitem_webkit.h
View File

@@ -15,7 +15,7 @@
#if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \ #if wxUSE_WEBVIEW_WEBKIT && (defined(__WXOSX_COCOA__) \
|| defined(__WXOSX_CARBON__)) || defined(__WXOSX_CARBON__))
class WXDLLIMPEXP_WEB wxWebViewHistoryItem class WXDLLIMPEXP_WEBVIEW wxWebViewHistoryItem
{ {
public: public:
wxWebViewHistoryItem(const wxString& url, const wxString& title) : wxWebViewHistoryItem(const wxString& url, const wxString& title) :

22
include/wx/webview.h
View File

@@ -70,7 +70,7 @@ enum wxWebViewBackend
}; };
//Base class for custom scheme handlers //Base class for custom scheme handlers
class WXDLLIMPEXP_WEB wxWebViewHandler class WXDLLIMPEXP_WEBVIEW wxWebViewHandler
{ {
public: public:
wxWebViewHandler(const wxString& scheme) : m_scheme(scheme) {} wxWebViewHandler(const wxString& scheme) : m_scheme(scheme) {}
@@ -80,10 +80,10 @@ private:
wxString m_scheme; wxString m_scheme;
}; };
extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewNameStr[]; extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewNameStr[];
extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewDefaultURLStr[]; extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewDefaultURLStr[];
class WXDLLIMPEXP_WEB wxWebView : public wxControl class WXDLLIMPEXP_WEBVIEW wxWebView : public wxControl
{ {
public: public:
@@ -171,7 +171,7 @@ public:
wxDECLARE_ABSTRACT_CLASS(wxWebView); wxDECLARE_ABSTRACT_CLASS(wxWebView);
}; };
class WXDLLIMPEXP_WEB wxWebViewEvent : public wxNotifyEvent class WXDLLIMPEXP_WEBVIEW wxWebViewEvent : public wxNotifyEvent
{ {
public: public:
wxWebViewEvent() {} wxWebViewEvent() {}
@@ -192,12 +192,12 @@ private:
wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWebViewEvent); wxDECLARE_DYNAMIC_CLASS_NO_ASSIGN(wxWebViewEvent);
}; };
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEB, wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebViewEvent ); wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_NAVIGATING, wxWebViewEvent );
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEB, wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebViewEvent ); wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_NAVIGATED, wxWebViewEvent );
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEB, wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebViewEvent ); wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_LOADED, wxWebViewEvent );
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEB, wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebViewEvent ); wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_ERROR, wxWebViewEvent );
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEB, wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, wxWebViewEvent ); wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_NEWWINDOW, wxWebViewEvent );
wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEB, wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, wxWebViewEvent ); wxDECLARE_EXPORTED_EVENT( WXDLLIMPEXP_WEBVIEW, wxEVT_COMMAND_WEB_VIEW_TITLE_CHANGED, wxWebViewEvent );
typedef void (wxEvtHandler::*wxWebViewEventFunction) typedef void (wxEvtHandler::*wxWebViewEventFunction)
(wxWebViewEvent&); (wxWebViewEvent&);

2
include/wx/webviewarchivehandler.h
View File

@@ -22,7 +22,7 @@ class wxFileSystem;
//Loads from uris such as scheme:///C:/example/example.html or archives such as //Loads from uris such as scheme:///C:/example/example.html or archives such as
//scheme:///C:/example/example.zip;protocol=zip/example.html //scheme:///C:/example/example.zip;protocol=zip/example.html
class WXDLLIMPEXP_WEB wxWebViewArchiveHandler : public wxWebViewHandler class WXDLLIMPEXP_WEBVIEW wxWebViewArchiveHandler : public wxWebViewHandler
{ {
public: public:
wxWebViewArchiveHandler(const wxString& scheme); wxWebViewArchiveHandler(const wxString& scheme);

2
samples/samples.bkl
View File

@@ -87,7 +87,7 @@
<subproject id="uiaction" template="sub"/> <subproject id="uiaction" template="sub"/>
<subproject id="validate" template="sub"/> <subproject id="validate" template="sub"/>
<subproject id="vscroll" template="sub"/> <subproject id="vscroll" template="sub"/>
<subproject id="web" template="sub"/> <subproject id="webview" template="sub"/>
<subproject id="widgets" template="sub"/> <subproject id="widgets" template="sub"/>
<subproject id="wizard" template="sub"/> <subproject id="wizard" template="sub"/>
<subproject id="wrapsizer" template="sub"/> <subproject id="wrapsizer" template="sub"/>

0
samples/web/Makefile.in → samples/webview/Makefile.in
View File

0
samples/web/makefile.bcc → samples/webview/makefile.bcc
View File

0
samples/web/makefile.gcc → samples/webview/makefile.gcc
View File

0
samples/web/makefile.unx → samples/webview/makefile.unx
View File

0
samples/web/makefile.vc → samples/webview/makefile.vc
View File

0
samples/web/makefile.wat → samples/webview/makefile.wat
View File

0
samples/web/refresh.xpm → samples/webview/refresh.xpm
View File

0
samples/web/stop.xpm → samples/webview/stop.xpm
View File

0
samples/web/web.dsp → samples/webview/web.dsp
View File

0
samples/web/web_vc7.vcproj → samples/webview/web_vc7.vcproj
View File

0
samples/web/web_vc8.vcproj → samples/webview/web_vc8.vcproj
View File

0
samples/web/web_vc9.vcproj → samples/webview/web_vc9.vcproj
View File

6
samples/web/web.bkl → samples/webview/webview.bkl
View File

@@ -4,12 +4,12 @@
<include file="../../build/bakefiles/common_samples.bkl"/> <include file="../../build/bakefiles/common_samples.bkl"/>
<exe id="web" template="wx_sample" template_append="wx_append"> <exe id="webview" template="wx_sample" template_append="wx_append">
<sources> <sources>
web.cpp webview.cpp
</sources> </sources>
<headers></headers> <headers></headers>
<wx-lib>web</wx-lib> <wx-lib>webview</wx-lib>
<wx-lib>stc</wx-lib> <wx-lib>stc</wx-lib>
<wx-lib>adv</wx-lib> <wx-lib>adv</wx-lib>
<wx-lib>core</wx-lib> <wx-lib>core</wx-lib>

2
samples/web/web.cpp → samples/webview/webview.cpp
View File

@@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: web.cpp // Name: webview.cpp
// Purpose: wxWebView sample // Purpose: wxWebView sample
// Author: Marianne Gagnon // Author: Marianne Gagnon
// Id: $Id$ // Id: $Id$

0
samples/web/wxlogo.xpm → samples/webview/wxlogo.xpm
View File

6
src/common/webview.cpp
View File

@@ -24,10 +24,10 @@
// DLL options compatibility check: // DLL options compatibility check:
#include "wx/app.h" #include "wx/app.h"
WX_CHECK_BUILD_OPTIONS("wxWEB") WX_CHECK_BUILD_OPTIONS("wxWEBVIEW")
extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewNameStr[] = "wxWebView"; extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewNameStr[] = "wxWebView";
extern WXDLLIMPEXP_DATA_WEB(const char) wxWebViewDefaultURLStr[] = "about:blank"; extern WXDLLIMPEXP_DATA_WEBVIEW(const char) wxWebViewDefaultURLStr[] = "about:blank";
wxIMPLEMENT_ABSTRACT_CLASS(wxWebView, wxControl); wxIMPLEMENT_ABSTRACT_CLASS(wxWebView, wxControl);
wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewEvent, wxCommandEvent); wxIMPLEMENT_DYNAMIC_CLASS(wxWebViewEvent, wxCommandEvent);