X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aad6765cbd8916ddeb0362b091663138c2e74df3..e795e8b56f213f97745636a017609091746894a0:/src/mac/carbon/colour.cpp diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp index 86487f7a35..7444d03871 100644 --- a/src/mac/carbon/colour.cpp +++ b/src/mac/carbon/colour.cpp @@ -1,24 +1,20 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.cpp +// Name: src/mac/carbon/colour.cpp // Purpose: wxColour class // Author: Stefan Csomor // Modified by: // Created: 1998-01-01 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "colour.h" -#endif +#include "wx/wxprec.h" #include "wx/gdicmn.h" #include "wx/colour.h" -#if !USE_SHARED_LIBRARY IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) -#endif // Colour @@ -54,16 +50,6 @@ wxColour::wxColour (const wxColour& col) memcpy( &m_pixel , &col.m_pixel , 6 ) ; } -wxColour::wxColour (const wxColour* col) -{ - m_red = col->m_red; - m_green = col->m_green; - m_blue = col->m_blue; - m_isInit = col->m_isInit; - - memcpy( &m_pixel , &col->m_pixel , 6 ) ; -} - wxColour& wxColour::operator =(const wxColour& col) { m_red = col.m_red;