replaced all occurences of wxColourDatabase::FindColour() with Find(); minor code cleanup here and there
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24231 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -25,19 +25,17 @@ class WXDLLEXPORT wxColour: public wxObject
|
||||
public:
|
||||
// ctors
|
||||
// default
|
||||
wxColour();
|
||||
wxColour() { Init(); }
|
||||
// from RGB
|
||||
wxColour( unsigned char red, unsigned char green, unsigned char blue );
|
||||
wxColour( unsigned char red, unsigned char green, unsigned char blue )
|
||||
{ Set(red, green, blue); }
|
||||
wxColour( unsigned long colRGB )
|
||||
: m_isInit(FALSE), m_red(0), m_blue(0), m_green(0)
|
||||
{ Set(colRGB); }
|
||||
|
||||
// implicit conversion from the colour name
|
||||
wxColour( const wxString &colourName )
|
||||
: m_isInit(FALSE), m_red(0), m_blue(0), m_green(0)
|
||||
{ InitFromName(colourName); }
|
||||
wxColour( const wxChar *colourName )
|
||||
: m_isInit(FALSE), m_red(0), m_blue(0), m_green(0)
|
||||
{ InitFromName(colourName); }
|
||||
|
||||
// copy ctors and assignment operators
|
||||
@@ -86,6 +84,8 @@ private:
|
||||
unsigned char m_blue;
|
||||
unsigned char m_green;
|
||||
|
||||
void Init();
|
||||
|
||||
public:
|
||||
WXCOLORREF m_pixel ;
|
||||
void Set( const WXCOLORREF* color ) ;
|
||||
|
@@ -25,7 +25,8 @@ public:
|
||||
// default
|
||||
wxColour();
|
||||
// from RGB
|
||||
wxColour(unsigned char red, unsigned char green, unsigned char blue);
|
||||
wxColour(unsigned char red, unsigned char green, unsigned char blue)
|
||||
{ Set(red, green, blue); }
|
||||
wxColour(unsigned long colRGB) { Set(colRGB); }
|
||||
|
||||
// implicit conversion from the colour name
|
||||
@@ -74,7 +75,8 @@ private:
|
||||
unsigned char m_blue;
|
||||
unsigned char m_green;
|
||||
|
||||
// helper func
|
||||
// ctors helpers
|
||||
void Init();
|
||||
void InitFromName(const wxString& colourName);
|
||||
|
||||
private:
|
||||
|
@@ -28,7 +28,8 @@ public:
|
||||
// default
|
||||
wxColour();
|
||||
// from RGB
|
||||
wxColour( unsigned char red, unsigned char green, unsigned char blue );
|
||||
wxColour( unsigned char red, unsigned char green, unsigned char blue )
|
||||
{ Set(red, green, blue); }
|
||||
wxColour( unsigned long colRGB ) { Set(colRGB); }
|
||||
|
||||
// implicit conversion from the colour name
|
||||
|
@@ -53,6 +53,9 @@ public:
|
||||
wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); }
|
||||
#endif
|
||||
|
||||
// Get colour from name or wxNullColour
|
||||
static wxColour CreateByName(const wxString& name);
|
||||
|
||||
wxColour( const wxColour& col ) { Ref(col); }
|
||||
wxColour& operator = ( const wxColour& col ) { Ref(col); return *this; }
|
||||
|
||||
|
Reference in New Issue
Block a user