From bf43ff9a903af9e4aa1fdfa72a6d048c0f4367db Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sun, 22 Jun 2003 22:20:40 +0000 Subject: [PATCH 1/1] LaTeX2e fixes (patch 748118) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@21311 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- docs/latex/wx/cppconst.tex | 2 +- docs/latex/wx/db.tex | 13 +++++++------ docs/latex/wx/filesys.tex | 2 +- docs/latex/wx/fontmap.tex | 18 ++++++++++++++++++ docs/latex/wx/frame.tex | 2 +- docs/latex/wx/log.tex | 2 +- docs/latex/wx/region.tex | 8 ++++---- docs/latex/wx/scpdptr.tex | 4 ++-- docs/latex/wx/statusbr.tex | 2 +- 9 files changed, 36 insertions(+), 17 deletions(-) diff --git a/docs/latex/wx/cppconst.tex b/docs/latex/wx/cppconst.tex index e31b790630..f359723f7f 100644 --- a/docs/latex/wx/cppconst.tex +++ b/docs/latex/wx/cppconst.tex @@ -101,7 +101,7 @@ the compiler version, $1100$ is $11.0$ and $1200$ is OpenWatcom.} \begin{twocollist}\itemsep=0pt \twocolitem{\_\_WXDEBUG\_\_}{defined in debug mode, undefined in release mode} \twocolitem{wxUSE\_XXX}{if defined as $1$, feature XXX is active -(the symbols of this form are always defined, use #if and not #ifdef to test +(the symbols of this form are always defined, use \#if and not \#ifdef to test for them)} \end{twocollist} diff --git a/docs/latex/wx/db.tex b/docs/latex/wx/db.tex index 2910dd5f26..5adf4694d8 100644 --- a/docs/latex/wx/db.tex +++ b/docs/latex/wx/db.tex @@ -1421,7 +1421,7 @@ at least minimal privileges to the table). \docparam{tableName}{Name of the table on which to check privileges. {\it tableName} may refer to a table, view, alias or synonym.} \docparam{priv}{The table privilege being evaluated. May be one of the -following (or a datasource specific privilege): +following (or a datasource specific privilege):} \begin{verbatim} SELECT : The connected user is permitted to retrieve data for @@ -1442,28 +1442,29 @@ following (or a datasource specific privilege): example, a unique, referential, or table check constraint). \end{verbatim} -} + \docparam{userID}{{\it OPTIONAL.} User for which to determine if the privilege specified to be checked is granted or not. Default is "". -{\it userID} is evaluated as follows: +{\it userID} is evaluated as follows:} \begin{verbatim} userID == NULL ... NOT ALLOWED! userID == "" ... UserID set equal to 'this->uid' userID != "" ... UserID set equal to 'userID' \end{verbatim} -} + \docparam{schema}{{\it OPTIONAL.} Owner of the table. Specify a userID when the datasource you are connected to allows multiple unique tables with the same name to be owned by different users. Specifying the table owner makes determination of the -users privileges MUCH faster. Default is NULL. {\it userID} is evaluated as follows: +users privileges MUCH faster. Default is NULL. {\it userID} is +evaluated as follows:} \begin{verbatim} schema == NULL ... Any owner (DEFAULT) schema == "" ... Owned by 'this->uid' schema != "" ... Owned by userID specified in 'schema' \end{verbatim} -} + \docparam{path}{{\it OPTIONAL.} Path to the table. Default is "". Currently unused.} diff --git a/docs/latex/wx/filesys.tex b/docs/latex/wx/filesys.tex index c1e3e01e46..d01ce1ee96 100644 --- a/docs/latex/wx/filesys.tex +++ b/docs/latex/wx/filesys.tex @@ -125,7 +125,7 @@ absolute path. \membersection{wxFileSystem::URLToFileName}\label{wxfilesystemurltofilename} -\func{static wxFileName}{URLToFileName}{\param{const wxString& }{url}} +\func{static wxFileName}{URLToFileName}{\param{const wxString\& }{url}} Converts URL into a well-formed filename. The URL must use the {\tt file} protocol. diff --git a/docs/latex/wx/fontmap.tex b/docs/latex/wx/fontmap.tex index be6ad279d7..c5369cd2c5 100644 --- a/docs/latex/wx/fontmap.tex +++ b/docs/latex/wx/fontmap.tex @@ -124,6 +124,15 @@ If no facename is given, find {\it any} font in this encoding. Returns the encoding for the given charset (in the form of RFC 2046) or wxFONTENCODING\_SYSTEM if couldn't decode it. +\membersection{wxFontMapper::GetEncoding}\label{wxfontmappergetencoding} + +\func{static wxFontEncoding}{GetEncoding}{\param{size\_t }{n}} + +Returns the {\it n}-th supported encoding. Together with +\helpref{GetSupportedEncodingsCount()}{wxfontmappergetsupportedencodingscount} +this method may be used to get all supported encodings. + + \membersection{wxFontMapper::GetEncodingName}\label{wxfontmappergetencodingname} \func{static wxString}{GetEncodingName}{\param{wxFontEncoding }{encoding}} @@ -137,6 +146,15 @@ Return internal string identifier for the encoding (see also Return user-readable string describing the given encoding. +\membersection{wxFontMapper::GetSupportedEncodingsCount}\label{wxfontmappergetsupportedencodingscount} + +\func{static size\_t}{GetSupportedEncodingsCount}{\void} + +Returns the number of the font encodings supported by this class. Together with +\helpref{GetEncoding}{wxfontmappergetencoding} this method may be used to get +all supported encodings. + + \membersection{wxFontMapper::SetDialogParent}\label{wxfontmappersetdialogparent} \func{void}{SetDialogParent}{\param{wxWindow* }{parent}} diff --git a/docs/latex/wx/frame.tex b/docs/latex/wx/frame.tex index 2e130b44e1..6eeae2fb8b 100644 --- a/docs/latex/wx/frame.tex +++ b/docs/latex/wx/frame.tex @@ -523,7 +523,7 @@ Note that it is not possible to call this function twice for the same frame obje \membersection{wxFrame::SetShape}\label{wxframesetshape} -\func{bool}{SetShape}{\param{const wxRegion&}{ region}} +\func{bool}{SetShape}{\param{const wxRegion\&}{ region}} If the platform supports it, sets the shape of the window to that depicted by \it{region}. The system will not display or diff --git a/docs/latex/wx/log.tex b/docs/latex/wx/log.tex index ce5acdf4df..6c070e4727 100644 --- a/docs/latex/wx/log.tex +++ b/docs/latex/wx/log.tex @@ -187,7 +187,7 @@ Removes all trace masks previously set with \membersection{wxLog::GetTraceMasks}\label{wxloggettracemasks} -\func{static const wxArrayString &}{GetTraceMasks}{\void} +\func{static const wxArrayString \&}{GetTraceMasks}{\void} Returns the currently allowed list of string trace masks. diff --git a/docs/latex/wx/region.tex b/docs/latex/wx/region.tex index c80bdeb535..60118cf9f0 100644 --- a/docs/latex/wx/region.tex +++ b/docs/latex/wx/region.tex @@ -48,8 +48,8 @@ provided array. {\it fillStyle} parameter may have values {\bf NB:} This constructor is only implemented for Win32 and GTK+ wxWindows ports. -\func{}{wxRegion}{\param{const wxBitmap&}{ bmp}, - \param{const wxColour&}{ transColour = wxNullColour}, +\func{}{wxRegion}{\param{const wxBitmap\&}{ bmp}, + \param{const wxColour\&}{ transColour = wxNullColour}, \param{int}{ tolerance = 0}} Constructs a region using the non-transparent pixels of a bitmap. See @@ -183,8 +183,8 @@ Finds the union of this region and another, rectangular region. Finds the union of this region and another region. -\func{bool}{Union}{\param{const wxBitmap&}{ bmp}, - \param{const wxColour&}{ transColour = wxNullColour}, +\func{bool}{Union}{\param{const wxBitmap\&}{ bmp}, + \param{const wxColour\&}{ transColour = wxNullColour}, \param{int}{ tolerance = 0}} Finds the union of this region and the the non-transparent pixels of a diff --git a/docs/latex/wx/scpdptr.tex b/docs/latex/wx/scpdptr.tex index 3fab597dfa..f513808fb1 100644 --- a/docs/latex/wx/scpdptr.tex +++ b/docs/latex/wx/scpdptr.tex @@ -87,9 +87,9 @@ This operator works like the standard C++ pointer operator to return the object being pointed to by the pointer. If the pointer is NULL or invalid this will crash. -\membersection{wxScopedPtr::operator -\>} +\membersection{wxScopedPtr::operator -$>$} % TODO -\func{const T*}{operator -\>}{\void} +\func{const T*}{operator -$>$}{\void} % TODO This operator works like the standard C++ pointer operator to return the pointer in the smart pointer or NULL if it is empty. diff --git a/docs/latex/wx/statusbr.tex b/docs/latex/wx/statusbr.tex index 58a882beb5..648019282d 100644 --- a/docs/latex/wx/statusbr.tex +++ b/docs/latex/wx/statusbr.tex @@ -143,7 +143,7 @@ strings. \membersection{wxStatusBar::PushStatusText}\label{wxstatusbarpushstatustext} -\func{void}{PushStatusText}{\param{const wxString&}{ string}, \param{int}{ field = 0}} +\func{void}{PushStatusText}{\param{const wxString\&}{ string}, \param{int}{ field = 0}} Saves the current field text in a per field stack, and sets the field text to the string passed as argument. -- 2.45.2