use standard [Shift-]Ctrl-Z accelerators for wxID_REDO/UNDO

[wxWidgets.git] / docs / doxygen / mainpages / samples.h

diff --git a/docs/doxygen/mainpages/samples.h b/docs/doxygen/mainpages/samples.h
index 46ad61ac0366b4ffe47fd5ab86991acc1e22a7d5..bfec6ec9888e183ca99ffb274a513ff7c509580b 100644 (file)
--- a/docs/doxygen/mainpages/samples.h
+++ b/docs/doxygen/mainpages/samples.h
@@ -78,6 +78,7 @@ TODO: Organize them in a more human-readable way.
 @li @sample{event}
 @li @sample{except}
 @li @sample{exec}
+@li @sample{flash}
 @li @sample{font}
 </td><td>
 @li @sample{grid}
@@ -113,7 +114,6 @@ TODO: Organize them in a more human-readable way.
 @li @sample{richtext}
 @li @sample{sashtest}
 @li @sample{scroll}
-@li @sample{scrollsub}
 @li @sample{shaped}
 @li @sample{sockets}
 @li @sample{sound}
@@ -408,6 +408,23 @@ wxProcess::Exists().
 
 @sampledir{exec}
 
+@section page_samples_flash Flash Sample
+
+The flash sample demonstrates embedding of Adobe Flash into a wxWidgets
+program. Currently it only works under Windows as it uses the Flash ActiveX
+control to achieve this but we hope to be able to extend it to also work under
+other platforms in the future. The sample also currently requires Microsoft
+Visual C++ compiler as it uses COM support extensions specific to this
+compiler.
+
+The sample comes with 2 Flash files (SWF), showing a simple Flash animation
+which can be controlled using the "Play", "Stop" and "Back"/"Forward" buttons
+in the sample as well as a Flash form which shows how Flash and wxWidgets
+program can exchange data: calling "GetText" function without arguments returns
+the text of the text control defined inside Flash and calling "SetText" with an
+argument sets the control contents to the given string. Finally clicking on the
+button generates an event which is caught by the C++ program.
+
 @section page_samples_font Font Sample
 
 The font sample demonstrates wxFont,
@@ -729,23 +746,17 @@ renderer and also how to write a shared library
 
 @sampleabout{wxScrolledWindow}
 
-@see @sample{scrollsub}
-
-@sampledir{scroll}
-
-@section page_samples_scrollsub Scroll Subwindow Sample
-
 This sample demonstrates use of the ::wxScrolledWindow
-class including placing subwindows into it and drawing simple graphics. It uses the
-SetTargetWindow method and thus the effect
-of scrolling does not show in the scrolled window itself, but in one of its subwindows.
+class including placing subwindows into it and drawing simple graphics. It uses
+the SetTargetWindow method and thus the effect of scrolling does not show in
+the scrolled window itself, but in one of its subwindows.
 
-Additionally, this samples demonstrates how to optimize drawing operations in wxWidgets,
-in particular using the wxWindow::IsExposed() method with
-the aim to prevent unnecessary drawing in the window and thus reducing or removing
-flicker on screen.
+Additionally, this samples demonstrates how to optimize drawing operations in
+wxWidgets, in particular using the wxWindow::IsExposed() method with the aim to
+prevent unnecessary drawing in the window and thus reducing or removing flicker
+on screen.
 
-@sampledir{scrollsub}
+@sampledir{scroll}
 
 @section page_samples_shaped Shaped Window Sample