use wxColourDatabase::Find() instead of deprecated FindColour(); some minor code cleanup
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24228 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
parent
f9ebac93e7
commit
f75aecd00f
@ -1,5 +1,5 @@
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
// Name: colour.h
|
||||
// Name: wx/msw/colour.h
|
||||
// Purpose: wxColour class
|
||||
// Author: Julian Smart
|
||||
// Modified by:
|
||||
@ -13,82 +13,99 @@
|
||||
#define _WX_COLOUR_H_
|
||||
|
||||
#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
|
||||
#pragma interface "colour.h"
|
||||
#pragma interface "colour.h"
|
||||
#endif
|
||||
|
||||
#include "wx/object.h"
|
||||
|
||||
// ----------------------------------------------------------------------------
|
||||
// Colour
|
||||
class WXDLLEXPORT wxColour: public wxObject
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
class WXDLLEXPORT wxColour : public wxObject
|
||||
{
|
||||
public:
|
||||
// ctors
|
||||
// constructors
|
||||
// ------------
|
||||
|
||||
// default
|
||||
wxColour();
|
||||
// from RGB
|
||||
wxColour( unsigned char red, unsigned char green, unsigned char blue );
|
||||
wxColour( unsigned long colRGB ) { Set(colRGB); }
|
||||
wxColour() { Init(); }
|
||||
|
||||
// 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
|
||||
wxColour( const wxString &colourName ) { InitFromName(colourName); }
|
||||
wxColour( const wxChar *colourName ) { InitFromName(colourName); }
|
||||
wxColour(const wxString &colourName) { InitFromName(colourName); }
|
||||
wxColour(const wxChar *colourName) { InitFromName(colourName); }
|
||||
|
||||
|
||||
// copy ctors and assignment operators
|
||||
wxColour( const wxColour& col );
|
||||
wxColour& operator = ( const wxColour& col );
|
||||
wxColour(const wxColour& col);
|
||||
wxColour& operator=( const wxColour& col);
|
||||
|
||||
// dtor
|
||||
~wxColour();
|
||||
~wxColour();
|
||||
|
||||
// to have the matching Create also for this class
|
||||
void Create( unsigned char red, unsigned char green, unsigned char blue )
|
||||
{ Set( red , green , blue ) ; }
|
||||
|
||||
// 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));
|
||||
}
|
||||
// other methods
|
||||
// -------------
|
||||
|
||||
// accessors
|
||||
bool Ok() const {return m_isInit; }
|
||||
// to have the matching Create also for this class
|
||||
void Create( unsigned char red, unsigned char green, unsigned char blue )
|
||||
{ Set(red, green, blue); }
|
||||
|
||||
unsigned char Red() const { return m_red; }
|
||||
unsigned char Green() const { return m_green; }
|
||||
unsigned char Blue() const { return m_blue; }
|
||||
// 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));
|
||||
}
|
||||
|
||||
// comparison
|
||||
bool operator==(const wxColour& colour) const
|
||||
{
|
||||
return m_isInit == colour.m_isInit &&
|
||||
m_red == colour.m_red &&
|
||||
m_green == colour.m_green &&
|
||||
m_blue == colour.m_blue;
|
||||
}
|
||||
// accessors
|
||||
// ---------
|
||||
|
||||
bool operator != (const wxColour& colour) const { return !(*this == colour); }
|
||||
bool Ok() const {return m_isInit; }
|
||||
|
||||
WXCOLORREF GetPixel() const { return m_pixel; };
|
||||
unsigned char Red() const { return m_red; }
|
||||
unsigned char Green() const { return m_green; }
|
||||
unsigned char Blue() const { return m_blue; }
|
||||
|
||||
// comparison
|
||||
bool operator==(const wxColour& colour) const
|
||||
{
|
||||
return m_isInit == colour.m_isInit &&
|
||||
m_red == colour.m_red &&
|
||||
m_green == colour.m_green &&
|
||||
m_blue == colour.m_blue;
|
||||
}
|
||||
|
||||
bool operator != (const wxColour& colour) const { return !(*this == colour); }
|
||||
|
||||
WXCOLORREF GetPixel() const { return m_pixel; };
|
||||
|
||||
public:
|
||||
WXCOLORREF m_pixel;
|
||||
WXCOLORREF m_pixel;
|
||||
|
||||
private:
|
||||
bool m_isInit;
|
||||
unsigned char m_red;
|
||||
unsigned char m_blue;
|
||||
unsigned char m_green;
|
||||
bool m_isInit;
|
||||
unsigned char m_red;
|
||||
unsigned char m_blue;
|
||||
unsigned char m_green;
|
||||
|
||||
// helper func
|
||||
void InitFromName(const wxString& colourName);
|
||||
// ctors helpers
|
||||
void Init();
|
||||
void InitFromName(const wxString& colourName);
|
||||
|
||||
private:
|
||||
DECLARE_DYNAMIC_CLASS(wxColour)
|
||||
DECLARE_DYNAMIC_CLASS(wxColour)
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@ -70,59 +70,44 @@ IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
|
||||
|
||||
// Colour
|
||||
|
||||
wxColour::wxColour ()
|
||||
void wxColour::Init()
|
||||
{
|
||||
m_isInit = FALSE;
|
||||
m_pixel = 0;
|
||||
m_red = m_blue = m_green = 0;
|
||||
}
|
||||
|
||||
wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
|
||||
{
|
||||
m_red = r;
|
||||
m_green = g;
|
||||
m_blue = b;
|
||||
m_isInit = TRUE;
|
||||
m_pixel = PALETTERGB (m_red, m_green, m_blue);
|
||||
m_isInit = FALSE;
|
||||
m_pixel = 0;
|
||||
m_red =
|
||||
m_blue =
|
||||
m_green = 0;
|
||||
}
|
||||
|
||||
wxColour::wxColour (const wxColour& col)
|
||||
{
|
||||
m_red = col.m_red;
|
||||
m_green = col.m_green;
|
||||
m_blue = col.m_blue;
|
||||
m_isInit = col.m_isInit;
|
||||
m_pixel = col.m_pixel;
|
||||
*this = col;
|
||||
}
|
||||
|
||||
wxColour& wxColour::operator =(const wxColour& col)
|
||||
wxColour& wxColour::operator=(const wxColour& col)
|
||||
{
|
||||
m_red = col.m_red;
|
||||
m_green = col.m_green;
|
||||
m_blue = col.m_blue;
|
||||
m_isInit = col.m_isInit;
|
||||
m_pixel = col.m_pixel;
|
||||
return *this;
|
||||
m_red = col.m_red;
|
||||
m_green = col.m_green;
|
||||
m_blue = col.m_blue;
|
||||
m_isInit = col.m_isInit;
|
||||
m_pixel = col.m_pixel;
|
||||
return *this;
|
||||
}
|
||||
|
||||
void wxColour::InitFromName(const wxString& col)
|
||||
void wxColour::InitFromName(const wxString& name)
|
||||
{
|
||||
wxColour *the_colour = wxTheColourDatabase->FindColour (col);
|
||||
if (the_colour)
|
||||
if ( wxTheColourDatabase )
|
||||
{
|
||||
m_red = the_colour->Red ();
|
||||
m_green = the_colour->Green ();
|
||||
m_blue = the_colour->Blue ();
|
||||
m_isInit = TRUE;
|
||||
wxColour col = wxTheColourDatabase->Find(name);
|
||||
if ( col.Ok() )
|
||||
{
|
||||
*this = col;
|
||||
return;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
m_red = 0;
|
||||
m_green = 0;
|
||||
m_blue = 0;
|
||||
m_isInit = FALSE;
|
||||
}
|
||||
m_pixel = PALETTERGB (m_red, m_green, m_blue);
|
||||
|
||||
// leave invalid
|
||||
Init();
|
||||
}
|
||||
|
||||
wxColour::~wxColour()
|
||||
@ -131,9 +116,10 @@ wxColour::~wxColour()
|
||||
|
||||
void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
|
||||
{
|
||||
m_red = r;
|
||||
m_green = g;
|
||||
m_blue = b;
|
||||
m_isInit = TRUE;
|
||||
m_pixel = PALETTERGB (m_red, m_green, m_blue);
|
||||
m_red = r;
|
||||
m_green = g;
|
||||
m_blue = b;
|
||||
m_isInit = TRUE;
|
||||
m_pixel = PALETTERGB (m_red, m_green, m_blue);
|
||||
}
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user