X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f7d32bb716ba2191d52cbf3ada5b3ff72103dfea..08670ea85abf4b4946a9ce64971b591d7b1ee30b:/src/osx/core/colour.cpp diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp index 39a4c09661..c30e8bdc6f 100644 --- a/src/osx/core/colour.cpp +++ b/src/osx/core/colour.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/osx/carbon/colour.cpp +// Name: src/osx/core/colour.cpp // Purpose: wxColour class // Author: Stefan Csomor // Modified by: @@ -19,8 +19,6 @@ #include "wx/osx/private.h" -IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) - #if wxOSX_USE_COCOA_OR_CARBON wxColour::wxColour(const RGBColor& col) { @@ -111,7 +109,7 @@ void wxColour::InitCGColorRef( CGColorRef col ) { m_cgColour.reset( col ); size_t noComp = CGColorGetNumberOfComponents( col ); - + const CGFloat *components = NULL; if ( noComp >= 1 && noComp <= 4 ) { @@ -130,7 +128,7 @@ void wxColour::InitFromComponents(const CGFloat* components, size_t numComponent m_red = m_green = m_blue = 0; return; } - + if ( numComponents >= 3 ) { m_red = (int)(components[0]*255+0.5);