X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/93cf77c076b699e8e0b3b0049bd4f80de15997dd..e96360efd9015260be782e778c8076bb13cb6f5a:/src/stubs/colour.cpp diff --git a/src/stubs/colour.cpp b/src/stubs/colour.cpp index d342d516de..f2c7fe382c 100644 --- a/src/stubs/colour.cpp +++ b/src/stubs/colour.cpp @@ -16,9 +16,7 @@ #include "wx/gdicmn.h" #include "wx/colour.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) -#endif // Colour @@ -65,7 +63,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) @@ -91,29 +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; - } -/* TODO - 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;