Merge branch 'id-docs'

Improve documentation of window and menu item IDs.

Closes https://github.com/wxWidgets/wxWidgets/pull/890
This commit is contained in:
Vadim Zeitlin
2018-08-27 02:15:53 +02:00
4 changed files with 55 additions and 13 deletions

View File

@@ -557,20 +557,27 @@ enum wxBackgroundStyle
Notice that some, but @em not all, of these IDs are also stock IDs, i.e.
you can use them for the button or menu items without specifying the label
which will be provided by the underlying platform itself. See @ref page_stockitems "the
list of stock items" for the subset of standard IDs which are stock IDs as well.
which will be provided by the underlying platform itself. See
@ref page_stockitems "the list of stock items" for the subset of standard
IDs which are stock IDs as well.
*/
enum wxStandardID
{
/**
This id delimits the lower bound of the range used by automatically-generated ids
(i.e. those used when wxID_ANY is specified during construction).
(i.e.\ those used when wxID_ANY is specified during construction).
It is defined as a relatively large negative number and its exact value
is platform-dependent.
*/
wxID_AUTO_LOWEST,
/**
This id delimits the upper bound of the range used by automatically-generated ids
(i.e. those used when wxID_ANY is specified during construction).
(i.e.\ those used when wxID_ANY is specified during construction).
It is defined as a relatively small negative number and its exact value
is platform-dependent.
*/
wxID_AUTO_HIGHEST,
@@ -590,6 +597,11 @@ enum wxStandardID
*/
wxID_ANY = -1,
/**
Start of the range reserved for wxWidgets-defined IDs.
Don't define custom IDs in the range from wxID_LOWEST to wxID_HIGHEST.
*/
wxID_LOWEST = 4999,
wxID_OPEN,
@@ -737,6 +749,15 @@ enum wxStandardID
/** IDs used by generic file ctrl (4 consecutive starting from this value) */
wxID_FILECTRL = 5950,
/**
End of the range reserved for wxWidgets-defined IDs.
Don't define custom IDs in the range from wxID_LOWEST to wxID_HIGHEST.
When using an enum to define a number of custom IDs, assigning the
value of @c wxID_HIGHEST+1 to the first element ensures that none of
the enum elements will conflict with any standard IDs.
*/
wxID_HIGHEST = 5999
};

View File

@@ -548,6 +548,8 @@ public:
@param id
The menu command identifier.
See @ref overview_windowids for more information about IDs (same
considerations apply to both window and menu item IDs).
@param item
The string to appear on the menu item.
See wxMenuItem::SetItemLabel() for more details.

View File

@@ -358,6 +358,7 @@ public:
Pointer to a parent window.
@param id
Window identifier. If wxID_ANY, will automatically create an identifier.
See @ref overview_windowids for more information about IDs.
@param pos
Window position. wxDefaultPosition indicates that wxWidgets
should generate a default position for the window.