Merge in from trunk r68684 - r69046

[wxWidgets.git] / docs / doxygen / overviews / scrolling.h

diff --git a/docs/doxygen/overviews/scrolling.h b/docs/doxygen/overviews/scrolling.h
index 1c1eb4316478131314f0170e6a3f164c51c77961..c28cd77248218213e356e33d0da7759ddc636fb1 100644 (file)
--- a/docs/doxygen/overviews/scrolling.h
+++ b/docs/doxygen/overviews/scrolling.h
@@ -3,17 +3,20 @@
 // Purpose:     topic overview
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
-// Licence:     wxWindows license
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-/*!
+/**
 
-@page overview_scrolling Scrolling Overview
+@page overview_scrolling Scrolled Windows
+
+Classes: wxWindow, wxScrolledWindow, wxScrollBar
+
+@li @ref overview_scrolling_model
+@li @ref overview_scrolling_example
+
+<hr>
 
-Classes:
-@li wxWindow
-@li wxScrolledWindow
-@li wxScrollBar
 
 Scrollbars come in various guises in wxWidgets. All windows have the potential
 to show a vertical scrollbar and/or a horizontal scrollbar: it is a basic
@@ -29,7 +32,7 @@ events. If you created a wxWindow object with scrollbars, and then clicked on
 the scrollbars, nothing at all would happen. This is deliberate, because the
 @e interpretation of scroll events varies from one window class to another.
 
-wxScrolledWindow (formerly wxCanvas) is an example of a window that adds
+::wxScrolledWindow (formerly wxCanvas) is an example of a window that adds
 functionality to make scrolling really work. It assumes that scrolling happens
 in consistent units, not different-sized jumps, and that page size is
 represented by the visible portion of the window. It is suited to drawing