wxColour source cleaning. Corrections to 'const unsigned char' within wxColour docs.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@35801 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2005-10-05 16:22:44 +00:00
parent 6e21a3db8a
commit edc536d358
20 changed files with 213 additions and 182 deletions

View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: colour.h
// Name: wx/mgl/colour.h
// Purpose: wxColour class
// Author: Julian Smart
// Modified by:
@@ -18,35 +18,40 @@
class WXDLLEXPORT wxColour: public wxObject
{
public:
// ctors
// default
// constructors
// ------------
// default
wxColour();
// from RGB
// from separate RGB
wxColour(unsigned char red, unsigned char green, unsigned char blue)
{ Set(red, green, blue); }
// from packed RGB
wxColour(unsigned long colRGB) { Set(colRGB); }
// implicit conversion from the colour name
// implicit conversion from the colour name
wxColour(const wxString &colourName) { InitFromName(colourName); }
wxColour(const char *colourName) { InitFromName(colourName); }
// copy ctors and assignment operators
// copy ctors and assignment operators
wxColour(const wxColour& col);
wxColour& operator = (const wxColour& col);
// dtor
// dtor
~wxColour();
// Set() functions
void Set(unsigned char red, unsigned char green, unsigned char blue);
void Set(unsigned long colRGB)
{
// we don't need to know sizeof(long) here because we assume that the three
// least significant bytes contain the R, G and B values
Set((unsigned char)colRGB,
(unsigned char)(colRGB >> 8),
(unsigned char)(colRGB >> 16));
// we don't need to know sizeof(long) here because we assume that the three
// least significant bytes contain the R, G and B values
Set((unsigned char)colRGB,
(unsigned char)(colRGB >> 8),
(unsigned char)(colRGB >> 16));
}
// accessors
@@ -59,10 +64,10 @@ public:
// comparison
bool operator == (const wxColour& colour) const
{
return (m_red == colour.m_red &&
m_green == colour.m_green &&
m_blue == colour.m_blue &&
m_isInit == colour.m_isInit);
return (m_red == colour.m_red &&
m_green == colour.m_green &&
m_blue == colour.m_blue &&
m_isInit == colour.m_isInit);
}
bool operator != (const wxColour& colour) const { return !(*this == colour); }