Added wxRect::Intersect() documentation (patch 1868322 from Laurent Humbertclaude).

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

diff --git a/docs/latex/wx/ttoolbar.tex b/docs/latex/wx/ttoolbar.tex
index 069a8888ab14ff9f8b24c1194d01f3bb0a293e19..37d533b03d619c32a8328620ce2e2eec19875256 100644 (file)
--- a/docs/latex/wx/ttoolbar.tex
+++ b/docs/latex/wx/ttoolbar.tex
@@ -10,7 +10,7 @@ buttons or toggles. A toolbar gives faster access to an application's facilities
 menus, which have to be popped up and selected rather laboriously.
 
 Instead of supplying one toolbar class with a number
-of different implementations depending on platform, wxWindows separates
+of different implementations depending on platform, wxWidgets separates
 out the classes. This is because there are a number of different toolbar
 styles that you may wish to use simultaneously, and also, future
 toolbar implementations will emerge which
@@ -24,7 +24,7 @@ The following is a summary of the toolbar classes and their differences.
 \begin{itemize}\itemsep=0pt
 \item {\bf wxToolBarBase.} This is a base class with pure virtual functions,
 and should not be used directly.
-\item {\bf wxToolBarSimple.} A simple toolbar class written entirely with generic wxWindows
+\item {\bf wxToolBarSimple.} A simple toolbar class written entirely with generic wxWidgets
 functionality. A simple 3D effect for buttons is possible, but it is not consistent
 with the Windows look and feel. This toolbar can scroll, and you can have arbitrary
 numbers of rows and columns.
@@ -61,7 +61,7 @@ as the demo shows, before adding tools to the button bar. Don't supply more than
 one bitmap for each tool, because the toolbar generates all three images (normal,
 depressed and checked) from the single bitmap you give it.
 
-\subsection{Using the toolbar library}
+\subsection{Using the toolbar library}\label{usingtoolbarlibrary}
 
 Include {\tt "wx/toolbar.h"}, or if using a class directly, one of:
 
@@ -149,7 +149,7 @@ bool MyApp::OnInit(void)
   frame->SetMenuBar(menuBar);
 
   // Create the toolbar
-  frame->CreateToolBar(wxNO_BORDER|wxHORIZONTAL|wxTB_FLAT, ID_TOOLBAR);
+  frame->CreateToolBar(wxBORDER\_NONE|wxHORIZONTAL|wxTB_FLAT, ID_TOOLBAR);
   
   frame->GetToolBar()->SetMargins( 2, 2 );
 
@@ -161,7 +161,7 @@ bool MyApp::OnInit(void)
   frame->OnSize(event);
   frame->Show(true);
 
-  frame->SetStatusText("Hello, wxWindows");
+  frame->SetStatusText("Hello, wxWidgets");
   
   SetTopWindow(frame);
 
@@ -254,7 +254,7 @@ void MyFrame::OnQuit(wxCommandEvent& WXUNUSED(event))
 
 void MyFrame::OnAbout(wxCommandEvent& WXUNUSED(event))
 {
-    (void)wxMessageBox("wxWindows toolbar sample", "About wxToolBar");
+    (void)wxMessageBox("wxWidgets toolbar sample", "About wxToolBar");
 }
 
 // Define the behaviour for the frame closing