Add generic wxMarkupText class implementing handling of markup.

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

diff --git a/docs/doxygen/overviews/windowids.h b/docs/doxygen/overviews/windowids.h
index 989f6002ee6986a955d9905656e11b23033be524..59e90287e8af52438a5364dbdc4dc6143acf0a45 100644 (file)
--- a/docs/doxygen/overviews/windowids.h
+++ b/docs/doxygen/overviews/windowids.h
@@ -3,7 +3,7 @@
 // Purpose:     topic overview
 // Author:      wxWidgets team
 // RCS-ID:      $Id$
 // Purpose:     topic overview
 // Author:      wxWidgets team
 // RCS-ID:      $Id$

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /**
 /////////////////////////////////////////////////////////////////////////////
 
 /**


@@ -26,15 +26,15 @@
 
 @section overview_windowids_intro Introduction
 
 
 @section overview_windowids_intro Introduction
 

-Various contols and other parts of wxWidgets need an ID.  Sometimes the ID may
-be directly provided by the use or have a predefined value, such as
+Various controls and other parts of wxWidgets need an ID.  Sometimes the ID may
+be directly provided by the user or have a predefined value, such as

 @c wxID_OPEN. Often, however, the value of the ID is unimportant and is created
 automatically by calling wxWindow::NewControlId or by passing @c wxID_ANY as
 the ID of an object.
 
 @c wxID_OPEN. Often, however, the value of the ID is unimportant and is created
 automatically by calling wxWindow::NewControlId or by passing @c wxID_ANY as
 the ID of an object.
 

-There are two ways to generate an ID.  One way, is to start at a negative
+There are two ways to generate an ID.  One way is to start at a negative

 number, and for each new ID, return the next smallest number.  This is fine for
 number, and for each new ID, return the next smallest number.  This is fine for

-systems that can used the full range of negative numbers for an ID, as this
+systems that can use the full range of negative numbers for IDs, as this

 provides more than enough IDs and it would take a very very long time to run
 out and wrap around.  However, some systems can not use the full range of the
 ID value. Windows, for example, can only use 16 bit IDs, and only has about
 provides more than enough IDs and it would take a very very long time to run
 out and wrap around.  However, some systems can not use the full range of the
 ID value. Windows, for example, can only use 16 bit IDs, and only has about


@@ -70,8 +70,8 @@ it is assigned to a wxWindowIDRef, then it will be unreserved automatically and
 will be considered free when the count is 0, and should NOT be manually
 unreserved.
 
 will be considered free when the count is 0, and should NOT be manually
 unreserved.
 

-wxWindowIDRef can store both automatic IDs from wxWindow::NewControlId as well
-as normal IDs.  Reference counting is only done for the automatic IDs.  Also,
+wxWindowIDRef can store both automatic IDs from wxWindow::NewControlId and
+normal IDs.  Reference counting is only done for the automatic IDs.  Also,

 wxWindowIDRef has conversion operators that allow it to be treated just like a
 wxWindowID.
 
 wxWindowIDRef has conversion operators that allow it to be treated just like a
 wxWindowID.