Manual fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/docs/latex/wx/classes.tex b/docs/latex/wx/classes.tex
index 5a52bd37e62ff1870b83fba97cebd0cecbf8645a..ab7e99e350ff50243eae0d926ecc1a2d7e5e78d4 100644 (file)
--- a/docs/latex/wx/classes.tex
+++ b/docs/latex/wx/classes.tex
@@ -136,7 +136,7 @@
 \input layout.tex
 \input list.tex
 \input listbox.tex
 \input layout.tex
 \input list.tex
 \input listbox.tex

-\input listctrl.tex
+%\input listctrl.tex

 \input listevt.tex
 \input proplosv.tex
 \input locale.tex
 \input listevt.tex
 \input proplosv.tex
 \input locale.tex

diff --git a/docs/latex/wx/function.tex b/docs/latex/wx/function.tex
index b50303abae0c0ee73380b76f83803983c3c6e898..0e55f4a1dbad21d41fa38697e5581719e1ccd080 100644 (file)
--- a/docs/latex/wx/function.tex
+++ b/docs/latex/wx/function.tex
@@ -571,7 +571,7 @@ if (s)
 
 \membersection{::wxGetNumberFromUser}\label{wxgetnumberfromuser}
 
 
 \membersection{::wxGetNumberFromUser}\label{wxgetnumberfromuser}
 

-\func{wxColour}{wxGetColourFromUser}{\param{wxWindow *}{parent}, \parent{const wxColour\& }{colInit}}
+\func{wxColour}{wxGetColourFromUser}{\param{wxWindow *}{parent}, \param{const wxColour\& }{colInit}}

 
 Shows the colour selection dialog and returns the colour selected by user or
 invalid colour (use \helpref{wxColour::Ok}{wxcolourok} to test whether a colour
 
 Shows the colour selection dialog and returns the colour selected by user or
 invalid colour (use \helpref{wxColour::Ok}{wxcolourok} to test whether a colour

diff --git a/docs/latex/wx/listctrl.tex b/docs/latex/wx/listctrl.tex
index 0e37651989ba138e77f62f5dba8c9e45247e3155..83eccb19d575d3f51ea5ae96f5e64e32e9a87242 100644 (file)
--- a/docs/latex/wx/listctrl.tex
+++ b/docs/latex/wx/listctrl.tex
@@ -465,7 +465,7 @@ Insert an image/string item.
 
 \pythonnote{In place of a single overloaded method name, wxPython
 implements the following methods:\par
 
 \pythonnote{In place of a single overloaded method name, wxPython
 implements the following methods:\par

-\indented{2cm}{\begin{twocollist}
+\indented{2cm}{\begin{twocollist}\itemsep=0pt

 \twocolitem{{\bf InsertItem(item)}}{Inserts an item using a wxListItem.}
 \twocolitem{{\bf InsertStringItem(index, label)}}{Inserts a string item.}
 \twocolitem{{\bf InsertImageItem(index, imageIndex)}}{Inserts an image item.}
 \twocolitem{{\bf InsertItem(item)}}{Inserts an item using a wxListItem.}
 \twocolitem{{\bf InsertStringItem(index, label)}}{Inserts a string item.}
 \twocolitem{{\bf InsertImageItem(index, imageIndex)}}{Inserts an image item.}


@@ -582,7 +582,6 @@ string or image at a given location.}
 \end{twocollist}}
 }
 
 \end{twocollist}}
 }
 

-

 \membersection{wxListCtrl::SetItemData}\label{wxlistctrlsetitemdata}
 
 \func{bool}{SetItemData}{\param{long }{item}, \param{long }{data}}
 \membersection{wxListCtrl::SetItemData}\label{wxlistctrlsetitemdata}
 
 \func{bool}{SetItemData}{\param{long }{item}, \param{long }{data}}


@@ -653,8 +652,8 @@ second one and positive value if the first one is greater than the second one
 
 \wxheading{Parameters}
 
 
 \wxheading{Parameters}
 

-\docparam{item1}{client data associated with the first item ({\bf NOT} the index).
-\docparam{item2}{client data associated with the second item ({\bf NOT} the index).
+\docparam{item1}{client data associated with the first item ({\bf NOT} the index).}
+\docparam{item2}{client data associated with the second item ({\bf NOT} the index).}

 \docparam{data}{the value passed to SortItems() itself.}
 
 Notice that the control may only be sorted on client data associated with the
 \docparam{data}{the value passed to SortItems() itself.}
 
 Notice that the control may only be sorted on client data associated with the


@@ -663,3 +662,4 @@ you want to be able to sort the items in the control.
 
 Please see the \helpref{listctrl sample}{samplelistctrl} for an example of
 using this function.
 
 Please see the \helpref{listctrl sample}{samplelistctrl} for an example of
 using this function.

+

diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex
index 5ec436b8e34d19c0771965ea16a48a8a644810e9..10dc13b4dd793f3b15ac77338876f1aded541fe8 100644 (file)
--- a/docs/latex/wx/manual.tex
+++ b/docs/latex/wx/manual.tex
@@ -25,13 +25,13 @@
 %\special{!/@scaleunit 1 def}
 \parskip=10pt
 \parindent=0pt
 %\special{!/@scaleunit 1 def}
 \parskip=10pt
 \parindent=0pt

-\title{wxWindows 2.2 (beta): A portable C++ and Python GUI toolkit}
+\title{wxWindows 2.1.13: A portable C++ and Python GUI toolkit}

 \winhelponly{\author{by Julian Smart et al
 %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
 }}
 \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
 Robin Dunn, et al}
 \winhelponly{\author{by Julian Smart et al
 %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
 }}
 \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
 Robin Dunn, et al}

-\date{January 24th 2000}
+\date{February 11th 2000}

 }
 \makeindex
 \begin{document}
 }
 \makeindex
 \begin{document}

