Manual fixes

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5972 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2000-02-11 19:42:46 +00:00
parent ab79958a7f
commit ecf527c06b
6 changed files with 29 additions and 36 deletions

View File

@@ -136,7 +136,7 @@
\input layout.tex \input layout.tex
\input list.tex \input list.tex
\input listbox.tex \input listbox.tex
\input listctrl.tex %\input listctrl.tex
\input listevt.tex \input listevt.tex
\input proplosv.tex \input proplosv.tex
\input locale.tex \input locale.tex

View File

@@ -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 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 invalid colour (use \helpref{wxColour::Ok}{wxcolourok} to test whether a colour

View File

@@ -465,7 +465,7 @@ Insert an image/string item.
\pythonnote{In place of a single overloaded method name, wxPython \pythonnote{In place of a single overloaded method name, wxPython
implements the following methods:\par 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 InsertItem(item)}}{Inserts an item using a wxListItem.}
\twocolitem{{\bf InsertStringItem(index, label)}}{Inserts a string item.} \twocolitem{{\bf InsertStringItem(index, label)}}{Inserts a string item.}
\twocolitem{{\bf InsertImageItem(index, imageIndex)}}{Inserts an image 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} \membersection{wxListCtrl::SetItemData}\label{wxlistctrlsetitemdata}
\func{bool}{SetItemData}{\param{long }{item}, \param{long }{data}} \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{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{item2}{client data associated with the second item ({\bf NOT} the index).}
\docparam{data}{the value passed to SortItems() itself.} \docparam{data}{the value passed to SortItems() itself.}
Notice that the control may only be sorted on client data associated with the 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 Please see the \helpref{listctrl sample}{samplelistctrl} for an example of
using this function. using this function.

View File

@@ -25,13 +25,13 @@
%\special{!/@scaleunit 1 def} %\special{!/@scaleunit 1 def}
\parskip=10pt \parskip=10pt
\parindent=0pt \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{\author{by Julian Smart et al
%\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$} %\winhelponly{\\$$\image{1cm;0cm}{wxwin.wmf}$$}
}} }}
\winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin, \winhelpignore{\author{Julian Smart, Robert Roebling, Vadim Zeitlin,
Robin Dunn, et al} Robin Dunn, et al}
\date{January 24th 2000} \date{February 11th 2000}
} }
\makeindex \makeindex
\begin{document} \begin{document}

View File

