adjusted indentation with astyle; added Id keyword

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@52383 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Francesco Montorsi
2008-03-08 14:43:31 +00:00
parent aa6ec1d787
commit 7c913512a4
269 changed files with 9052 additions and 9058 deletions

View File

@@ -9,38 +9,38 @@
/**
@class wxColour
@wxheader{colour.h}
A colour is an object representing a combination of Red, Green, and Blue (RGB)
intensity values,
and is used to determine drawing colours. See the
entry for wxColourDatabase for how a pointer to a predefined,
named colour may be returned instead of creating a new colour.
Valid RGB values are in the range 0 to 255.
You can retrieve the current system colour settings with wxSystemSettings.
@library{wxcore}
@category{gdi}
@stdobjects
Objects:
wxNullColour
Pointers:
wxBLACK
wxWHITE
wxRED
wxBLUE
wxGREEN
wxCYAN
wxLIGHT_GREY
@seealso
wxColourDatabase, wxPen, wxBrush, wxColourDialog, wxSystemSettings
*/
@@ -51,33 +51,33 @@ public:
/**
Copy constructor.
@param red
@param red
The red value.
@param green
@param green
The green value.
@param blue
@param blue
The blue value.
@param alpha
@param alpha
The alpha value. Alpha values range from 0 (wxALPHA_TRANSPARENT) to 255
(wxALPHA_OPAQUE).
@param colourName
@param colourName
The colour name.
@param colour
@param colour
The colour to copy.
@sa wxColourDatabase
*/
wxColour();
wxColour(unsigned char red, unsigned char green,
unsigned char blue,
unsigned char alpha=wxALPHA_OPAQUE);
wxColour(const wxString& colourNname);
wxColour(const wxColour& colour);
wxColour(unsigned char red, unsigned char green,
unsigned char blue,
unsigned char alpha=wxALPHA_OPAQUE);
wxColour(const wxString& colourNname);
wxColour(const wxColour& colour);
//@}
/**
@@ -99,14 +99,14 @@ public:
This function is new since wxWidgets version 2.7.0
*/
wxString GetAsString(long flags);
wxC2S_NAME wxC2S_CSS_SYNTAX, to obtain
the colour in the "rgb(r,g,b)" or "rgba(r,g,b,a)" syntax
(e.g. wxColour(255,0,0,85) - "rgba(255,0,0,0.333)"), and
wxC2S_HTML_SYNTAX, to obtain the colour as "#" followed
by 6 hexadecimal digits (e.g. wxColour(255,0,0) - "#FF0000").
This function never fails and always returns a non-empty string but asserts if
the colour has alpha channel (i.e. is non opaque) but
wxC2S_CSS_SYNTAX();
wxC2S_NAME wxC2S_CSS_SYNTAX, to obtain
the colour in the "rgb(r,g,b)" or "rgba(r,g,b,a)" syntax
(e.g. wxColour(255,0,0,85) - "rgba(255,0,0,0.333)"), and
wxC2S_HTML_SYNTAX, to obtain the colour as "#" followed
by 6 hexadecimal digits (e.g. wxColour(255,0,0) - "#FF0000").
This function never fails and always returns a non-empty string but asserts if
the colour has alpha channel (i.e. is non opaque) but
wxC2S_CSS_SYNTAX();
//@}
/**
@@ -139,10 +139,10 @@ wxC2S_CSS_SYNTAX();
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
wxTheColourDatabase), the CSS-like
@c "rgb(r,g,b)" or @c "rgba(r,g,b,a)" syntax (case insensitive)
and the HTML-like syntax (i.e. @c "#" followed by 6 hexadecimal digits
When using third form, Set() accepts: colour names (those listed in
wxTheColourDatabase), the CSS-like
@c "rgb(r,g,b)" or @c "rgba(r,g,b,a)" syntax (case insensitive)
and the HTML-like syntax (i.e. @c "#" followed by 6 hexadecimal digits
for red, green, blue components).
Returns @true if the conversion was successful, @false otherwise.
@@ -152,8 +152,8 @@ wxC2S_CSS_SYNTAX();
void Set(unsigned char red, unsigned char green,
unsigned char blue,
unsigned char alpha=wxALPHA_OPAQUE);
void Set(unsigned long RGB);
bool Set(const wxString & str);
void Set(unsigned long RGB);
bool Set(const wxString & str);
//@}
/**
@@ -169,7 +169,7 @@ wxC2S_CSS_SYNTAX();
@sa wxColourDatabase
*/
wxColour operator =(const wxColour& colour);
wxColour operator =(const wxString& colourName);
wxColour operator =(const wxString& colourName);
//@}
/**