diff --git a/include/wx/generic/colour.h b/include/wx/generic/colour.h index 24fefe2f6b..ca1ebf05b9 100644 --- a/include/wx/generic/colour.h +++ b/include/wx/generic/colour.h @@ -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; } diff --git a/src/generic/colour.cpp b/src/generic/colour.cpp index 6cda3d1e84..70600717d7 100644 --- a/src/generic/colour.cpp +++ b/src/generic/colour.cpp @@ -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; -}