Further changes markup.

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

diff --git a/docs/latex/wx/font.tex b/docs/latex/wx/font.tex
index 014c8b680b0af04fbf1b8670f14788242448a3d4..a3ca844583afbcfddc68ebc754d11c435d074593 100644 (file)
--- a/docs/latex/wx/font.tex
+++ b/docs/latex/wx/font.tex
@@ -19,7 +19,25 @@ You can retrieve the current system font settings with \helpref{wxSystemSettings
 
 \wxheading{Constants}
 
 
 \wxheading{Constants}
 

+The possible values for the \arg{family} parameter of \helpref{wxFont
+constructor}{wxfontctor} are (the old names are for compatibility only):
+
+\begin{verbatim}
+enum wxFontFamily
+{
+    wxFONTFAMILY_DEFAULT = wxDEFAULT,
+    wxFONTFAMILY_DECORATIVE = wxDECORATIVE,
+    wxFONTFAMILY_ROMAN = wxROMAN,
+    wxFONTFAMILY_SCRIPT = wxSCRIPT,
+    wxFONTFAMILY_SWISS = wxSWISS,
+    wxFONTFAMILY_MODERN = wxMODERN,
+    wxFONTFAMILY_TELETYPE = wxTELETYPE,
+    wxFONTFAMILY_MAX
+};
+\end{verbatim}
+

 The font flags which can be used during the font creation are:
 The font flags which can be used during the font creation are:

+

 \begin{verbatim}
 enum
 {
 \begin{verbatim}
 enum
 {


@@ -45,6 +63,7 @@ enum
 \end{verbatim}
 
 The known font encodings are:
 \end{verbatim}
 
 The known font encodings are:

+

 \begin{verbatim}
 enum wxFontEncoding
 {
 \begin{verbatim}
 enum wxFontEncoding
 {


@@ -126,23 +145,32 @@ wxSWISS\_FONT}
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 
 
 \latexignore{\rtfignore{\wxheading{Members}}}
 

-\membersection{wxFont::wxFont}\label{wxfontconstr}
+
+\membersection{wxFont::wxFont}\label{wxfontctor}

 
 \func{}{wxFont}{\void}
 
 Default constructor.
 
 
 \func{}{wxFont}{\void}
 
 Default constructor.
 

-\func{}{wxFont}{\param{int}{ pointSize}, \param{int}{ family}, \param{int}{ style}, \param{int}{ weight},
+\func{}{wxFont}{\param{int}{ pointSize}, \param{wxFontFamily}{ family}, \param{int}{ style}, \param{int}{ weight},
+ \param{const bool}{ underline = false}, \param{const wxString\& }{faceName = ""},
+ \param{wxFontEncoding }{encoding = wxFONTENCODING\_DEFAULT}}
+
+\func{}{wxFont}{\param{const wxSize\&}{ pixelSize}, \param{wxFontFamily}{ family}, \param{int}{ style}, \param{int}{ weight},

  \param{const bool}{ underline = false}, \param{const wxString\& }{faceName = ""},
  \param{wxFontEncoding }{encoding = wxFONTENCODING\_DEFAULT}}
 
  \param{const bool}{ underline = false}, \param{const wxString\& }{faceName = ""},
  \param{wxFontEncoding }{encoding = wxFONTENCODING\_DEFAULT}}
 

-Creates a font object (see \helpref{font encoding
-overview}{wxfontencodingoverview} for the meaning of the last parameter).
+Creates a font object with the specified attributes.

 
 \wxheading{Parameters}
 
 \docparam{pointSize}{Size in points.}
 
 
 \wxheading{Parameters}
 
 \docparam{pointSize}{Size in points.}
 

+\docparam{pixelSize}{Size in pixels: this is directly supported only under MSW
+currently where this constructor can be used directly, under other platforms a
+font with the closest size to the given one is found using binary search and
+the static \helpref{New}{wxfontnew} method must be used.}
+

 \docparam{family}{Font family, a generic way of referring to fonts without specifying actual facename. One of:
 
 \twocolwidtha{5cm}
 \docparam{family}{Font family, a generic way of referring to fonts without specifying actual facename. One of:
 
 \twocolwidtha{5cm}


@@ -161,8 +189,8 @@ overview}{wxfontencodingoverview} for the meaning of the last parameter).
 
 \docparam{underline}{The value can be true or false. At present this has an effect on Windows and Motif 2.x only.}
 
 
 \docparam{underline}{The value can be true or false. At present this has an effect on Windows and Motif 2.x only.}
 

-\docparam{faceName}{An optional string specifying the actual typeface to be used. If the empty string,
-a default typeface will chosen based on the family.}
+\docparam{faceName}{An optional string specifying the actual typeface to be used. If it is an empty string,
+a default typeface will be chosen based on the family.}

 
 \docparam{encoding}{An encoding which may be one of
 \twocolwidtha{5cm}
 
 \docparam{encoding}{An encoding which may be one of
 \twocolwidtha{5cm}


@@ -177,7 +205,8 @@ default application encoding is the same as default system encoding.}
 \twocolitem{{\bf wxFONTENCODING\_KOI8}}{The standard Russian encoding for Internet.}
 \twocolitem{{\bf wxFONTENCODING\_CP1250...1252}}{Windows encodings similar to ISO8859 (but not identical).}
 \end{twocollist}
 \twocolitem{{\bf wxFONTENCODING\_KOI8}}{The standard Russian encoding for Internet.}
 \twocolitem{{\bf wxFONTENCODING\_CP1250...1252}}{Windows encodings similar to ISO8859 (but not identical).}
 \end{twocollist}

-If the specified encoding isn't available, no font is created.
+If the specified encoding isn't available, no font is created
+(see also \helpref{font encoding overview}{wxfontencodingoverview}).

 }
 
 \wxheading{Remarks}
 }
 
 \wxheading{Remarks}


@@ -188,7 +217,8 @@ Under Windows, only scalable TrueType fonts are used.
 See also \helpref{wxDC::SetFont}{wxdcsetfont}, \helpref{wxDC::DrawText}{wxdcdrawtext}
 and \helpref{wxDC::GetTextExtent}{wxdcgettextextent}.
 
 See also \helpref{wxDC::SetFont}{wxdcsetfont}, \helpref{wxDC::DrawText}{wxdcdrawtext}
 and \helpref{wxDC::GetTextExtent}{wxdcgettextextent}.
 

-\membersection{wxFont::\destruct{wxFont}}
+
+\membersection{wxFont::\destruct{wxFont}}\label{wxfontdtor}

 
 \func{}{\destruct{wxFont}}{\void}
 
 
 \func{}{\destruct{wxFont}}{\void}
 


@@ -201,9 +231,10 @@ system, since wxFont uses a reference counting system for efficiency.
 
 Although all remaining fonts are deleted when the application exits,
 the application should try to clean up all fonts itself. This is because
 
 Although all remaining fonts are deleted when the application exits,
 the application should try to clean up all fonts itself. This is because

-wxWindows cannot know if a pointer to the font object is stored in an
+wxWidgets cannot know if a pointer to the font object is stored in an

 application data structure, and there is a risk of double deletion.
 
 application data structure, and there is a risk of double deletion.
 

+

 \membersection{wxFont::IsFixedWidth}\label{wxfontisfixedwidth}
 
 \constfunc{bool}{IsFixedWidth}{\void}
 \membersection{wxFont::IsFixedWidth}\label{wxfontisfixedwidth}
 
 \constfunc{bool}{IsFixedWidth}{\void}


@@ -211,6 +242,7 @@ application data structure, and there is a risk of double deletion.
 Returns {\tt true} if the font is a fixed width (or monospaced) font, 
 {\tt false} if it is a proportional one or font is invalid.
 
 Returns {\tt true} if the font is a fixed width (or monospaced) font, 
 {\tt false} if it is a proportional one or font is invalid.
 

+

 \membersection{wxFont::GetDefaultEncoding}\label{wxfontgetdefaultencoding}
 
 \func{static wxFontEncoding}{GetDefaultEncoding}{\void}
 \membersection{wxFont::GetDefaultEncoding}\label{wxfontgetdefaultencoding}
 
 \func{static wxFontEncoding}{GetDefaultEncoding}{\void}


@@ -222,6 +254,7 @@ Returns the current application's default encoding.
 \helpref{Font encoding overview}{wxfontencodingoverview}, 
 \helpref{SetDefaultEncoding}{wxfontsetdefaultencoding}
 
 \helpref{Font encoding overview}{wxfontencodingoverview}, 
 \helpref{SetDefaultEncoding}{wxfontsetdefaultencoding}
 

+

 \membersection{wxFont::GetFaceName}\label{wxfontgetfacename}
 
 \constfunc{wxString}{GetFaceName}{\void}
 \membersection{wxFont::GetFaceName}\label{wxfontgetfacename}
 
 \constfunc{wxString}{GetFaceName}{\void}


@@ -233,17 +266,19 @@ typeface information.
 
 \helpref{wxFont::SetFaceName}{wxfontsetfacename}
 
 
 \helpref{wxFont::SetFaceName}{wxfontsetfacename}
 

+

 \membersection{wxFont::GetFamily}\label{wxfontgetfamily}
 
 \constfunc{int}{GetFamily}{\void}
 
 \membersection{wxFont::GetFamily}\label{wxfontgetfamily}
 
 \constfunc{int}{GetFamily}{\void}
 

-Gets the font family. See \helpref{wxFont::wxFont}{wxfontconstr} for a list of valid
+Gets the font family. See \helpref{wxFont::wxFont}{wxfontctor} for a list of valid

 family identifiers.
 
 \wxheading{See also}
 
 \helpref{wxFont::SetFamily}{wxfontsetfamily}
 
 family identifiers.
 
 \wxheading{See also}
 
 \helpref{wxFont::SetFamily}{wxfontsetfamily}
 

+

 \membersection{wxFont::GetNativeFontInfoDesc}\label{wxfontgetnativefontinfodesc}
 
 \constfunc{wxString}{GetNativeFontInfoDesc}{\void}
 \membersection{wxFont::GetNativeFontInfoDesc}\label{wxfontgetnativefontinfodesc}
 
 \constfunc{wxString}{GetNativeFontInfoDesc}{\void}


@@ -255,6 +290,7 @@ empty string if the font wasn't constructed using the native font description.
 
 \helpref{wxFont::SetNativeFontInfo}{wxfontsetnativefontinfo}
 
 
 \helpref{wxFont::SetNativeFontInfo}{wxfontsetnativefontinfo}
 

+

 \membersection{wxFont::GetPointSize}\label{wxfontgetpointsize}
 
 \constfunc{int}{GetPointSize}{\void}
 \membersection{wxFont::GetPointSize}\label{wxfontgetpointsize}
 
 \constfunc{int}{GetPointSize}{\void}


@@ -265,17 +301,19 @@ Gets the point size.
 
 \helpref{wxFont::SetPointSize}{wxfontsetpointsize}
 
 
 \helpref{wxFont::SetPointSize}{wxfontsetpointsize}
 

+

 \membersection{wxFont::GetStyle}\label{wxfontgetstyle}
 
 \constfunc{int}{GetStyle}{\void}
 
 \membersection{wxFont::GetStyle}\label{wxfontgetstyle}
 
 \constfunc{int}{GetStyle}{\void}
 

-Gets the font style. See \helpref{wxFont::wxFont}{wxfontconstr} for a list of valid
+Gets the font style. See \helpref{wxFont::wxFont}{wxfontctor} for a list of valid

 styles.
 
 \wxheading{See also}
 
 \helpref{wxFont::SetStyle}{wxfontsetstyle}
 
 styles.
 
 \wxheading{See also}
 
 \helpref{wxFont::SetStyle}{wxfontsetstyle}
 

+

 \membersection{wxFont::GetUnderlined}\label{wxfontgetunderlined}
 
 \constfunc{bool}{GetUnderlined}{\void}
 \membersection{wxFont::GetUnderlined}\label{wxfontgetunderlined}
 
 \constfunc{bool}{GetUnderlined}{\void}


@@ -286,23 +324,51 @@ Returns true if the font is underlined, false otherwise.
 
 \helpref{wxFont::SetUnderlined}{wxfontsetunderlined}
 
 
 \helpref{wxFont::SetUnderlined}{wxfontsetunderlined}
 

+

 \membersection{wxFont::GetWeight}\label{wxfontgetweight}
 
 \constfunc{int}{GetWeight}{\void}
 
 \membersection{wxFont::GetWeight}\label{wxfontgetweight}
 
 \constfunc{int}{GetWeight}{\void}
 

-Gets the font weight. See \helpref{wxFont::wxFont}{wxfontconstr} for a list of valid
+Gets the font weight. See \helpref{wxFont::wxFont}{wxfontctor} for a list of valid

 weight identifiers.
 
 \wxheading{See also}
 
 \helpref{wxFont::SetWeight}{wxfontsetweight}
 
 weight identifiers.
 
 \wxheading{See also}
 
 \helpref{wxFont::SetWeight}{wxfontsetweight}
 

+
+\membersection{wxFont::New}\label{wxfontnew}
+
+\func{static wxFont *}{New}{\param{int}{ pointSize}, \param{wxFontFamily}{ family}, \param{int}{ style}, \param{int}{ weight},
+ \param{const bool}{ underline = false}, \param{const wxString\& }{faceName = ""},
+ \param{wxFontEncoding }{encoding = wxFONTENCODING\_DEFAULT}}
+
+\func{static wxFont *}{New}{\param{int}{ pointSize}, \param{wxFontFamily}{ family}, 
+ \param{int}{ flags = \texttt{wxFONTFLAG\_DEFAULT}}, \param{const wxString\& }{faceName = ""},
+ \param{wxFontEncoding }{encoding = wxFONTENCODING\_DEFAULT}}
+
+\func{static wxFont *}{New}{\param{const wxSize\&}{ pixelSize}, \param{wxFontFamily}{ family}, \param{int}{ style}, \param{int}{ weight},
+ \param{const bool}{ underline = false}, \param{const wxString\& }{faceName = ""},
+ \param{wxFontEncoding }{encoding = wxFONTENCODING\_DEFAULT}}
+
+\func{static wxFont *}{New}{\param{const wxSize\&}{ pixelSize}, \param{wxFontFamily}{ family}, 
+ \param{int}{ flags = \texttt{wxFONTFLAG\_DEFAULT}}, \param{const wxString\& }{faceName = ""},
+ \param{wxFontEncoding }{encoding = wxFONTENCODING\_DEFAULT}}
+
+These functions take the same parameters as \helpref{wxFont
+constructor}{wxfontctor} and return a new font object allocated on the heap.
+
+Using \texttt{New()} is currently the only way to directly create a font with
+the given size in pixels on platforms other than wxMSW.
+
+

 \membersection{wxFont::Ok}\label{wxfontok}
 
 \constfunc{bool}{Ok}{\void}
 
 Returns {\tt true} if this object is a valid font, {\tt false} otherwise.
 
 \membersection{wxFont::Ok}\label{wxfontok}
 
 \constfunc{bool}{Ok}{\void}
 
 Returns {\tt true} if this object is a valid font, {\tt false} otherwise.
 

+

 \membersection{wxFont::SetDefaultEncoding}\label{wxfontsetdefaultencoding}
 
 \func{static void}{SetDefaultEncoding}{\param{wxFontEncoding }{encoding}}
 \membersection{wxFont::SetDefaultEncoding}\label{wxfontsetdefaultencoding}
 
 \func{static void}{SetDefaultEncoding}{\param{wxFontEncoding }{encoding}}


@@ -314,6 +380,7 @@ Sets the default font encoding.
 \helpref{Font encoding overview}{wxfontencodingoverview}, 
 \helpref{GetDefaultEncoding}{wxfontgetdefaultencoding}
 
 \helpref{Font encoding overview}{wxfontencodingoverview}, 
 \helpref{GetDefaultEncoding}{wxfontgetdefaultencoding}
 

+

 \membersection{wxFont::SetFaceName}\label{wxfontsetfacename}
 
 \func{void}{SetFaceName}{\param{const wxString\& }{faceName}}
 \membersection{wxFont::SetFaceName}\label{wxfontsetfacename}
 
 \func{void}{SetFaceName}{\param{const wxString\& }{faceName}}


@@ -328,13 +395,14 @@ Sets the facename for the font.
 
 To avoid portability problems, don't rely on a specific face, but specify the font family
 instead or as well. A suitable font will be found on the end-user's system. If both the
 
 To avoid portability problems, don't rely on a specific face, but specify the font family
 instead or as well. A suitable font will be found on the end-user's system. If both the

-family and the facename are specified, wxWindows will first search for the specific face,
+family and the facename are specified, wxWidgets will first search for the specific face,

 and then for a font belonging to the same family.
 
 \wxheading{See also}
 
 \helpref{wxFont::GetFaceName}{wxfontgetfacename}, \helpref{wxFont::SetFamily}{wxfontsetfamily}
 
 and then for a font belonging to the same family.
 
 \wxheading{See also}
 
 \helpref{wxFont::GetFaceName}{wxfontgetfacename}, \helpref{wxFont::SetFamily}{wxfontsetfamily}
 

+

 \membersection{wxFont::SetFamily}\label{wxfontsetfamily}
 
 \func{void}{SetFamily}{\param{int}{ family}}
 \membersection{wxFont::SetFamily}\label{wxfontsetfamily}
 
 \func{void}{SetFamily}{\param{int}{ family}}


@@ -359,6 +427,7 @@ Sets the font family.
 
 \helpref{wxFont::GetFamily}{wxfontgetfamily}, \helpref{wxFont::SetFaceName}{wxfontsetfacename}
 
 
 \helpref{wxFont::GetFamily}{wxfontgetfamily}, \helpref{wxFont::SetFaceName}{wxfontsetfacename}
 

+

 \membersection{wxFont::SetNativeFontInfo}\label{wxfontsetnativefontinfo}
 
 \func{void}{SetNativeFontInfo}{\param{const wxString\& }{info}}
 \membersection{wxFont::SetNativeFontInfo}\label{wxfontsetnativefontinfo}
 
 \func{void}{SetNativeFontInfo}{\param{const wxString\& }{info}}


@@ -368,6 +437,7 @@ which must have been previously returned by
 \helpref{GetNativeFontInfoDesc}{wxfontgetnativefontinfodesc}. If the string is
 invalid, font is unchanged.
 
 \helpref{GetNativeFontInfoDesc}{wxfontgetnativefontinfodesc}. If the string is
 invalid, font is unchanged.
 

+

 \membersection{wxFont::SetPointSize}\label{wxfontsetpointsize}
 
 \func{void}{SetPointSize}{\param{int}{ pointSize}}
 \membersection{wxFont::SetPointSize}\label{wxfontsetpointsize}
 
 \func{void}{SetPointSize}{\param{int}{ pointSize}}


@@ -382,6 +452,7 @@ Sets the point size.
 
 \helpref{wxFont::GetPointSize}{wxfontgetpointsize}
 
 
 \helpref{wxFont::GetPointSize}{wxfontgetpointsize}
 

+

 \membersection{wxFont::SetStyle}\label{wxfontsetstyle}
 
 \func{void}{SetStyle}{\param{int}{ style}}
 \membersection{wxFont::SetStyle}\label{wxfontsetstyle}
 
 \func{void}{SetStyle}{\param{int}{ style}}


@@ -396,6 +467,7 @@ Sets the font style.
 
 \helpref{wxFont::GetStyle}{wxfontgetstyle}
 
 
 \helpref{wxFont::GetStyle}{wxfontgetstyle}
 

+

 \membersection{wxFont::SetUnderlined}\label{wxfontsetunderlined}
 
 \func{void}{SetUnderlined}{\param{const bool}{ underlined}}
 \membersection{wxFont::SetUnderlined}\label{wxfontsetunderlined}
 
 \func{void}{SetUnderlined}{\param{const bool}{ underlined}}


@@ -410,6 +482,7 @@ Sets underlining.
 
 \helpref{wxFont::GetUnderlined}{wxfontgetunderlined}
 
 
 \helpref{wxFont::GetUnderlined}{wxfontgetunderlined}
 

+

 \membersection{wxFont::SetWeight}\label{wxfontsetweight}
 
 \func{void}{SetWeight}{\param{int}{ weight}}
 \membersection{wxFont::SetWeight}\label{wxfontsetweight}
 
 \func{void}{SetWeight}{\param{int}{ weight}}


@@ -424,6 +497,7 @@ Sets the font weight.
 
 \helpref{wxFont::GetWeight}{wxfontgetweight}
 
 
 \helpref{wxFont::GetWeight}{wxfontgetweight}
 

+

 \membersection{wxFont::operator $=$}\label{wxfontassignment}
 
 \func{wxFont\&}{operator $=$}{\param{const wxFont\& }{font}}
 \membersection{wxFont::operator $=$}\label{wxfontassignment}
 
 \func{wxFont\&}{operator $=$}{\param{const wxFont\& }{font}}


@@ -431,15 +505,17 @@ Sets the font weight.
 Assignment operator, using reference counting. Returns a reference
 to `this'.
 
 Assignment operator, using reference counting. Returns a reference
 to `this'.
 

+

 \membersection{wxFont::operator $==$}\label{wxfontequals}
 
 \func{bool}{operator $==$}{\param{const wxFont\& }{font}}
 
 Equality operator. Two fonts are equal if they contain pointers
 to the same underlying font data. It does not compare each attribute,
 \membersection{wxFont::operator $==$}\label{wxfontequals}
 
 \func{bool}{operator $==$}{\param{const wxFont\& }{font}}
 
 Equality operator. Two fonts are equal if they contain pointers
 to the same underlying font data. It does not compare each attribute,

-so two indefontdently-created fonts using the same parameters will
+so two independently-created fonts using the same parameters will

 fail the test.
 
 fail the test.
 

+

 \membersection{wxFont::operator $!=$}\label{wxfontnotequals}
 
 \func{bool}{operator $!=$}{\param{const wxFont\& }{font}}
 \membersection{wxFont::operator $!=$}\label{wxfontnotequals}
 
 \func{bool}{operator $!=$}{\param{const wxFont\& }{font}}


@@ -447,4 +523,3 @@ fail the test.
 Inequality operator. Two fonts are not equal if they contain pointers
 to different underlying font data. It does not compare each attribute.
 
 Inequality operator. Two fonts are not equal if they contain pointers
 to different underlying font data. It does not compare each attribute.
 

-