X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/526954c5968baa29218c994ec48e476ae2bd4b9f..7447d53c35249d42128d6243c90998f03882859a:/docs/doxygen/mainpages/samples.h

diff --git a/docs/doxygen/mainpages/samples.h b/docs/doxygen/mainpages/samples.h
index 9480282cf9..68314151aa 100644
--- a/docs/doxygen/mainpages/samples.h
+++ b/docs/doxygen/mainpages/samples.h
@@ -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}
@@ -131,8 +131,10 @@ TODO: Organize them in a more human-readable way.
 @li @sample{toolbar}
 @li @sample{treectrl}
 @li @sample{typetest}
+@li @sample{uiaction}
 @li @sample{validate}
 @li @sample{vscroll}
+@li @sample{webview}
 @li @sample{widgets}
 @li @sample{wizard}
 @li @sample{wrapsizer}
@@ -300,6 +302,11 @@ wxDebugReportUpload will report an error.
 This sample shows how to use the common dialogs available from wxWidgets. These
 dialogs are described in detail in the @ref overview_cmndlg.
 
+In addition to the dialogs accessible from the sample menus, you can also run
+it with a <code>--progress=style</code> command line option to show a
+wxProgressDialog with the given style (try 0 for the default style) on program
+startup, before the main window is shown.
+
 @sampledir{dialogs}
 
 @section page_samples_dialup Dialup Sample
@@ -532,10 +539,10 @@ The not very clearly named internat sample demonstrates the wxWidgets
 internationalization (i18n for short from now on) features. To be more
 precise, it only shows localization support, i.e. support for translating the
 program messages into another language while true i18n would also involve
-changing the other aspects of the programs behaviour.
+changing the other aspects of the program's behaviour.
 
 More information about this sample can be found in the @c readme.txt file in
-its directory. Please also see the @ref overview_i18n.
+its directory. Please also see the @ref overview_i18n overview.
 
 @sampledir{internat}
 
@@ -555,6 +562,12 @@ its directory. Please also see the @ref overview_i18n.
 
 @sampleabout{wxKeyEvent}
 
+This sample can be used to interactively test the events produced by pressing
+various keyboard keys. It also shows the interaction between accelerators and
+the normal keyboard events (which are overridden by any defined accelerators)
+and finally allows to test that not skipping an event in EVT_KEY_DOWN handler
+suppresses the subsequent EVT_CHAR event.
+
 @sampledir{keyboard}
 
 @section page_samples_layout Layout Sample
@@ -652,9 +665,9 @@ a good starting point for learning how to use wxWidgets.
 This samples shows wxBookCtrl family of controls.
 Although initially it was written to demonstrate wxNotebook
 only, it can now be also used to see wxListbook,
-wxChoicebook and wxTreebook in action.
+wxChoicebook, wxTreebook and wxToolbook in action.
 Test each of the controls, their orientation, images and pages using
-commands through menu.
+commands through the menu.
 
 @sampledir{notebook}
 
@@ -670,9 +683,10 @@ commands through menu.
 
 @sampleabout{wxGLCanvas}
 
-@li @b cube Draws only a cube to demonstrate how to write a basic wxWidgets OpenGL program.
-@li @b isosurf Draws a surface by reading coordinates from a dat file.
-@li @b penguin Draws a rotatable penguin by reading data from a dxf file.
+@li @b cube Draws a cube to demonstrate how to write a basic wxWidgets OpenGL program.
+    Arrow keys rotate the cube. Space bar toggles spinning.
+@li @b isosurf Draws a surface by reading coordinates from a DAT file.
+@li @b penguin Draws a rotatable penguin by reading data from a DXF file.
 
 @sampledir{opengl}
 
@@ -909,8 +923,8 @@ wxClipboard and to paste text from it. The GTK version will
 use the so called PRIMARY SELECTION, which is the pseudo clipboard under X and
 best known from pasting text to the XTerm program.
 
-Last not least: some of the text controls have tooltips and the sample also shows
-how tooltips can be centrally disabled and their latency controlled.
+Last but not least: some of the text controls have tooltips and the sample also
+shows how tooltips can be centrally disabled and their latency controlled.
 
 @sampledir{text}
 
@@ -983,6 +997,17 @@ demonstrated here as well - try the corresponding menu entries.
 
 @sampledir{typetest}
 
+@section page_samples_uiaction wxUIActionSimulator Sample
+
+@sampleabout{wxUIActionSimulator}
+
+This sample shows some features of wxUIActionSimulator class. When a simulation
+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.
+
+@sampledir{uiaction}
+
 @section page_samples_validate Validator Sample
 
 @sampleabout{wxValidator}
@@ -995,6 +1020,15 @@ demonstrated here as well - try the corresponding menu entries.
 
 @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
@@ -1038,7 +1072,19 @@ features supported:
 
 @section page_samples_xrc XRC Sample
 
-@sampleabout{@ref overview_xrc}
+This sample shows how to use the various features of the @ref overview_xrc to
+create the gui of your program. It starts by loading and showing a frame and
+other resources. From its menu or toolbar you can then run the following dialogs:
+
+@li A non-derived wxDialog
+@li A derived dialog
+@li A dialog containing a large number of controls
+@li An uncentred dialog
+@li A dialog demonstrating the use of object references and ID ranges
+@li A dialog that contains a custom class
+@li A dialog with platform-specific features
+@li A dialog demonstrating wxArtProvider
+@li A dialog saying "VARIABLE EXPANSION ISN'T IMPLEMENTED CURRENTLY" :/
 
 @sampledir{xrc}