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:
Vadim Zeitlin 2008-01-05 00:04:34 +00:00
parent 728cf0ad42
commit 001828ed69
2 changed files with 5 additions and 29 deletions

View File

@ -23,11 +23,12 @@ public:
DEFINE_STD_WXCOLOUR_CONSTRUCTORS
// copy ctors and assignment operators
wxColour(const wxColour& col);
wxColour& operator=(const wxColour& col);
wxColour(const wxColour& col)
{
*this = col;
}
// dtor
virtual ~wxColour();
wxColour& operator=(const wxColour& col);
// accessors
virtual bool IsOk() const { return m_isInit; }

View File

@ -35,16 +35,6 @@ void wxColour::Init()
m_isInit = false;
}
wxColour::wxColour()
{
Init();
}
wxColour::wxColour(const wxColour& col)
{
*this = col;
}
wxColour& wxColour::operator=(const wxColour& col)
{
m_red = col.m_red;
@ -55,18 +45,3 @@ wxColour& wxColour::operator=(const wxColour& col)
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;
}