X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f5426f09c68bf42e58e3932e2bcb0322caa6b41..59576592b815f62ca78c04851c0b3fd7fa0eb9bd:/src/generic/colour.cpp diff --git a/src/generic/colour.cpp b/src/generic/colour.cpp index e51a7e3938..f16c134514 100644 --- a/src/generic/colour.cpp +++ b/src/generic/colour.cpp @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -22,8 +21,6 @@ #include "wx/gdicmn.h" #endif -IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) - // Colour void wxColour::Init() @@ -35,14 +32,16 @@ void wxColour::Init() m_isInit = false; } -wxColour::wxColour() -{ - Init(); -} - -wxColour::wxColour(const wxColour& col) +void wxColour::InitRGBA(unsigned char r, + unsigned char g, + unsigned char b, + unsigned char a) { - *this = col; + m_red = r; + m_green = g; + m_blue = b; + m_alpha = a; + m_isInit = true; } wxColour& wxColour::operator=(const wxColour& col) @@ -55,16 +54,3 @@ wxColour& wxColour::operator=(const wxColour& col) return *this; } -wxColour::~wxColour() -{ -} - -void wxColour::InitWith(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; -}