diff --git a/docs/latex/wx/treectrl.tex b/docs/latex/wx/treectrl.tex
index 20539c9e00d28dadd0c9f2c9ab2fdd5de05c545b..4d7848521620736d8e42e83bbcc0fe87f0f5844b 100644 (file)
--- a/docs/latex/wx/treectrl.tex
+++ b/docs/latex/wx/treectrl.tex
@@ -167,7 +167,7 @@ will be sent which can be vetoed as well.
 
 \wxheading{See also}
 
 
 \wxheading{See also}
 

-\helpref{wxTreeCtrl::EndEditLabel}{wxtreectrlendeditlabel},
+\helpref{wxTreeCtrl::EndEditLabel}{wxtreectrlendeditlabel}, 

 \helpref{wxTreeEvent}{wxtreeevent}
 
 \membersection{wxTreeCtrl::EndEditLabel}\label{wxtreectrlendeditlabel}
 \helpref{wxTreeEvent}{wxtreeevent}
 
 \membersection{wxTreeCtrl::EndEditLabel}\label{wxtreectrlendeditlabel}


@@ -278,8 +278,9 @@ Returns the tree item data associated with the item.
 
 \helpref{wxTreeItemData}{wxtreeitemdata}
 
 
 \helpref{wxTreeItemData}{wxtreeitemdata}
 

