X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aaa6f9ba6bd0be1fe6a34800e6f753ffdc49900c..3694bb76c11d1ed1518f20a42f8907c948e190bd:/docs/latex/wx/fontpicker.tex?ds=sidebyside

diff --git a/docs/latex/wx/fontpicker.tex b/docs/latex/wx/fontpicker.tex
index 10f7f31c93..43f725d818 100644
--- a/docs/latex/wx/fontpicker.tex
+++ b/docs/latex/wx/fontpicker.tex
@@ -28,11 +28,16 @@ It is only available if \texttt{wxUSE\_FONTPICKERCTRL} is set to $1$ (the defaul
 
 <wx/fontpicker.h>
 
+\wxheading{Library}
+
+\helpref{wxCore}{librarieslist}
+
 \wxheading{Window styles}
 
 \twocolwidtha{5cm}%
 \begin{twocollist}\itemsep=0pt
-\twocolitem{\windowstyle{wxFNTP\_DEFAULT}}{Default style.}
+\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}).
@@ -43,6 +48,9 @@ The text control is automatically synchronized with button's value. Use function
 
 \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
@@ -63,7 +71,7 @@ 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 = wxFNTP\_DEFAULT\_STYLE},\rtfsp
@@ -78,7 +86,7 @@ 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 = wxFNTP\_DEFAULT\_STYLE},\rtfsp
@@ -91,7 +99,8 @@ 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.}
 
@@ -161,6 +170,10 @@ This event class is used for the events generated by
 
 <wx/fontpicker.h>
 
+\wxheading{Library}
+
+\helpref{wxCore}{librarieslist}
+
 \wxheading{Event handling}
 
 To process input from a wxFontPickerCtrl, use one of these event handler macros to
@@ -198,3 +211,4 @@ Retrieve the font the user has just selected.
 \func{void}{SetFont}{\param{const wxFont \&}{ f}}
 
 Set the font associated with the event.
+