Merge the new wxWebView classes from the SOC2011_WEBVIEW branch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@69049 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -468,6 +468,7 @@ All (GUI):
|
||||
- Added wxFLP_SMALL and wxDIRP_SMALL styles.
|
||||
- Added support for saving alpha with TIFF images.
|
||||
- Added wxPersistentSplitter.
|
||||
- Added wxWebView library (Steven Lamerton & Auria, GSoC 2011 project).
|
||||
|
||||
OSX:
|
||||
|
||||
|
18
docs/doxygen/groups/class_webview.h
Normal file
18
docs/doxygen/groups/class_webview.h
Normal file
@@ -0,0 +1,18 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: class_webview.h
|
||||
// Purpose: WebView classes group docs
|
||||
// Author: wxWidgets team
|
||||
// RCS-ID: $Id$
|
||||
// Licence: wxWindows licence
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
/**
|
||||
|
||||
@defgroup group_class_webview WebView
|
||||
@ingroup group_class
|
||||
|
||||
The wxWebView library is a set of classes for viewing complex web documents and
|
||||
for internet browsing. It is built around a series of backends, and exposes
|
||||
common functions for them.
|
||||
|
||||
*/
|
@@ -246,6 +246,7 @@ with the corresponding library. The following symbols are honoured:
|
||||
- wxNO_PROPGRID_LIB
|
||||
- wxNO_QA_LIB
|
||||
- wxNO_RICHTEXT_LIB
|
||||
- wxNO_WEBVIEW_LIB
|
||||
- wxNO_XML_LIB
|
||||
- wxNO_REGEX_LIB
|
||||
- wxNO_EXPAT_LIB
|
||||
|
@@ -257,6 +257,7 @@ library:
|
||||
@itemdef{wxUSE_URL_NATIVE, Use native support for some operations with wxURL.}
|
||||
@itemdef{wxUSE_VALIDATORS, Use wxValidator class.}
|
||||
@itemdef{wxUSE_VARIANT, Use wxVariant class.}
|
||||
@itemdef{wxUSE_WEBVIEW, Use wxWebView class.}
|
||||
@itemdef{wxUSE_WIZARDDLG, Use wxWizard class.}
|
||||
@itemdef{wxUSE_WXHTML_HELP, Use wxHtmlHelpController and related classes.}
|
||||
@itemdef{wxUSE_XML, Use XML parsing classes.}
|
||||
|
@@ -39,6 +39,7 @@ digraph Dependancies
|
||||
wxRichText [fillcolor = green, URL = "\ref page_libs_wxrichtext"];
|
||||
wxSTC [fillcolor = green, URL = "\ref page_libs_wxstc"];
|
||||
wxXRC [fillcolor = green, URL = "\ref page_libs_wxxrc"];
|
||||
wxWebView [fillcolor = green, URL = "\ref page_libs_wxwebview"];
|
||||
|
||||
wxCore -> wxBase;
|
||||
wxNet -> wxBase;
|
||||
@@ -55,6 +56,7 @@ digraph Dependancies
|
||||
wxRichText -> wxAdvanced; wxRichText -> wxHTML; wxRichText -> wxXML;
|
||||
wxSTC -> wxCore;
|
||||
wxXRC -> wxAdvanced; wxXRC -> wxHTML; wxXRC -> wxXML;
|
||||
wxWebView -> wxCore;
|
||||
}
|
||||
@enddot
|
||||
|
||||
@@ -202,5 +204,11 @@ text editor. See <http://www.scintilla.org/> for more info about Scintilla.
|
||||
|
||||
Requires @ref page_libs_wxcore, @ref page_libs_wxbase.
|
||||
|
||||
@section page_libs_wxwebview wxWebView
|
||||
|
||||
The wxWebView library contains the wxWebView control and its associated classes.
|
||||
|
||||
Requires @ref page_libs_wxcore, @ref page_libs_wxbase.
|
||||
|
||||
*/
|
||||
|
||||
|
@@ -41,7 +41,7 @@ may find the following samples showing the corresponding controls:
|
||||
@li wxTreeCtrl: @ref page_samples_treectrl
|
||||
@li wxGrid: @ref page_samples_grid
|
||||
@li wxDataViewCtrl: @ref page_samples_dataview
|
||||
|
||||
@li wxWebView: @ref page_samples_webview
|
||||
|
||||
Finally, here is the full list of samples:
|
||||
<!--
|
||||
@@ -110,8 +110,8 @@ TODO: Organize them in a more human-readable way.
|
||||
@li @sample{power}
|
||||
@li @sample{printing}
|
||||
@li @sample{propgrid}
|
||||
</td><td>
|
||||
@li @sample{regtest}
|
||||
</td><td>
|
||||
@li @sample{render}
|
||||
@li @sample{richtext}
|
||||
@li @sample{sashtest}
|
||||
@@ -134,6 +134,7 @@ TODO: Organize them in a more human-readable way.
|
||||
@li @sample{uiaction}
|
||||
@li @sample{validate}
|
||||
@li @sample{vscroll}
|
||||
@li @sample{webview}
|
||||
@li @sample{widgets}
|
||||
@li @sample{wizard}
|
||||
@li @sample{wrapsizer}
|
||||
@@ -1001,7 +1002,7 @@ demonstrated here as well - try the corresponding menu entries.
|
||||
@sampleabout{wxUIActionSimulator}
|
||||
|
||||
This sample shows some features of wxUIActionSimulator class. When a simulation
|
||||
is ran using its menu items, you can see that the button is pressed
|
||||
is run using its menu items, you can see that the button is pressed
|
||||
programmatically and the characters generated by the program appear in the text
|
||||
control.
|
||||
|
||||
@@ -1019,6 +1020,15 @@ control.
|
||||
|
||||
@sampledir{vscroll}
|
||||
|
||||
@section page_samples_webview wxWebView Sample
|
||||
|
||||
The wxWebView sample demonstarates the various capabilities of the wxWebView
|
||||
control. It is set up as a simple single window web broswer, but with support
|
||||
for many of the more complex wxWebView features, including browsing through
|
||||
archives.
|
||||
|
||||
@sampledir{webview}
|
||||
|
||||
@section page_samples_widgets Widgets Sample
|
||||
|
||||
The widgets sample is the main presentation program for most simple and advanced
|
||||
|
Reference in New Issue
Block a user