From 04bf08b7e26f35a177b46948789505c316b2df28 Mon Sep 17 00:00:00 2001 From: Julian Smart Date: Sun, 29 Feb 2004 13:02:01 +0000 Subject: [PATCH] Some doc corrections git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25999 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/category.tex | 3 +-- docs/latex/wx/fontdlg.tex | 5 +---- docs/latex/wx/mltchdlg.tex | 7 ++----- docs/latex/wx/tcommdlg.tex | 15 ++++----------- docs/latex/wx/tvalidat.tex | 10 +++++----- 5 files changed, 13 insertions(+), 27 deletions(-) diff --git a/docs/latex/wx/category.tex b/docs/latex/wx/category.tex index b42f790986..98e4f323fd 100644 --- a/docs/latex/wx/category.tex +++ b/docs/latex/wx/category.tex @@ -63,13 +63,12 @@ in an application. \twocolitem{\helpref{wxDirDialog}{wxdirdialog}}{Directory selector dialog} \twocolitem{\helpref{wxFileDialog}{wxfiledialog}}{File selector dialog} \twocolitem{\helpref{wxFindReplaceDialog}{wxfindreplacedialog}}{Text search/replace dialog} -\twocolitem{\helpref{wxMultipleChoiceDialog}{wxmultiplechoicedialog}}{Dialog to get one or more selections from a list} +\twocolitem{\helpref{wxMultiChoiceDialog}{wxmultichoicedialog}}{Dialog to get one or more selections from a list} \twocolitem{\helpref{wxSingleChoiceDialog}{wxsinglechoicedialog}}{Dialog to get a single selection from a list and return the string} \twocolitem{\helpref{wxTextEntryDialog}{wxtextentrydialog}}{Dialog to get a single line of text from the user} \twocolitem{\helpref{wxFontDialog}{wxfontdialog}}{Font chooser dialog} \twocolitem{\helpref{wxPageSetupDialog}{wxpagesetupdialog}}{Standard page setup dialog} \twocolitem{\helpref{wxPrintDialog}{wxprintdialog}}{Standard print dialog} -\twocolitem{\helpref{wxPageSetupDialog}{wxpagesetupdialog}}{Standard page setup dialog} \twocolitem{\helpref{wxMessageDialog}{wxmessagedialog}}{Simple message box dialog} \twocolitem{\helpref{wxWizard}{wxwizard}}{A wizard dialog.} \end{twocollist} diff --git a/docs/latex/wx/fontdlg.tex b/docs/latex/wx/fontdlg.tex index 93e83bf0e6..cfb372c9c2 100644 --- a/docs/latex/wx/fontdlg.tex +++ b/docs/latex/wx/fontdlg.tex @@ -62,10 +62,7 @@ The default value is black. \func{wxFont}{GetChosenFont}{\void} -Gets the font chosen by the user. If the user pressed OK (wxFontDialog::Show returned true), this returns -a new font which is now `owned' by the application, and should be deleted -if not required. If the user pressed Cancel (wxFontDialog::Show returned false) or -the colour dialog has not been invoked yet, this will return NULL. +Gets the font chosen by the user if the user pressed OK (wxFontDialog::ShowModal returned wxID\_OK). \membersection{wxFontData::GetEnableEffects} diff --git a/docs/latex/wx/mltchdlg.tex b/docs/latex/wx/mltchdlg.tex index 709e91dfce..e4ad19bb79 100644 --- a/docs/latex/wx/mltchdlg.tex +++ b/docs/latex/wx/mltchdlg.tex @@ -1,10 +1,8 @@ -\section{\class{wxMultipleChoiceDialog}}\label{wxmultiplechoicedialog} +\section{\class{wxMultiChoiceDialog}}\label{wxmultichoicedialog} This class represents a dialog that shows a list of strings, and allows the user to select one or more. -{\bf NOTE:} this class is not yet implemented. - \wxheading{Derived from} \helpref{wxDialog}{wxdialog}\\ @@ -18,8 +16,7 @@ the user to select one or more. \wxheading{See also} -\helpref{wxMultipleChoiceDialog overview}{wxmultiplechoicedialogoverview} +\helpref{wxMultiChoiceDialog overview}{wxmultichoicedialogoverview} \latexignore{\rtfignore{\wxheading{Members}}} - diff --git a/docs/latex/wx/tcommdlg.tex b/docs/latex/wx/tcommdlg.tex index 452d851d25..3060285bee 100644 --- a/docs/latex/wx/tcommdlg.tex +++ b/docs/latex/wx/tcommdlg.tex @@ -4,7 +4,7 @@ Classes: \helpref{wxColourDialog}{wxcolourdialog}, \helpref{wxFontDialog}{wxfont \rtfsp\helpref{wxPrintDialog}{wxprintdialog}, \helpref{wxFileDialog}{wxfiledialog},\rtfsp \helpref{wxDirDialog}{wxdirdialog}, \helpref{wxTextEntryDialog}{wxtextentrydialog},\rtfsp \helpref{wxMessageDialog}{wxmessagedialog}, \helpref{wxSingleChoiceDialog}{wxsinglechoicedialog},\rtfsp -\helpref{wxMultipleChoiceDialog}{wxmultiplechoicedialog} +\helpref{wxMultiChoiceDialog}{wxmultichoicedialog} Common dialog classes and functions encapsulate commonly-needed dialog box requirements. They are all `modal', grabbing the flow of control until the user dismisses the dialog, @@ -95,8 +95,7 @@ font is shown on a white area of the dialog box. Note that in the translation from full MS Windows fonts to wxWindows font conventions, strikeout is ignored and a font family (such as Swiss or Modern) is deduced from the actual font name (such as Arial -or Courier). The full range of Windows fonts cannot be used in wxWindows -at present. +or Courier). {\bf The generic font selector} @@ -106,11 +105,6 @@ underlining and text foreground colour are provided, and a sample is shown upon a white background. The generic font selector is also available under MS Windows; use the name wxGenericFontDialog. -In both cases, the application is responsible for deleting the -new font returned from calling wxFontDialog::Show (if any). -This returned font is guaranteed to be a new object and not -one currently in use in the application. - {\bf Example} In the samples/dialogs directory, there is an example of using @@ -202,11 +196,10 @@ This dialog shows a list of choices, plus OK and (optionally) Cancel. The user c select one of them. The selection can be obtained from the dialog as an index, a string or client data. -\subsection{wxMultipleChoiceDialog overview}\label{wxmultiplechoicedialogoverview} +\subsection{wxMultiChoiceDialog overview}\label{wxmultichoicedialogoverview} -Classes: \helpref{wxMultipleChoiceDialog}{wxmultiplechoicedialog} +Classes: \helpref{wxMultiChoiceDialog}{wxmultichoicedialog} This dialog shows a list of choices, plus OK and (optionally) Cancel. The user can select one or more of them. - diff --git a/docs/latex/wx/tvalidat.tex b/docs/latex/wx/tvalidat.tex index f0ccdf6978..9cb7de38ec 100644 --- a/docs/latex/wx/tvalidat.tex +++ b/docs/latex/wx/tvalidat.tex @@ -101,16 +101,16 @@ this: \begin{verbatim} void wxDialog::OnOK(wxCommandEvent& event) { - if ( Validate() && TransferDataFromWindow() ) - { + if ( Validate() && TransferDataFromWindow() ) + { if ( IsModal() ) EndModal(wxID_OK); else { - SetReturnCode(wxID_OK); - this->Show(false); + SetReturnCode(wxID_OK); + this->Show(false); } - } + } } \end{verbatim} -- 2.47.2