X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/187acdec7657079744cef95759542eb6e5453a5e..f4d084afdacb64aa4fe8330613c97d88fa2506ce:/docs/doxygen/mainpages/samples.h?ds=inline

diff --git a/docs/doxygen/mainpages/samples.h b/docs/doxygen/mainpages/samples.h
index 3fdc9d9e86..2e2683ecfb 100644
--- a/docs/doxygen/mainpages/samples.h
+++ b/docs/doxygen/mainpages/samples.h
@@ -3,12 +3,14 @@
 // Purpose:     Samples page of the Doxygen manual
 // Author:      wxWidgets team
 // RCS-ID:      $Id: utilities.h 52634 2008-03-20 13:45:17Z VS $
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 /**
 
-@page page_samples Included Samples
+@page page_samples Samples Overview
+
+@brief Overview of the examples provided with wxWidgets.
 
 Probably the best way to learn wxWidgets is by reading the source of some 80+
 samples provided with it. Many aspects of wxWidgets programming can be learnt
@@ -18,17 +20,6 @@ make it easier to find the relevant one if a simple grep through all sources
 didn't help. They also provide some notes about using the samples and what
 features of wxWidgets are they supposed to test.
 
-<hr/>
-Notice that all wxWidgets samples mentioned here can be found in @c samples
-subdirectory of the library distribution. When a @c foobar sample is mentioned
-below, its sources can be found in @c samples/foobar directory of your
-wxWidgets tree. If you installed wxWidgets from a binary package, you might not
-have this directory. In this case, you may view the samples online at
-http://svn.wxwidgets.org/viewvc/wx/wxWidgets/trunk/samples/ but you need to
-download the source distribution in order to be able to build them (highly
-recommended).
-<hr/>
-
 There are currently more than 80 different samples as part of wxWidgets:
 the list in this page is not complete!
 You should start your tour of wxWidgets with the @ref page_samples_minimal
@@ -51,10 +42,8 @@ may find the following samples showing the corresponding controls:
 @li wxGrid: @ref page_samples_grid
 @li wxDataViewCtrl: @ref page_samples_dataview
 
-Finally, it might be helpful to do a search in the entire sample directory if
-you can't find the sample showing the control you are interested in by
-name. Most classes contained in wxWidgets occur in at least one of the samples.
 
+Finally, here is the full list of samples:
 <!--
 The following sample list is generated by executing command
 
@@ -142,6 +131,7 @@ 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{widgets}
@@ -151,9 +141,25 @@ TODO: Organize them in a more human-readable way.
 </td></tr>
 @endTable
 
+
+<hr>
+
+Notice that all wxWidgets samples mentioned above can be found in @c samples
+subdirectory of the library distribution. When a @c foobar sample is mentioned
+below, its sources can be found in @c samples/foobar directory of your
+wxWidgets tree. If you installed wxWidgets from a binary package, you might not
+have this directory. In this case, you may view the samples online at
+http://svn.wxwidgets.org/viewvc/wx/wxWidgets/trunk/samples/ but you need to
+download the source distribution in order to be able to build them (highly
+recommended).
+
+Final advice is to do a search in the entire samples directory if you can't
+find the sample showing the control you are interested in by name. Most classes
+contained in wxWidgets occur in at least one of the samples.
+
+
 @todo Write descriptions for the samples who description started with
  "This sample demonstrates", they are semi-auto generated.
-<hr>
 
 @section page_samples_access Accessibility Sample
 
@@ -295,6 +301,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
@@ -527,10 +538,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}
 
@@ -550,6 +561,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
@@ -647,9 +664,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}
 
@@ -665,9 +682,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}
 
@@ -904,8 +922,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}
 
@@ -978,6 +996,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 ran 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}
@@ -1033,7 +1062,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}