-\pythonnote{wxPython provides the following shortcut method:\par
-\indented{2cm}{\begin{twocollist}
+\pythonnote{wxPython provides the following shortcut method:
+
+\indented{2cm}{\begin{twocollist}\itemsep=0pt

 \twocolitem{{\bf GetPyData(item)}}{Returns the Python Object
 associated with the wxTreeItemData for the given item Id.}
 \end{twocollist}}
 \twocolitem{{\bf GetPyData(item)}}{Returns the Python Object
 associated with the wxTreeItemData for the given item Id.}
 \end{twocollist}}


@@ -288,9 +289,10 @@ associated with the wxTreeItemData for the given item Id.}
 \membersection{wxTreeCtrl::GetItemImage}\label{wxtreectrlgetitemimage}
 
 \constfunc{int}{GetItemImage}{\param{const wxTreeItemId\& }{item},
 \membersection{wxTreeCtrl::GetItemImage}\label{wxtreectrlgetitemimage}
 
 \constfunc{int}{GetItemImage}{\param{const wxTreeItemId\& }{item},

-\param{wxTreeItemIcon }{which = wxTreeItemIcon\_Normal}}
+ \param{wxTreeItemIcon }{which = wxTreeItemIcon\_Normal}}

 
 Gets the specified item image. The value of {\it which} may be:
 
 Gets the specified item image. The value of {\it which} may be:

+

 \begin{itemize}\itemsep=0pt
 \item{wxTreeItemIcon\_Normal} to get the normal item image
 \item{wxTreeItemIcon\_Selected} to get the selected item image (i.e. the image
 \begin{itemize}\itemsep=0pt
 \item{wxTreeItemIcon\_Normal} to get the normal item image
 \item{wxTreeItemIcon\_Selected} to get the selected item image (i.e. the image


@@ -316,7 +318,7 @@ Returns the last child of the item (or an invalid tree item if this item has no
 
 \wxheading{See also}
 
 
 \wxheading{See also}
 

-\helpref{GetFirstChild}{wxtreectrlgetfirstchild},
+\helpref{GetFirstChild}{wxtreectrlgetfirstchild}, 

 \helpref{GetLastChild}{wxtreectrlgetlastchild}
 
 \membersection{wxTreeCtrl::GetNextChild}\label{wxtreectrlgetnextchild}
 \helpref{GetLastChild}{wxtreectrlgetlastchild}
 
 \membersection{wxTreeCtrl::GetNextChild}\label{wxtreectrlgetnextchild}


@@ -395,7 +397,7 @@ Returns the root item for the tree control.
 
 \constfunc{int}{GetItemSelectedImage}{\param{const wxTreeItemId\& }{item}}
 
 
 \constfunc{int}{GetItemSelectedImage}{\param{const wxTreeItemId\& }{item}}
 

-Gets the selected item image (this function is obsolete, use
+Gets the selected item image (this function is obsolete, use 

 {\tt GetItemImage(item, wxTreeItemIcon\_Selected} instead).
 
 \membersection{wxTreeCtrl::GetSelection}\label{wxtreectrlgetselection}
 {\tt GetItemImage(item, wxTreeItemIcon\_Selected} instead).
 
 \membersection{wxTreeCtrl::GetSelection}\label{wxtreectrlgetselection}


@@ -417,7 +419,7 @@ function can be called only if the control has the wxTR\_MULTIPLE style.
 Returns the number of selected items.
 
 \pythonnote{The wxPython version of this method accepts no parameters
 Returns the number of selected items.
 
 \pythonnote{The wxPython version of this method accepts no parameters

-and returns a Python list of {\tt wxTreeItemId}'s.}
+and returns a Python list of {\tt wxTreeItemId}s.}

 
 \membersection{wxTreeCtrl::GetStateImageList}\label{wxtreectrlgetstateimagelist}
 
 
 \membersection{wxTreeCtrl::GetStateImageList}\label{wxtreectrlgetstateimagelist}
 


@@ -561,7 +563,7 @@ See also: \helpref{IsBold}{wxtreectrlisbold}
 Sets the item client data.
 
 \pythonnote{wxPython provides the following shortcut method:\par
 Sets the item client data.
 
 \pythonnote{wxPython provides the following shortcut method:\par

-\indented{2cm}{\begin{twocollist}
+\indented{2cm}{\begin{twocollist}\itemsep=0pt

 \twocolitem{{\bf SetPyData(item, obj)}}{Associate the given Python
 Object with the wxTreeItemData for the given item Id.}
 \end{twocollist}}
 \twocolitem{{\bf SetPyData(item, obj)}}{Associate the given Python
 Object with the wxTreeItemData for the given item Id.}
 \end{twocollist}}


@@ -591,8 +593,7 @@ usage and loading time.
 \membersection{wxTreeCtrl::SetItemImage}\label{wxtreectrlsetitemimage}
 
 \func{void}{SetItemImage}{\param{const wxTreeItemId\&}{ item},
 \membersection{wxTreeCtrl::SetItemImage}\label{wxtreectrlsetitemimage}
 
 \func{void}{SetItemImage}{\param{const wxTreeItemId\&}{ item},

-\param{int }{image},
-\param{wxTreeItemIcon }{which = wxTreeItemIcon\_Normal}}
+ \param{int }{image}, \param{wxTreeItemIcon }{which = wxTreeItemIcon\_Normal}}

 
 Sets the specified item image. See \helpref{GetItemImage}{wxtreectrlgetitemimage}
 for the description of {\it which} parameter.
 
 Sets the specified item image. See \helpref{GetItemImage}{wxtreectrlgetitemimage}
 for the description of {\it which} parameter.


@@ -601,8 +602,7 @@ for the description of {\it which} parameter.
 
 \func{void}{SetItemSelectedImage}{\param{const wxTreeItemId\&}{ item}, \param{int }{selImage}}
 
 
 \func{void}{SetItemSelectedImage}{\param{const wxTreeItemId\&}{ item}, \param{int }{selImage}}
 

-Sets the selected item image (this function is obsolete, use
-{\tt SetItemImage(item, wxTreeItemIcon\_Selected} instead).
+Sets the selected item image (this function is obsolete, use {\tt SetItemImage(item, wxTreeItemIcon\_Selected} instead).

 
 \membersection{wxTreeCtrl::SetItemText}\label{wxtreectrlsetitemtext}
 
 
 \membersection{wxTreeCtrl::SetItemText}\label{wxtreectrlsetitemtext}
 


@@ -695,8 +695,9 @@ associated with the tree item using the wxTreeItemData as a
 container.
 
 In addition, the following methods are added in wxPython for accessing
 container.
 
 In addition, the following methods are added in wxPython for accessing

-the object:\par
-\indented{2cm}{\begin{twocollist}
+the object:
+
+\indented{2cm}{\begin{twocollist}\itemsep=0pt

 \twocolitem{{\bf GetData()}}{Returns a reference to the Python Object}
 \twocolitem{{\bf SetData(obj)}}{Associates a new Python Object with the
 wxTreeItemData}
 \twocolitem{{\bf GetData()}}{Returns a reference to the Python Object}
 \twocolitem{{\bf SetData(obj)}}{Associates a new Python Object with the
 wxTreeItemData}

diff --git a/docs/latex/wx/tsamples.tex b/docs/latex/wx/tsamples.tex
index 5c2963694b9fb1ccc013ebb5816d0bcd6b621920..e0b64545bccbee096080ae756b692270abd341ae 100644 (file)
--- a/docs/latex/wx/tsamples.tex
+++ b/docs/latex/wx/tsamples.tex
@@ -8,7 +8,6 @@
 %% Copyright:   (c) wxWindows team
 %% Licence:     wxWindows licence
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %% Copyright:   (c) wxWindows team
 %% Licence:     wxWindows licence
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

-

 % NB: please keep the subsections in alphabetic order!
 
 \section{wxWindows samples}\label{samples}
 % NB: please keep the subsections in alphabetic order!
 
 \section{wxWindows samples}\label{samples}


@@ -29,7 +28,7 @@ most commented sample of all - looking at its source code is recommended.
 
 The next most useful sample is probably the \helpref{controls}{samplecontrols} 
 one which shows many of wxWindows standard controls, such as buttons,
 
 The next most useful sample is probably the \helpref{controls}{samplecontrols} 
 one which shows many of wxWindows standard controls, such as buttons,

-listboxes, checkboxes, comboboxes e.t.c.
+listboxes, checkboxes, comboboxes etc.

 
 Other, more complicated controls, have their own samples. In this category you
 may find the following samples showing the corresponding controls:
 
 Other, more complicated controls, have their own samples. In this category you
 may find the following samples showing the corresponding controls:


@@ -90,6 +89,7 @@ notebook pages, advanving pages programmatically and vetoing a page change
 by intercepting the \helpref{wxNotebookEvent}{wxnotebookevent}.
 
 The various controls tested are listed here:
 by intercepting the \helpref{wxNotebookEvent}{wxnotebookevent}.
 
 The various controls tested are listed here:

+

 \begin{twocollist}\itemsep=0pt
 \twocolitem{\helpref{wxButton}{wxbutton}}{Push button control, displaying text}
 \twocolitem{\helpref{wxBitmapButton}{wxbitmapbutton}}{Push button control, displaying a bitmap}
 \begin{twocollist}\itemsep=0pt
 \twocolitem{\helpref{wxButton}{wxbutton}}{Push button control, displaying text}
 \twocolitem{\helpref{wxBitmapButton}{wxbitmapbutton}}{Push button control, displaying a bitmap}


@@ -318,16 +318,11 @@ immediately notified if the other end closes the connection.
 
 The sockets sample is work in progress. Coming soon:
 
 
 The sockets sample is work in progress. Coming soon:
 

-\begin{itemize}
-
+\begin{itemize}\itemsep=0pt

 \item More tests for basic socket functionality.
 \item More tests for basic socket functionality.

-

 \item Tests for the recently added datagram socket classes.
 \item Tests for the recently added datagram socket classes.

-

 \item Tests for protocol classes (wxProtocol and its descendants).
 \item Tests for protocol classes (wxProtocol and its descendants).

-

 \item New samples which actually do something useful (suggestions accepted).
 \item New samples which actually do something useful (suggestions accepted).

-

 \end{itemize}
 
 \subsection{Statbar sample}\label{samplestatbar}
 \end{itemize}
 
 \subsection{Statbar sample}\label{samplestatbar}


@@ -387,20 +382,16 @@ The toolbar sample shows the \helpref{wxToolBar}{wxtoolbar} class in action.
 
 The following things are demonstrated:
 
 
 The following things are demonstrated:
 

-\begin{itemize}
-
-\item Creating the toolbar using \helpref{wxToolBar::AddTool}{wxtoolbaraddtool}
+\begin{itemize}\itemsep=0pt
+\item Creating the toolbar using \helpref{wxToolBar::AddTool}{wxtoolbaraddtool} 

 and \helpref{wxToolBar::AddControl}{wxtoolbaraddcontrol}: see
 MyApp::InitToolbar in the sample.
 and \helpref{wxToolBar::AddControl}{wxtoolbaraddcontrol}: see
 MyApp::InitToolbar in the sample.

-

 \item Using {\tt EVT\_UPDATE\_UI} handler for automatically enabling/disabling
 toolbar buttons without having to explicitly call EnableTool. This is is done
 in MyFrame::OnUpdateCopyAndCut.
 \item Using {\tt EVT\_UPDATE\_UI} handler for automatically enabling/disabling
 toolbar buttons without having to explicitly call EnableTool. This is is done
 in MyFrame::OnUpdateCopyAndCut.

-

 \item Using \helpref{wxToolBar::DeleteTool}{wxtoolbardeletetool} and 
 \helpref{wxToolBar::InsertTool}{wxtoolbarinserttool} to dynamically update the
 toolbar.
 \item Using \helpref{wxToolBar::DeleteTool}{wxtoolbardeletetool} and 
 \helpref{wxToolBar::InsertTool}{wxtoolbarinserttool} to dynamically update the
 toolbar.

-

 \end{itemize}
 
 \subsection{Treectrl sample}\label{sampletreectrl}
 \end{itemize}
 
 \subsection{Treectrl sample}\label{sampletreectrl}


@@ -413,3 +404,4 @@ the bottom part of the frame).
 Adding, inserting and deleting items and branches from the tree as well as
 sorting (in default alphabetical order as well as in custom one) is
 demonstrated here as well - try the corresponding menu entries.
 Adding, inserting and deleting items and branches from the tree as well as
 sorting (in default alphabetical order as well as in custom one) is
 demonstrated here as well - try the corresponding menu entries.

+