compilation fix (remove default ctor already implemented by DEFINE_STD_WXCOLOUR_CONSTRUCTORS); make copy ctor inline and remove empty dtor
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@51017 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -23,11 +23,12 @@ public:
|
|||||||
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
|
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
|
||||||
|
|
||||||
// copy ctors and assignment operators
|
// copy ctors and assignment operators
|
||||||
wxColour(const wxColour& col);
|
wxColour(const wxColour& col)
|
||||||
wxColour& operator=(const wxColour& col);
|
{
|
||||||
|
*this = col;
|
||||||
|
}
|
||||||
|
|
||||||
// dtor
|
wxColour& operator=(const wxColour& col);
|
||||||
virtual ~wxColour();
|
|
||||||
|
|
||||||
// accessors
|
// accessors
|
||||||
virtual bool IsOk() const { return m_isInit; }
|
virtual bool IsOk() const { return m_isInit; }
|
||||||
|
@@ -35,16 +35,6 @@ void wxColour::Init()
|
|||||||
m_isInit = false;
|
m_isInit = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxColour::wxColour()
|
|
||||||
{
|
|
||||||
Init();
|
|
||||||
}
|
|
||||||
|
|
||||||
wxColour::wxColour(const wxColour& col)
|
|
||||||
{
|
|
||||||
*this = col;
|
|
||||||
}
|
|
||||||
|
|
||||||
wxColour& wxColour::operator=(const wxColour& col)
|
wxColour& wxColour::operator=(const wxColour& col)
|
||||||
{
|
{
|
||||||
m_red = col.m_red;
|
m_red = col.m_red;
|
||||||
@@ -55,18 +45,3 @@ wxColour& wxColour::operator=(const wxColour& col)
|
|||||||
return *this;
|
return *this;
|
||||||
}
|
}
|
||||||
|
|
||||||
wxColour::~wxColour()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
void wxColour::InitRGBA(unsigned char r,
|
|
||||||
unsigned char g,
|
|
||||||
unsigned char b,
|
|
||||||
unsigned char a)
|
|
||||||
{
|
|
||||||
m_red = r;
|
|
||||||
m_green = g;
|
|
||||||
m_blue = b;
|
|
||||||
m_alpha = a;
|
|
||||||
m_isInit = true;
|
|
||||||
}
|
|
||||||
|
Reference in New Issue
Block a user