fix some parameters docs and other minor changes (#9557)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54085 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -15,7 +15,7 @@
|
|||||||
@library{wxcore}
|
@library{wxcore}
|
||||||
@category{menus}
|
@category{menus}
|
||||||
|
|
||||||
@see wxMenu, @ref overview_eventhandlingoverview
|
@see wxMenu, @ref overview_eventhandling "Event Handling Overview"
|
||||||
*/
|
*/
|
||||||
class wxMenuBar : public wxWindow
|
class wxMenuBar : public wxWindow
|
||||||
{
|
{
|
||||||
@@ -390,8 +390,9 @@ public:
|
|||||||
@library{wxcore}
|
@library{wxcore}
|
||||||
@category{menus}
|
@category{menus}
|
||||||
|
|
||||||
@see wxMenuBar, wxWindow::PopupMenu, @ref overview_eventhandlingoverview, @ref
|
@see wxMenuBar, wxWindow::PopupMenu,
|
||||||
overview_wxfilehistory "wxFileHistory (most recently used files menu)"
|
@ref overview_eventhandling "Event Handling Overview",
|
||||||
|
@ref wxFileHistory "wxFileHistory (most recently used files menu)"
|
||||||
*/
|
*/
|
||||||
class wxMenu : public wxEvtHandler
|
class wxMenu : public wxEvtHandler
|
||||||
{
|
{
|
||||||
@@ -432,30 +433,32 @@ public:
|
|||||||
The menu command identifier.
|
The menu command identifier.
|
||||||
@param item
|
@param item
|
||||||
The string to appear on the menu item.
|
The string to appear on the menu item.
|
||||||
@param kind
|
|
||||||
May be wxITEM_SEPARATOR, wxITEM_NORMAL,
|
|
||||||
wxITEM_CHECK or wxITEM_RADIO
|
|
||||||
@param helpString
|
@param helpString
|
||||||
An optional help string associated with the item.
|
An optional help string associated with the item.
|
||||||
By default, the handler for the wxEVT_MENU_HIGHLIGHT event displays
|
By default, the handler for the wxEVT_MENU_HIGHLIGHT event displays
|
||||||
this string in the status line.
|
this string in the status line.
|
||||||
|
@param kind
|
||||||
|
May be wxITEM_SEPARATOR, wxITEM_NORMAL,
|
||||||
|
wxITEM_CHECK or wxITEM_RADIO
|
||||||
|
|
||||||
@see AppendSeparator(), AppendCheckItem(), AppendRadioItem(),
|
@see AppendSeparator(), AppendCheckItem(), AppendRadioItem(),
|
||||||
AppendSubMenu(), Insert(), SetLabel(),
|
AppendSubMenu(), Insert(), SetLabel(),
|
||||||
GetHelpString(), SetHelpString(), wxMenuItem
|
GetHelpString(), SetHelpString(), wxMenuItem
|
||||||
*/
|
*/
|
||||||
wxMenuItem* Append(int id, const wxString& item = "",
|
wxMenuItem* Append(int id, const wxString& item = wxEmptyString,
|
||||||
const wxString& helpString = "",
|
const wxString& helpString = wxEmptyString,
|
||||||
wxItemKind kind = wxITEM_NORMAL);
|
wxItemKind kind = wxITEM_NORMAL);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Adds a submenu.
|
Adds a submenu.
|
||||||
|
|
||||||
|
@warning This function is deprecated, use AppendSubMenu() instead.
|
||||||
|
|
||||||
@param id
|
@param id
|
||||||
The menu command identifier.
|
The menu command identifier.
|
||||||
@param item
|
@param item
|
||||||
The string to appear on the menu item.
|
The string to appear on the menu item.
|
||||||
@param menu
|
@param subMenu
|
||||||
Pull-right submenu.
|
Pull-right submenu.
|
||||||
@param helpString
|
@param helpString
|
||||||
An optional help string associated with the item.
|
An optional help string associated with the item.
|
||||||
@@ -468,7 +471,7 @@ public:
|
|||||||
*/
|
*/
|
||||||
wxMenuItem* Append(int id, const wxString& item,
|
wxMenuItem* Append(int id, const wxString& item,
|
||||||
wxMenu* subMenu,
|
wxMenu* subMenu,
|
||||||
const wxString& helpString = "");
|
const wxString& helpString = wxEmptyString);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
Adds a menu item object. This is the most generic variant of Append() method
|
Adds a menu item object. This is the most generic variant of Append() method
|
||||||
|
Reference in New Issue
Block a user