From ecf527c06b7ab2f1101fdc050783d846f4b34f93 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Fri, 11 Feb 2000 19:42:46 +0000 Subject: [PATCH] Manual fixes git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/classes.tex | 2 +- docs/latex/wx/function.tex | 2 +- docs/latex/wx/listctrl.tex | 8 ++++---- docs/latex/wx/manual.tex | 4 ++-- docs/latex/wx/treectrl.tex | 29 +++++++++++++++-------------- docs/latex/wx/tsamples.tex | 20 ++++++-------------- 6 files changed, 29 insertions(+), 36 deletions(-) diff --git a/docs/latex/wx/classes.tex b/docs/latex/wx/classes.tex index 5a52bd37e6..ab7e99e350 100644 --- 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 listctrl.tex +%\input listctrl.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 b50303abae..0e55f4a1db 100644 --- a/docs/latex/wx/function.tex +++ b/docs/latex/wx/function.tex @@ -571,7 +571,7 @@ if (s) \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 diff --git a/docs/latex/wx/listctrl.tex b/docs/latex/wx/listctrl.tex index 0e37651989..83eccb19d5 100644 --- 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 -\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.} @@ -582,7 +582,6 @@ string or image at a given location.} \end{twocollist}} } - \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} -\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 @@ -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. + diff --git a/docs/latex/wx/manual.tex b/docs/latex/wx/manual.tex index 5ec436b8e3..10dc13b4dd 100644 --- a/docs/latex/wx/manual.tex +++ b/docs/latex/wx/manual.tex @@ -25,13 +25,13 @@ %\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} -\date{January 24th 2000} +\date{February 11th 2000} } \makeindex \begin{document} diff --git a/docs/latex/wx/treectrl.tex b/docs/latex/wx/treectrl.tex index 20539c9e00..4d78485216 100644 --- 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} -\helpref{wxTreeCtrl::EndEditLabel}{wxtreectrlendeditlabel}, +\helpref{wxTreeCtrl::EndEditLabel}{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} -\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}} @@ -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}, -\param{wxTreeItemIcon }{which = wxTreeItemIcon\_Normal}} + \param{wxTreeItemIcon }{which = wxTreeItemIcon\_Normal}} 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 @@ -316,7 +318,7 @@ Returns the last child of the item (or an invalid tree item if this item has no \wxheading{See also} -\helpref{GetFirstChild}{wxtreectrlgetfirstchild}, +\helpref{GetFirstChild}{wxtreectrlgetfirstchild}, \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}} -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} @@ -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 -and returns a Python list of {\tt wxTreeItemId}'s.} +and returns a Python list of {\tt wxTreeItemId}s.} \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 -\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}} @@ -591,8 +593,7 @@ usage and loading time. \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. @@ -601,8 +602,7 @@ for the description of {\it which} parameter. \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} @@ -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 -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} diff --git a/docs/latex/wx/tsamples.tex b/docs/latex/wx/tsamples.tex index 5c2963694b..e0b64545bc 100644 --- a/docs/latex/wx/tsamples.tex +++ b/docs/latex/wx/tsamples.tex @@ -8,7 +8,6 @@ %% Copyright: (c) wxWindows team %% Licence: wxWindows licence %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - % 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, -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: @@ -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: + \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: -\begin{itemize} - +\begin{itemize}\itemsep=0pt \item More tests for basic socket functionality. - \item Tests for the recently added datagram socket classes. - \item Tests for protocol classes (wxProtocol and its descendants). - \item New samples which actually do something useful (suggestions accepted). - \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: -\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. - \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. - \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. + -- 2.45.2