many wxItemContainer-related changes:

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

diff --git a/docs/latex/wx/fontpicker.tex b/docs/latex/wx/fontpicker.tex
index 4e66d8e2b637d4a21adcae978f0d19d43760ec38..76c1db276136dfec758d32e764fd4974d32b966f 100644 (file)
--- a/docs/latex/wx/fontpicker.tex
+++ b/docs/latex/wx/fontpicker.tex
@@ -32,22 +32,26 @@ It is only available if \texttt{wxUSE\_FONTPICKERCTRL} is set to $1$ (the defaul
 
 \twocolwidtha{5cm}%
 \begin{twocollist}\itemsep=0pt
-\twocolitem{\windowstyle{wxFONTP\_DEFAULT}}{Default style.}
-\twocolitem{\windowstyle{wxFONTP\_USE\_TEXTCTRL}}{Creates a text control to the left of the
+\twocolitem{\windowstyle{wxFNTP\_DEFAULT\_STYLE}}{The default style:
+wxFNTP\_FONTDESC\_AS\_LABEL | wxFNTP\_USEFONT\_FOR\_LABEL.}
+\twocolitem{\windowstyle{wxFNTP\_USE\_TEXTCTRL}}{Creates a text control to the left of the
 picker button which is completely managed by the \helpref{wxFontPickerCtrl}{wxfontpickerctrl}
 and which can be used by the user to specify a font (see \helpref{SetSelectedFont}{wxfontpickerctrlsetselectedfont}).
 The text control is automatically synchronized with button's value. Use functions defined in \helpref{wxPickerBase}{wxpickerbase} to modify the text control.}
-\twocolitem{\windowstyle{wxFONTP\_FONTDESC\_AS\_LABEL}}{Keeps the label of the button updated with the fontface name and the font size. E.g. choosing "Times New Roman bold, italic with size 10" from the fontdialog, will update the label (overwriting any previous label) with the "Times New Roman, 10" text.}
-\twocolitem{\windowstyle{wxFONTP\_USEFONT\_FOR\_LABEL}}{Uses the currently selected font to draw the label of the button.}
+\twocolitem{\windowstyle{wxFNTP\_FONTDESC\_AS\_LABEL}}{Keeps the label of the button updated with the fontface name and the font size. E.g. choosing "Times New Roman bold, italic with size 10" from the fontdialog, will update the label (overwriting any previous label) with the "Times New Roman, 10" text.}
+\twocolitem{\windowstyle{wxFNTP\_USEFONT\_FOR\_LABEL}}{Uses the currently selected font to draw the label of the button.}
 \end{twocollist}
 
 \wxheading{Event handling}
 
+To process a font picker event, use these event handler macros to direct input to member
+functions that take a \helpref{wxFontPickerEvent}{wxfontpickerevent} argument.
+
 \twocolwidtha{7cm}%
 \begin{twocollist}\itemsep=0pt
 \twocolitem{{\bf EVT\_FONTPICKER\_CHANGED(id, func)}}{The user changed the font
 selected in the control either using the button or using text control (see
-wxFONTP\_USE\_TEXTCTRL; note that in this case the event is fired only if the
+wxFNTP\_USE\_TEXTCTRL; note that in this case the event is fired only if the
 user's input is valid, i.e. recognizable). }
 \end{twocollist}
 
@@ -63,10 +67,10 @@ user's input is valid, i.e. recognizable). }
 
 \func{}{wxFontPickerCtrl}{\param{wxWindow *}{parent},\rtfsp
 \param{wxWindowID}{ id},\rtfsp
-\param{const wxFont\& }{font = *wxNORMAL\_FONT},\rtfsp
+\param{const wxFont\& }{font = wxNullFont},\rtfsp
 \param{const wxPoint\& }{pos = wxDefaultPosition},\rtfsp
 \param{const wxSize\& }{size = wxDefaultSize},\rtfsp
-\param{long}{ style = wxFONTP\_DEFAULT\_STYLE},\rtfsp
+\param{long}{ style = wxFNTP\_DEFAULT\_STYLE},\rtfsp
 \param{const wxValidator\& }{validator = wxDefaultValidator},
 \param{const wxString\& }{name = ``fontpickerctrl"}}
 
@@ -78,10 +82,10 @@ all the parameters.
 
 \func{bool}{Create}{\param{wxWindow *}{parent},\rtfsp
 \param{wxWindowID}{ id},\rtfsp
-\param{const wxFont\& }{font = *wxNORMAL\_FONT},\rtfsp
+\param{const wxFont\& }{font = wxNullFont},\rtfsp
 \param{const wxPoint\& }{pos = wxDefaultPosition},\rtfsp
 \param{const wxSize\& }{size = wxDefaultSize},\rtfsp
-\param{long}{ style = wxFONTP\_DEFAULT\_STYLE},\rtfsp
+\param{long}{ style = wxFNTP\_DEFAULT\_STYLE},\rtfsp
 \param{const wxValidator\& }{validator = wxDefaultValidator},
 \param{const wxString\& }{name = ``fontpickerctrl"}}
 
@@ -91,13 +95,14 @@ all the parameters.
 
 \docparam{id}{The identifier for the control.}
 
-\docparam{font}{The initial font shown in the control.}
+\docparam{font}{The initial font shown in the control. If \texttt{wxNullFont} 
+is given, the default font is used.}
 
 \docparam{pos}{Initial position.}
 
 \docparam{size}{Initial size.}
 
-\docparam{style}{The window style, see wxCRLP\_* flags.}
+\docparam{style}{The window style, see {\tt wxFNTP\_*} flags.}
 
 \docparam{validator}{Validator which can be used for additional date checks.}
 
@@ -138,7 +143,7 @@ Returns the maximum point size value allowed for the user-chosen font.
 Sets the maximum point size value allowed for the user-chosen font.
 The default value is 100. Note that big fonts can require a lot of memory and CPU time
 both for creation and for rendering; thus, specially because the user has the option to specify
-the fontsize through a text control (see wxFONTP\_USE\_TEXTCTRL), it's a good idea to put a limit
+the fontsize through a text control (see wxFNTP\_USE\_TEXTCTRL), it's a good idea to put a limit
 to the maximum font size when huge fonts do not make much sense.
 
 
@@ -159,7 +164,7 @@ This event class is used for the events generated by
 
 \wxheading{Include files}
 
-<wx/clrpicker.h>
+<wx/fontpicker.h>
 
 \wxheading{Event handling}
 
@@ -198,3 +203,4 @@ Retrieve the font the user has just selected.
 \func{void}{SetFont}{\param{const wxFont \&}{ f}}
 
 Set the font associated with the event.
+