X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3da12c22f2e9014d7fd2f4fa63255709befe3a95..05e0b047d879cdbfade7f2ab346c0acdf3e29f96:/src/generic/colour.cpp diff --git a/src/generic/colour.cpp b/src/generic/colour.cpp index e9bccfc59f..adc843d195 100644 --- a/src/generic/colour.cpp +++ b/src/generic/colour.cpp @@ -31,36 +31,29 @@ void wxColour::Init() m_red = m_blue = m_green = 0; + m_alpha = wxALPHA_OPAQUE; m_isInit = false; } -wxColour::wxColour() +void wxColour::InitRGBA(unsigned char r, + unsigned char g, + unsigned char b, + unsigned char a) { - Init(); -} - -wxColour::wxColour(const wxColour& col) -{ - *this = col; + m_red = r; + m_green = g; + m_blue = b; + m_alpha = a; + m_isInit = true; } -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_alpha = col.m_alpha; m_isInit = col.m_isInit; return *this; } -wxColour::~wxColour() -{ -} - -void wxColour::InitWith(unsigned char r, unsigned char g, unsigned char b) -{ - m_red = r; - m_green = g; - m_blue = b; - m_isInit = true; -}