Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

44
include/wx/os2/colour.h
View File

@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////////
// Name: colour.h
// Name: wx/os2/colour.h
// Purpose: wxColour class
// Author: David Webster
// Modified by:
@@ -18,56 +18,36 @@
class WXDLLEXPORT wxColour: public wxObject
{
public:
//
// Ctors
//
// constructors
// ------------
//
// Default
//
// default
wxColour();
//
// from RGB
//
wxColour( unsigned char cRed
,unsigned char cGreen
,unsigned char cBlue
);
// from separate RGB
wxColour( unsigned char cRed, unsigned char cGreen, unsigned char cBlue );
// from packed RGB
wxColour( unsigned long colRGB ) { Set(colRGB); }
//
// Implicit conversion from the colour name
//
wxColour(const wxString& rColourName) { InitFromName(rColourName); }
wxColour(const wxChar *zColourName) { InitFromName(zColourName); }
//
// Copy ctors and assignment operators
//
wxColour(const wxColour& rCol);
wxColour(const wxColour* pCol);
wxColour&operator = (const wxColour& rCol);
//
// Dtor
//
~wxColour();
//
// Set functions
//
void Set( unsigned char cRed
,unsigned char cGreen
,unsigned char cBlue
);
void Set(unsigned long lColRGB)
void Set( unsigned char cRed, unsigned char cGreen, unsigned char cBlue);
void Set( unsigned long lColRGB)
{
//
// 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)lColRGB
,(unsigned char)(lColRGB >> 8)
,(unsigned char)(lColRGB >> 16)
@@ -78,18 +58,14 @@ public:
InitFromName(rsColour);
}
//
// Accessors
//
bool Ok(void) const {return m_bIsInit; }
unsigned char Red(void) const { return m_cRed; }
unsigned char Green(void) const { return m_cGreen; }
unsigned char Blue(void) const { return m_cBlue; }
//
// Comparison
//
bool operator == (const wxColour& rColour) const
{
return (m_bIsInit == rColour.m_bIsInit
@@ -118,7 +94,7 @@ private:
public:
WXCOLORREF m_vPixel ;
private:
DECLARE_DYNAMIC_CLASS(wxColour)
DECLARE_DYNAMIC_CLASS(wxColour)
}; // end of class wxColour
#endif