X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2bda0e173844e8e0f8acf4e8ad8b5c26e5c6fe5d..4b2424bcadbc87babd3367d243b957e49333eeae:/src/msw/colour.cpp?ds=sidebyside diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp index bfc43c65a9..bac04c76cd 100644 --- a/src/msw/colour.cpp +++ b/src/msw/colour.cpp @@ -21,24 +21,23 @@ #endif #include "wx/gdicmn.h" +#include "wx/msw/private.h" #include #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) -#endif // Colour -wxColour::wxColour (void) +wxColour::wxColour () { m_isInit = FALSE; m_pixel = 0; m_red = m_blue = m_green = 0; } -wxColour::wxColour (const unsigned char r, const unsigned char g, const unsigned char b) +wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b) { m_red = r; m_green = g; @@ -66,7 +65,7 @@ wxColour& wxColour::operator =(const wxColour& col) return *this; } -wxColour::wxColour (const wxString& col) +void wxColour::InitFromName(const wxString& col) { wxColour *the_colour = wxTheColourDatabase->FindColour (col); if (the_colour) @@ -86,31 +85,10 @@ wxColour::wxColour (const wxString& col) m_pixel = PALETTERGB (m_red, m_green, m_blue); } -wxColour::~wxColour (void) +wxColour::~wxColour() { } -wxColour& wxColour::operator = (const wxString& col) -{ - wxColour *the_colour = wxTheColourDatabase->FindColour (col); - if (the_colour) - { - m_red = the_colour->Red (); - m_green = the_colour->Green (); - m_blue = the_colour->Blue (); - m_isInit = TRUE; - } - else - { - m_red = 0; - m_green = 0; - m_blue = 0; - m_isInit = FALSE; - } - m_pixel = PALETTERGB (m_red, m_green, m_blue); - return (*this); -} - void wxColour::Set (unsigned char r, unsigned char g, unsigned char b) { m_red = r;