removed trailing semicolons at the end of HASH_MAP macros

[wxWidgets.git] / docs / latex / wx / menu.tex

diff --git a/docs/latex/wx/menu.tex b/docs/latex/wx/menu.tex
index 47d3c70a44b9dea2d807e2c77717a4fe3204404c..5a42e562f84cd975ecc6e3fc78acb80aec227c85 100644 (file)
--- a/docs/latex/wx/menu.tex
+++ b/docs/latex/wx/menu.tex
@@ -27,6 +27,13 @@ of the item positions inserting or removing the items in the menu containing
 the radio items risks to not work correctly. Finally note that the radio items
 are only supported under Windows and GTK+ currently.
 
 the radio items risks to not work correctly. Finally note that the radio items
 are only supported under Windows and GTK+ currently.
 

+\wxheading{Allocation strategy}
+
+All menus except the popup ones must be created on the heap. All menus
+attached to a menubar or to another menu will be deleted by their parent when
+it is deleted. As the frame menubar is deleted by the frame itself, it means
+that normally all menus used are deleted automatically.
+

 \wxheading{Derived from}
 
 \helpref{wxEvtHandler}{wxevthandler}\\
 \wxheading{Derived from}
 
 \helpref{wxEvtHandler}{wxevthandler}\\


@@ -104,7 +111,9 @@ Adds a string item to the end of the menu.
 \func{void}{Append}{\param{int}{ id}, \param{const wxString\& }{ item}, \param{wxMenu *}{subMenu},\rtfsp
 \param{const wxString\& }{helpString = ""}}
 
 \func{void}{Append}{\param{int}{ id}, \param{const wxString\& }{ item}, \param{wxMenu *}{subMenu},\rtfsp
 \param{const wxString\& }{helpString = ""}}
 

-Adds a pull-right submenu to the end of the menu.
+Adds a pull-right submenu to the end of the menu. Append the submenu to the parent
+menu {\it after} you have added your menu items, or accelerators may not be
+registered properly.

 
 \func{void}{Append}{\param{wxMenuItem*}{ menuItem}}
 
 
 \func{void}{Append}{\param{wxMenuItem*}{ menuItem}}
 


@@ -372,7 +381,9 @@ Returns the title of the menu.
 
 \wxheading{Remarks}
 
 
 \wxheading{Remarks}
 

-This is relevant only to popup menus.
+This is relevant only to popup menus, use 
+\helpref{wxMenuBar::GetLabelTop}{wxmenubargetlabeltop} for the menus in the
+menubar.

 
 \wxheading{See also}
 
 
 \wxheading{See also}
 


@@ -580,11 +591,13 @@ Sets the title of the menu.
 
 \wxheading{Remarks}
 
 
 \wxheading{Remarks}
 

-This is relevant only to popup menus.
+This is relevant only to popup menus, use 
+\helpref{wxMenuBar::SetLabelTop}{wxmenubarsetlabeltop} for the menus in the
+menubar.

 
 \wxheading{See also}
 
 
 \wxheading{See also}
 

-\helpref{wxMenu::SetTitle}{wxmenusettitle}
+\helpref{wxMenu::GetTitle}{wxmenugettitle}

 
 \membersection{wxMenu::UpdateUI}\label{wxmenuupdateui}
 
 
 \membersection{wxMenu::UpdateUI}\label{wxmenuupdateui}
 


@@ -826,7 +839,9 @@ Use only after the menubar has been associated with a frame.
 
 \constfunc{wxString}{GetLabelTop}{\param{int}{ pos}}
 
 
 \constfunc{wxString}{GetLabelTop}{\param{int}{ pos}}
 

-Returns the label of a top-level menu.
+Returns the label of a top-level menu. Note that the returned string does not
+include the accelerator characters which could have been specified in the menu
+title string during its construction.

 
 \wxheading{Parameters}
 
 
 \wxheading{Parameters}