don't use untyped wxList in wxXmlResource

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

diff --git a/docs/latex/wx/colour.tex b/docs/latex/wx/colour.tex
index 2c433298ebf1a4fb171c9641985209afea9eb7fe..4ba28808cda96562112100dcf044bb0e8375be90 100644 (file)
--- a/docs/latex/wx/colour.tex
+++ b/docs/latex/wx/colour.tex
@@ -64,7 +64,7 @@ Constructs a colour from red, green and blue values.
 
 \func{}{wxColour}{\param{const wxString\& }{colourNname}}
 
-Constructs a colour using the given string. See \helpref{Set}{wxcolourset3} for more info.
+Constructs a colour using the given string. See \helpref{Set}{wxcolourset} for more info.
 
 \func{}{wxColour}{\param{const wxColour\&}{ colour}}
 
@@ -118,6 +118,7 @@ the colour as  \texttt{``\#"} followed by 6 hexadecimal digits
 
 This function never fails and always returns a non-empty string.
 
+\newsince{2.7.0}
 
 \membersection{wxColour::GetPixel}\label{wxcolourgetpixel}
 
@@ -154,25 +155,18 @@ Returns the red intensity.
 
 \func{void}{Set}{\param{unsigned char}{ red}, \param{unsigned char}{ green}, \param{unsigned char}{ blue}}
 
-Sets the RGB intensity values.
-
-
-\membersection{wxColour::Set}\label{wxcolourset2}
-
 \func{void}{Set}{\param{unsigned long}{ RGB}}
 
-Sets the RGB intensity values extracting them from the packed long.
-
-
-\membersection{wxColour::Set}\label{wxcolourset3}
-
 \func{bool}{Set}{\param{const wxString \&}{ str}}
 
-Sets the colour using the given string.
-Accepts colour names (those listed in \helpref{wxTheColourDatabase}{wxcolourdatabase}), the CSS-like \texttt{``RGB(r,g,b)"} syntax (case insensitive) and the HTML-like syntax (i.e. \texttt{``\#"} followed by 6 hexadecimal digits for red, green, blue components).
+Sets the RGB intensity values using the given values (first overload), extracting them from the packed long (second overload), using the given string (third overloard).
+
+When using third form, Set() accepts: colour names (those listed in \helpref{wxTheColourDatabase}{wxcolourdatabase}), the CSS-like \texttt{``RGB(r,g,b)"} syntax (case insensitive) and the HTML-like syntax (i.e. \texttt{``\#"} followed by 6 hexadecimal digits for red, green, blue components).
 
 Returns \true if the conversion was successful, \false otherwise.
 
+\newsince{2.7.0}
+
 
 \membersection{wxColour::operator $=$}\label{wxcolourassign}