Changed version to 2.5.1

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

diff --git a/docs/latex/wx/toolbar.tex b/docs/latex/wx/toolbar.tex
index d02a66ad9878cc7c11e041bb12d87ce1c5fed93a..285c12a3dbed90017ef1677d7a9d780c94a88f35 100644 (file)
--- a/docs/latex/wx/toolbar.tex
+++ b/docs/latex/wx/toolbar.tex
@@ -47,29 +47,18 @@ of a "separator" is a vertical line under Windows95 vs. simple space under GTK e
 
 \twocolwidtha{5cm}
 \begin{twocollist}\itemsep=0pt
 
 \twocolwidtha{5cm}
 \begin{twocollist}\itemsep=0pt

-\twocolitem{\windowstyle{wxTB\_FLAT}}
-{Gives the toolbar a flat look (Windows and GTK 1.2 only).}
-\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\_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
-only). This style must be used with wxTB\_TEXT.}
-\twocolitem{\windowstyle{wxTB\_HORZ\_TEXT}}
-{Combination of wxTB\_HORZ\_LAYOUT and wxTB\_TEXT.}
+\twocolitem{\windowstyle{wxTB\_FLAT}}{Gives the toolbar a flat look (Windows and GTK only).}
+\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\_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
+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}
 
 See also \helpref{window styles overview}{windowstyles}. Note that the Win32
 \end{twocollist}
 
 See also \helpref{window styles overview}{windowstyles}. Note that the Win32


@@ -101,7 +90,6 @@ by the application frame.
 \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.}
 \twocolitem{{\bf EVT\_MENU\_RANGE(id1, id2, func)}}{The same as EVT\_TOOL\_RANGE.}
 \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.}
 \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.}
 \twocolitem{{\bf EVT\_TOOL\_RCLICKED\_RANGE(id1, id2, func)}}{Process a wxEVT\_COMMAND\_TOOL\_RCLICKED event
 \twocolitem{{\bf EVT\_TOOL\_RCLICKED(id, func)}}{Process a wxEVT\_COMMAND\_TOOL\_RCLICKED event.
 Pass the id of the tool.}
 \twocolitem{{\bf EVT\_TOOL\_RCLICKED\_RANGE(id1, id2, func)}}{Process a wxEVT\_COMMAND\_TOOL\_RCLICKED event


@@ -801,3 +789,4 @@ Only applies to a tool that has been specified as a toggle tool.
 \wxheading{See also}
 
 \helpref{wxToolBar::GetToolState}{wxtoolbargettoolstate}
 \wxheading{See also}
 
 \helpref{wxToolBar::GetToolState}{wxtoolbargettoolstate}

+