X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/76a5e5d21ee1a6230d777ce0209b2df4c6075f0f..4b8dab63399ef6feeb39eb9f7d57c9d0d0c7524f:/src/mac/carbon/colour.cpp?ds=sidebyside diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp index 82fb8a7928..c8b4d91946 100644 --- a/src/mac/carbon/colour.cpp +++ b/src/mac/carbon/colour.cpp @@ -1,128 +1,141 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.cpp +// Name: src/mac/carbon/colour.cpp // Purpose: wxColour class -// Author: AUTHOR +// Author: Stefan Csomor // Modified by: -// Created: ??/??/98 +// Created: 1998-01-01 // RCS-ID: $Id$ -// Copyright: (c) AUTHOR -// Licence: wxWindows licence +// Copyright: (c) Stefan Csomor +// 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) +#ifndef WX_PRECOMP + #include "wx/gdicmn.h" #endif -// Colour - #include "wx/mac/private.h" -static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green ) ; -static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green ) +IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) + +wxColour::wxColour(const RGBColor& col) { - RGBColor* col = (RGBColor*) color ; - col->red = (red << 8) + red; - col->blue = (blue << 8) + blue; - col->green = (green << 8) + green; + InitRGBColor(col); } -wxColour::wxColour () +wxColour::wxColour(CGColorRef col) { - m_isInit = FALSE; - m_red = m_blue = m_green = 0; + InitCGColorRef(col); +} - wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ; +void wxColour::GetRGBColor( RGBColor *col ) const +{ + col->red = (m_red << 8) + m_red; + col->blue = (m_blue << 8) + m_blue; + col->green = (m_green << 8) + m_green; } -wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b) +wxColour& wxColour::operator=(const RGBColor& col) { - m_red = r; - m_green = g; - m_blue = b; - m_isInit = TRUE; + InitRGBColor(col); + return *this; +} - wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ; +wxColour& wxColour::operator=(CGColorRef col) +{ + InitCGColorRef(col); + return *this; } -wxColour::wxColour (const wxColour& col) +wxColour& wxColour::operator=(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 ) ; + m_alpha = col.m_alpha; + m_cgColour = col.m_cgColour; + return *this; } -wxColour::wxColour (const wxColour* col) +void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelType a) { - m_red = col->m_red; - m_green = col->m_green; - m_blue = col->m_blue; - m_isInit = col->m_isInit; + m_red = r; + m_green = g; + m_blue = b; + m_alpha = a ; - memcpy( &m_pixel , &col->m_pixel , 6 ) ; + CGColorRef col = 0 ; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + if ( CGColorCreateGenericRGB ) + col = CGColorCreateGenericRGB( (CGFloat)(r / 255.0), (CGFloat) (g / 255.0), (CGFloat) (b / 255.0), (CGFloat) (a / 255.0) ); + else +#endif + { + CGFloat components[4] = { (CGFloat)(r / 255.0), (CGFloat) (g / 255.0), (CGFloat) (b / 255.0), (CGFloat) (a / 255.0) } ; + col = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ; + } + m_cgColour.reset( col ); } -wxColour& wxColour::operator =(const wxColour& col) +void wxColour::InitRGBColor( const RGBColor& 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 ) ; - - return *this; + m_red = col.red >> 8; + m_blue = col.blue >> 8; + m_green = col.green >> 8; + m_alpha = wxALPHA_OPAQUE; + CGColorRef cfcol; +#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 + if ( CGColorCreateGenericRGB ) + cfcol = CGColorCreateGenericRGB((CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0), + (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 ); + else +#endif + { + CGFloat components[4] = { (CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0), + (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 } ; + cfcol = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ; + } + m_cgColour.reset( cfcol ); } -void wxColour::InitFromName(const wxString& col) +void wxColour::InitCGColorRef( CGColorRef col ) { - wxColour *the_colour = wxTheColourDatabase->FindColour (col); - if (the_colour) + m_cgColour.reset( col ); + size_t noComp = CGColorGetNumberOfComponents( col ); + if ( noComp >= 1 && noComp <= 4 ) { - m_red = the_colour->Red (); - m_green = the_colour->Green (); - m_blue = the_colour->Blue (); - m_isInit = TRUE; + // TODO verify whether we really are on a RGB color space + m_alpha = wxALPHA_OPAQUE; + const CGFloat *components = CGColorGetComponents( col ); + if ( noComp >= 3 ) + { + m_red = (int)(components[0]*255+0.5); + m_green = (int)(components[1]*255+0.5); + m_blue = (int)(components[2]*255+0.5); + if ( noComp == 4 ) + m_alpha = (int)(components[3]*255+0.5); + } + else + { + m_red = (int)(components[0]*255+0.5); + m_green = (int)(components[0]*255+0.5); + m_blue = (int)(components[0]*255+0.5); + } } else { - m_red = 0; - m_green = 0; - m_blue = 0; - m_isInit = FALSE; + m_alpha = wxALPHA_OPAQUE; + m_red = m_green = m_blue = 0; } - - wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ; } -wxColour::~wxColour () +bool wxColour::operator == (const wxColour& colour) const { + return ( (IsOk() == colour.IsOk()) && (!IsOk() || + CGColorEqualToColor( m_cgColour, colour.m_cgColour ) ) ); } -void wxColour::Set (unsigned char r, unsigned char g, unsigned char b) -{ - m_red = r; - m_green = g; - m_blue = b; - m_isInit = TRUE; - - wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ; -} -void wxColour::Set( const WXCOLORREF* color ) -{ - RGBColor* col = (RGBColor*) color ; - memcpy( &m_pixel , color , 6 ) ; - m_red = col->red>>8 ; - m_blue = col->blue>>8 ; - m_green = col->green>>8 ; -} \ No newline at end of file