X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/68dda78574c865bd5bec89fbf4c8c3607b0912db..cee14ca0c5e9d4d525172f44bab921323becb962:/src/msw/colour.cpp diff --git a/src/msw/colour.cpp b/src/msw/colour.cpp index 3c3fe85864..bac04c76cd 100644 --- a/src/msw/colour.cpp +++ b/src/msw/colour.cpp @@ -21,13 +21,12 @@ #endif #include "wx/gdicmn.h" +#include "wx/msw/private.h" #include #include -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) -#endif // Colour @@ -38,7 +37,7 @@ wxColour::wxColour () 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; @@ -90,27 +89,6 @@ 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;