@@ -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} \helpref{wxTreeEvent}{wxtreeevent}
\membersection{wxTreeCtrl::EndEditLabel}\label{wxtreectrlendeditlabel} \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 \pythonnote{wxPython provides the following shortcut method:
\indented{2cm}{\begin{twocollist}
\indented{2cm}{\begin{twocollist}\itemsep=0pt
\twocolitem{{\bf GetPyData(item)}}{Returns the Python Object \twocolitem{{\bf GetPyData(item)}}{Returns the Python Object
associated with the wxTreeItemData for the given item Id.} associated with the wxTreeItemData for the given item Id.}
\end{twocollist}} \end{twocollist}}
@@ -288,9 +289,10 @@ associated with the wxTreeItemData for the given item Id.}
\membersection{wxTreeCtrl::GetItemImage}\label{wxtreectrlgetitemimage} \membersection{wxTreeCtrl::GetItemImage}\label{wxtreectrlgetitemimage}
\constfunc{int}{GetItemImage}{\param{const wxTreeItemId\& }{item}, \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 \begin{itemize}\itemsep=0pt
\item{wxTreeItemIcon\_Normal} to get the normal item image \item{wxTreeItemIcon\_Normal} to get the normal item image
\item{wxTreeItemIcon\_Selected} to get the selected item image (i.e. the 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} \helpref{GetLastChild}{wxtreectrlgetlastchild}
\membersection{wxTreeCtrl::GetNextChild}\label{wxtreectrlgetnextchild} \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). {\tt GetItemImage(item, wxTreeItemIcon\_Selected} instead).
\membersection{wxTreeCtrl::GetSelection}\label{wxtreectrlgetselection} \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. Returns the number of selected items.
\pythonnote{The wxPython version of this method accepts no parameters \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. Sets the item client data.
\pythonnote{wxPython provides the following shortcut method:\par \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 \twocolitem{{\bf SetPyData(item, obj)}}{Associate the given Python
Object with the wxTreeItemData for the given item Id.} Object with the wxTreeItemData for the given item Id.}
\end{twocollist}} \end{twocollist}}
@@ -591,8 +593,7 @@ usage and loading time.
\membersection{wxTreeCtrl::SetItemImage}\label{wxtreectrlsetitemimage} \membersection{wxTreeCtrl::SetItemImage}\label{wxtreectrlsetitemimage}
\func{void}{SetItemImage}{\param{const wxTreeItemId\&}{ item}, \func{void}{SetItemImage}{\param{const wxTreeItemId\&}{ item},
\param{int }{image}, \param{int }{image}, \param{wxTreeItemIcon }{which = wxTreeItemIcon\_Normal}}
\param{wxTreeItemIcon }{which = wxTreeItemIcon\_Normal}}
Sets the specified item image. See \helpref{GetItemImage}{wxtreectrlgetitemimage} Sets the specified item image. See \helpref{GetItemImage}{wxtreectrlgetitemimage}
for the description of {\it which} parameter. 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 Sets the selected item image (this function is obsolete, use {\tt SetItemImage(item, wxTreeItemIcon\_Selected} instead).
{\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. container.
In addition, the following methods are added in wxPython for accessing In addition, the following methods are added in wxPython for accessing
the object:\par the object:
\indented{2cm}{\begin{twocollist}
\indented{2cm}{\begin{twocollist}\itemsep=0pt
\twocolitem{{\bf GetData()}}{Returns a reference to the Python Object} \twocolitem{{\bf GetData()}}{Returns a reference to the Python Object}
\twocolitem{{\bf SetData(obj)}}{Associates a new Python Object with the \twocolitem{{\bf SetData(obj)}}{Associates a new Python Object with the
wxTreeItemData} wxTreeItemData}

View File

@@ -8,7 +8,6 @@
%% Copyright: (c) wxWindows team %% Copyright: (c) wxWindows team
%% Licence: wxWindows licence %% Licence: wxWindows licence
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% NB: please keep the subsections in alphabetic order! % NB: please keep the subsections in alphabetic order!
\section{wxWindows samples}\label{samples} \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} The next most useful sample is probably the \helpref{controls}{samplecontrols}
one which shows many of wxWindows standard controls, such as buttons, 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 Other, more complicated controls, have their own samples. In this category you
may find the following samples showing the corresponding controls: 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}. by intercepting the \helpref{wxNotebookEvent}{wxnotebookevent}.
The various controls tested are listed here: The various controls tested are listed here:
\begin{twocollist}\itemsep=0pt \begin{twocollist}\itemsep=0pt
\twocolitem{\helpref{wxButton}{wxbutton}}{Push button control, displaying text} \twocolitem{\helpref{wxButton}{wxbutton}}{Push button control, displaying text}
\twocolitem{\helpref{wxBitmapButton}{wxbitmapbutton}}{Push button control, displaying a bitmap} \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} \end{itemize}
\subsection{Statbar sample}\label{samplestatbar} \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} \begin{itemize}\itemsep=0pt
\item Creating the toolbar using \helpref{wxToolBar::AddTool}{wxtoolbaraddtool}
\item Creating the toolbar using \helpref{wxToolBar::AddTool}{wxtoolbaraddtool}
and \helpref{wxToolBar::AddControl}{wxtoolbaraddcontrol}: see and \helpref{wxToolBar::AddControl}{wxtoolbaraddcontrol}: see
MyApp::InitToolbar in the sample. MyApp::InitToolbar in the sample.
\item Using {\tt EVT\_UPDATE\_UI} handler for automatically enabling/disabling \item Using {\tt EVT\_UPDATE\_UI} handler for automatically enabling/disabling
toolbar buttons without having to explicitly call EnableTool. This is is done toolbar buttons without having to explicitly call EnableTool. This is is done
in MyFrame::OnUpdateCopyAndCut. in MyFrame::OnUpdateCopyAndCut.
\item Using \helpref{wxToolBar::DeleteTool}{wxtoolbardeletetool} and \item Using \helpref{wxToolBar::DeleteTool}{wxtoolbardeletetool} and
\helpref{wxToolBar::InsertTool}{wxtoolbarinserttool} to dynamically update the \helpref{wxToolBar::InsertTool}{wxtoolbarinserttool} to dynamically update the
toolbar. toolbar.
\end{itemize} \end{itemize}
\subsection{Treectrl sample}\label{sampletreectrl} \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 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 sorting (in default alphabetical order as well as in custom one) is
demonstrated here as well - try the corresponding menu entries. demonstrated here as well - try the corresponding menu entries.