X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0996d32a07f2b89d0f26ccf336398493445f2cc5..bc9fa1f694dc8e1894dbb3ce2165ae27dac8b4b3:/docs/latex/wx/menuitem.tex

diff --git a/docs/latex/wx/menuitem.tex b/docs/latex/wx/menuitem.tex
index f9f49bb8ae..1484e46c9b 100644
--- a/docs/latex/wx/menuitem.tex
+++ b/docs/latex/wx/menuitem.tex
@@ -1,8 +1,11 @@
 \section{\class{wxMenuItem}}\label{wxmenuitem}
 
-A menu item represents an item in a popup menu. Note that the majority of this
-class is only implemented under Windows so far, but everything except fonts, colours and
-bitmaps can be achieved via wxMenu on all platforms.
+A menu item represents an item in a menu. Note that you usually don't have to
+deal with it directly as \helpref{wxMenu}{wxmenu} methods usually construct an
+object of this class for you.
+
+Also please note that the methods related to fonts and bitmaps are currently
+only implemented for Windows.
 
 \wxheading{Derived from}
 
@@ -21,9 +24,9 @@ wxOwnerDrawn (Windows only)\\
 
 \membersection{wxMenuItem::wxMenuItem}\label{wxmenuitemconstr}
 
-\func{}{wxMenuItem}{\param{wxMenu*}{ parentMenu = NULL}, \param{int}{ id = ID\_SEPARATOR},
+\func{}{wxMenuItem}{\param{wxMenu*}{ parentMenu = NULL}, \param{int}{ id = wxID\_SEPARATOR},
  \param{const wxString\& }{text = ""},  \param{const wxString\& }{helpString = ""},
- \param{bool }{checkable = FALSE}, \param{wxMenu*}{ subMenu = NULL}, }
+ \param{wxItemKind }{kind = wxITEM\_NORMAL}, \param{wxMenu*}{ subMenu = NULL}, }
 
 Constructs a wxMenuItem object.
 
@@ -31,13 +34,16 @@ Constructs a wxMenuItem object.
 
 \docparam{parentMenu}{Menu that the menu item belongs to.}
 
-\docparam{id}{Identifier for this menu item, or ID\_SEPARATOR to indicate a separator.}
+\docparam{id}{Identifier for this menu item, or wxID\_SEPARATOR to indicate a separator.}
 
-\docparam{text}{Text for the menu item, as shown on the menu.}
+\docparam{text}{Text for the menu item, as shown on the menu. An accelerator
+key can be specified using the ampersand '\&' character. In order to embed an
+ampersand character in the menu item text, the ampersand must be doubled.}
 
 \docparam{helpString}{Optional help string that will be shown on the status bar.}
 
-\docparam{checkable}{TRUE if this menu item is checkable.}
+\docparam{kind}{May be {\tt wxITEM\_SEPARATOR}, {\tt wxITEM\_NORMAL}, 
+{\tt wxITEM\_CHECK} or {\tt wxITEM\_RADIO}}
 
 \docparam{subMenu}{If non-NULL, indicates that the menu item is a submenu.}
 
@@ -73,7 +79,7 @@ Returns the background colour associated with the menu item (Windows only).
 
 \membersection{wxMenuItem::GetBitmap}\label{wxmenuitemgetbitmap}
 
-\constfunc{wxBitmap\&}{GetBitmap}{\param{bool}{ checked = TRUE}}
+\constfunc{wxBitmap\&}{GetBitmap}{\param{bool}{ checked = true}}
 
 Returns the checked or unchecked bitmap (Windows only).
 
@@ -95,12 +101,19 @@ Returns the help string associated with the menu item.
 
 Returns the menu item identifier.
 
+\membersection{wxMenuItem::GetKind}\label{wxmenuitemgetkind}
+
+\constfunc{wxItemKind}{GetKind}{\void}
+
+Returns the item kind, one of {\tt wxITEM\_SEPARATOR}, {\tt wxITEM\_NORMAL}, 
+{\tt wxITEM\_CHECK} or {\tt wxITEM\_RADIO}.
+
 \membersection{wxMenuItem::GetLabel}\label{wxmenuitemgetlabel}
 
 \constfunc{wxString}{GetLabel}{\void}
 
 Returns the text associated with the menu item without any accelerator
-characaters it might contain.
+characters it might contain.
 
 \wxheading{See also}
 
@@ -111,7 +124,7 @@ characaters it might contain.
 
 \func{static wxString}{GetLabelFromText}{\param{const wxString\& }{text}}
 
-Strips all accelerator characeters and mnemonics from the given {\it text}.
+Strips all accelerator characters and mnemonics from the given {\it text}.
 For example,
 
 \begin{verbatim}
@@ -169,25 +182,25 @@ Returns the text colour associated with the menu item (Windows only).
 
 \constfunc{bool}{IsCheckable}{\void}
 
-Returns TRUE if the item is checkable.
+Returns true if the item is checkable.
 
 \membersection{wxMenuItem::IsChecked}\label{wxmenuitemischecked}
 
 \constfunc{bool}{IsChecked}{\void}
 
-Returns TRUE if the item is checked.
+Returns true if the item is checked.
 
 \membersection{wxMenuItem::IsEnabled}\label{wxmenuitemisenabled}
 
 \constfunc{bool}{IsEnabled}{\void}
 
-Returns TRUE if the item is enabled.
+Returns true if the item is enabled.
 
 \membersection{wxMenuItem::IsSeparator}\label{wxmenuitemisseparator}
 
 \constfunc{bool}{IsSeparator}{\void}
 
-Returns TRUE if the item is a separator.
+Returns true if the item is a separator.
 
 \membersection{wxMenuItem::SetBackgroundColour}\label{wxmenuitemsetbackgroundcolour}
 
@@ -228,9 +241,9 @@ Sets the help string.
 
 Sets the width of the menu item checkmark bitmap (Windows only).
 
-\membersection{wxMenuItem::SetName}\label{wxmenuitemsetname}
+\membersection{wxMenuItem::SetText}\label{wxmenuitemsettext}
 
-\constfunc{void}{SetName}{\param{const wxString\& }{text}}
+\constfunc{void}{SetText}{\param{const wxString\& }{text}}
 
 Sets the text associated with the menu item.