X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/dd05139a8023fd3e30476409fafbe04221c6d627..0bbe61b8c18a1795189f0cf73cc61c14a0fb846d:/src/msw/colour.cpp?ds=sidebyside diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp index 44ba6fb378..9a9a13f98c 100644 --- a/src/msw/colour.cpp +++ b/src/msw/colour.cpp @@ -54,7 +54,7 @@ wxBEGIN_PROPERTIES_TABLE(wxColour) wxREADONLY_PROPERTY( Blue, unsigned char, Blue, EMPTY_MACROVALUE , 0 /*flags*/, wxT("Helpstring"), wxT("group")) wxEND_PROPERTIES_TABLE() -wxCONSTRUCTOR_3( wxColour, unsigned char, Red, unsigned char, Green, unsigned char, Blue ) +wxDIRECT_CONSTRUCTOR_3( wxColour, unsigned char, Red, unsigned char, Green, unsigned char, Blue ) wxBEGIN_HANDLERS_TABLE(wxColour) wxEND_HANDLERS_TABLE() @@ -68,20 +68,19 @@ void wxColour::Init() { m_isInit = false; m_pixel = 0; + m_alpha = m_red = m_blue = m_green = 0; } -wxColour::~wxColour() -{ -} - -void wxColour::InitWith(unsigned char r, unsigned char g, unsigned char b) +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; m_pixel = PALETTERGB(m_red, m_green, m_blue); }