X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c36f1fc7c9c91a008b308cf6775f2f7a134ef2f1..a24dc1a836159cbec24c577d9e576f8dbafad728:/docs/latex/wx/toolbar.tex?ds=sidebyside

diff --git a/docs/latex/wx/toolbar.tex b/docs/latex/wx/toolbar.tex
index 26df69d8d7..5be98e077a 100644
--- a/docs/latex/wx/toolbar.tex
+++ b/docs/latex/wx/toolbar.tex
@@ -59,12 +59,11 @@ before creating the toolbar:
 \twocolitem{\windowstyle{wxTB\_DOCKABLE}}{Makes the toolbar floatable and dockable (GTK only).}
 \twocolitem{\windowstyle{wxTB\_HORIZONTAL}}{Specifies horizontal layout (default).}
 \twocolitem{\windowstyle{wxTB\_VERTICAL}}{Specifies vertical layout.}
-\twocolitem{\windowstyle{wxTB\_3DBUTTONS}}{Only for wxToolBarSimple: gives a mild 3D look to its buttons.}
-\twocolitem{\windowstyle{wxTB\_TEXT}}{Show the text in the toolbar buttons; by default only icons are shown.}
+\twocolitem{\windowstyle{wxTB\_TEXT}}{Shows the text in the toolbar buttons; by default only icons are shown.}
 \twocolitem{\windowstyle{wxTB\_NOICONS}}{Specifies no icons in the toolbar buttons; by default they are shown.}
 \twocolitem{\windowstyle{wxTB\_NODIVIDER}}{Specifies no divider (border) above the toolbar (Windows only).}
 \twocolitem{\windowstyle{wxTB\_NOALIGN}}{Specifies no alignment with the parent window (Windows only, not very useful).}
-\twocolitem{\windowstyle{wxTB\_HORZ\_LAYOUT}}{Show the text and the icons alongside, not vertically stacked (Windows and GTK
+\twocolitem{\windowstyle{wxTB\_HORZ\_LAYOUT}}{Shows the text and the icons alongside, not vertically stacked (Windows and GTK
 2 only). This style must be used with wxTB\_TEXT.}
 \twocolitem{\windowstyle{wxTB\_HORZ\_TEXT}}{Combination of wxTB\_HORZ\_LAYOUT and wxTB\_TEXT.}
 \end{twocollist}
@@ -79,24 +78,17 @@ The toolbar class emits menu commands in the same was that a frame menubar does,
 so you can use one EVT\_MENU macro for both a menu item and a toolbar button.
 The event handler functions take a wxCommandEvent argument. For most event macros,
 the identifier of the tool is passed, but for EVT\_TOOL\_ENTER the toolbar
-window is passed and the tool id is retrieved from the wxCommandEvent.
-This is because the id may be -1 when the mouse moves off a tool, and -1 is not
+window identifier is passed and the tool identifier is retrieved from the wxCommandEvent.
+This is because the identifier may be -1 when the mouse moves off a tool, and -1 is not
 allowed as an identifier in the event system.
 
-Note that tool commands (and UI update events for tools) are first sent to
-the focus window within the frame that contains the toolbar. If no window within the frame has the focus,
-then the events are sent directly to the toolbar (and up the hierarchy to the
-frame, depending on where the application has put its event handlers). This allows command and UI update
-handling to be processed by specific windows and controls, and not necessarily
-by the application frame.
-
 \twocolwidtha{7cm}
 \begin{twocollist}\itemsep=0pt
 \twocolitem{{\bf EVT\_TOOL(id, func)}}{Process a wxEVT\_COMMAND\_TOOL\_CLICKED event
 (a synonym for wxEVT\_COMMAND\_MENU\_SELECTED). Pass the id of the tool.}
 \twocolitem{{\bf EVT\_MENU(id, func)}}{The same as EVT\_TOOL.}
 \twocolitem{{\bf EVT\_TOOL\_RANGE(id1, id2, func)}}{Process a wxEVT\_COMMAND\_TOOL\_CLICKED event
-for a range id identifiers. Pass the ids of the tools.}
+for a range of identifiers. Pass the ids of the tools.}
 \twocolitem{{\bf EVT\_MENU\_RANGE(id1, id2, func)}}{The same as EVT\_TOOL\_RANGE.}
 \twocolitem{{\bf EVT\_TOOL\_RCLICKED(id, func)}}{Process a wxEVT\_COMMAND\_TOOL\_RCLICKED event.
 Pass the id of the tool.}
@@ -640,9 +632,6 @@ A typical use of this member might be to pop up a menu.
 
 This function should be called after you have added tools.
 
-If you are using absolute positions for your tools when using a wxToolBarSimple object,
-do not call this function. You must call it at all other times.
-
 \membersection{wxToolBar::RemoveTool}\label{wxtoolbarremovetool}
 
 \func{wxToolBarTool *}{RemoveTool}{\param{int }{id}}
