undefine _DEFINE_LIST before redefining it; also rename it to have WX prefix

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

diff --git a/docs/latex/wx/clrpicker.tex b/docs/latex/wx/clrpicker.tex
index cb95378b2e6dea4e5e9658f1d17c920f8bd4db72..f3874e62f2ab3cf68e2b62b38a374bab282a060c 100644 (file)
--- a/docs/latex/wx/clrpicker.tex
+++ b/docs/latex/wx/clrpicker.tex
@@ -28,15 +28,15 @@ It is only available if \texttt{wxUSE\_COLOURPICKERCTRL} is set to $1$ (the defa
 
 <wx/clrpicker.h>
 
+\wxheading{Library}
+
+\helpref{wxCore}{librarieslist}
+
 \wxheading{Window styles}
 
 \twocolwidtha{5cm}%
 \begin{twocollist}\itemsep=0pt
-\twocolitem{\windowstyle{wxCLRP\_DEFAULT}}{Default style.}
-\twocolitem{\windowstyle{wxCLRP\_USE\_TEXTCTRL}}{Creates a text control to the left of the
-picker button which is completely managed by the \helpref{wxColourPickerCtrl}{wxcolourpickerctrl}
-and which can be used by the user to specify a colour (see \helpref{SetColour}{wxcolourpickerctrlsetcolour}).
-The text control is automatically synchronized with button's value. Use functions defined in \helpref{wxPickerBase}{wxpickerbase} to modify the text control.}
+\twocolitem{\windowstyle{wxCLRP\_DEFAULT\_STYLE}}{The default style: 0.}
 \twocolitem{\windowstyle{wxCLRP\_USE\_TEXTCTRL}}{Creates a text control to the left of the
 picker button which is completely managed by the \helpref{wxColourPickerCtrl}{wxcolourpickerctrl}
 and which can be used by the user to specify a colour (see \helpref{SetColour}{wxcolourpickerctrlsetcolour}).
@@ -47,6 +47,9 @@ The text control is automatically synchronized with button's value. Use function
 
 \wxheading{Event handling}
 
+To process a colour picker event, use these event handler macros to direct input to member
+functions that take a \helpref{wxColourPickerEvent}{wxcolourpickerevent} argument.
+
 \twocolwidtha{7cm}%
 \begin{twocollist}\itemsep=0pt
 \twocolitem{{\bf EVT\_COLOURPICKER\_CHANGED(id, func)}}{The user changed the
@@ -63,14 +66,14 @@ the user's input is valid, i.e. recognizable). }
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 
-\membersection{wxColourPickerCtrl::wxColourPickerCtrl}\label{wxcolourpickerctrl}
+\membersection{wxColourPickerCtrl::wxColourPickerCtrl}\label{wxcolourpickerctrlctor}
 
 \func{}{wxColourPickerCtrl}{\param{wxWindow *}{parent},\rtfsp
 \param{wxWindowID}{ id},\rtfsp
 \param{const wxColour\& }{colour = *wxBLACK},\rtfsp
 \param{const wxPoint\& }{pos = wxDefaultPosition},\rtfsp
 \param{const wxSize\& }{size = wxDefaultSize},\rtfsp
-\param{long}{ style = wxCP\_DEFAULT\_STYLE},\rtfsp
+\param{long}{ style = wxCLRP\_DEFAULT\_STYLE},\rtfsp
 \param{const wxValidator\& }{validator = wxDefaultValidator},
 \param{const wxString\& }{name = ``colourpickerctrl"}}
 
@@ -85,7 +88,7 @@ all the parameters.
 \param{const wxColour\& }{colour = *wxBLACK},\rtfsp
 \param{const wxPoint\& }{pos = wxDefaultPosition},\rtfsp
 \param{const wxSize\& }{size = wxDefaultSize},\rtfsp
-\param{long}{ style = wxCP\_DEFAULT\_STYLE},\rtfsp
+\param{long}{ style = wxCLRP\_DEFAULT\_STYLE},\rtfsp
 \param{const wxValidator\& }{validator = wxDefaultValidator},
 \param{const wxString\& }{name = ``colourpickerctrl"}}
 
@@ -101,7 +104,7 @@ all the parameters.
 
 \docparam{size}{Initial size.}
 
-\docparam{style}{The window style, see wxCRLP\_* flags.}
+\docparam{style}{The window style, see {\tt wxCRLP\_*} flags.}
 
 \docparam{validator}{Validator which can be used for additional date checks.}
 
@@ -147,6 +150,10 @@ This event class is used for the events generated by
 
 <wx/clrpicker.h>
 
+\wxheading{Library}
+
+\helpref{wxCore}{librarieslist}
+
 \wxheading{Event handling}
 
 To process input from a wxColourPickerCtrl, use one of these event handler macros to