X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..3570a1c6e596c358848c77c5b37d724097340ce8:/src/mac/carbon/colour.cpp?ds=sidebyside

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index 1a065ff8b6..4d91726650 100644
--- a/src/mac/carbon/colour.cpp
+++ b/src/mac/carbon/colour.cpp
@@ -1,116 +1,131 @@
 /////////////////////////////////////////////////////////////////////////////
-// 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:       wxWidgets 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)
+#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);
 }
 
-void wxColour::Init()
+wxColour::wxColour(CGColorRef col)
 {
-    m_isInit = false;
-    m_red =
-    m_blue =
-    m_green = 0;
-
-    wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
+    InitCGColorRef(col);
 }
 
-wxColour::wxColour (const wxColour& col)
-    : wxObject()
+void wxColour::GetRGBColor( RGBColor *col ) const
 {
-    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 ) ;
+    col->red = (m_red << 8) + m_red;
+    col->blue = (m_blue << 8) + m_blue;
+    col->green = (m_green << 8) + m_green;
 }
 
-wxColour::wxColour (const wxColour* col)
+wxColour& wxColour::operator=(const RGBColor& col)
 {
-    m_red = col->m_red;
-    m_green = col->m_green;
-    m_blue = col->m_blue;
-    m_isInit = col->m_isInit;
+    InitRGBColor(col);
+    return *this;
+}
 
-    memcpy( &m_pixel , &col->m_pixel , 6 ) ;
+wxColour& wxColour::operator=(CGColorRef col)
+{
+    InitCGColorRef(col);
+    return *this;
 }
 
-wxColour& wxColour::operator =(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;
 }
 
-void wxColour::InitFromName(const wxString& name)
+void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelType a)
 {
-    if ( wxTheColourDatabase )
+    m_red = r;
+    m_green = g;
+    m_blue = b;
+    m_alpha = a ;
+
+    CGColorRef col = 0 ;
+#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
+    if ( CGColorCreateGenericRGB )
+        col = CGColorCreateGenericRGB( r / 255.0, g / 255.0, b / 255.0, a / 255.0 );
+    else
+#endif
     {
-        wxColour col = wxTheColourDatabase->Find(name);
-        if ( col.Ok() )
-        {
-            *this = col;
-            return;
-        }
+        CGFloat components[4] = { r / 255.0, g / 255.0, b / 255.0, a / 255.0 } ;    
+        col = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
     }
-
-    // leave invalid
-    Init();
+    m_cgColour.reset( col );
 }
 
-wxColour::~wxColour ()
+void wxColour::InitRGBColor( const RGBColor& col )
 {
+    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( col.red / 65535.0, col.green / 65535.0, col.blue / 65535.0, 1.0 );
+    else
+#endif
+    {
+        CGFloat components[4] = { col.red / 65535.0, col.green / 65535.0, col.blue / 65535.0, 1.0 } ;    
+        cfcol = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ;
+    }
+    m_cgColour.reset( cfcol );
 }
 
-void wxColour::Set (unsigned char r, unsigned char g, unsigned char b)
+void wxColour::InitCGColorRef( CGColorRef col )
 {
-    m_red = r;
-    m_green = g;
-    m_blue = b;
-    m_isInit = true;
-
-    wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
+    m_cgColour.reset( col );
+    size_t noComp = CGColorGetNumberOfComponents( col );
+    if ( noComp >=3 && noComp <= 4 )
+    {
+        // TODO verify whether we really are on a RGB color space
+        const CGFloat *components = CGColorGetComponents( col );
+        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_alpha = wxALPHA_OPAQUE;
+    }
+    else
+    {
+        m_alpha = wxALPHA_OPAQUE;
+        m_red = m_green = m_blue = 0;
+    }
 }
 
-void wxColour::Set( const WXCOLORREF* color )
+bool wxColour::operator == (const wxColour& colour) const
 {
-    RGBColor* col = (RGBColor*) color ;
-    memcpy( &m_pixel , color , 6 ) ;
-    m_red = col->red>>8 ;
-    m_blue = col->blue>>8 ;
-    m_green = col->green>>8 ;
+    return ( (IsOk() == colour.IsOk()) && (!IsOk() ||
+                                           CGColorEqualToColor( m_cgColour, colour.m_cgColour ) ) );
 }
+
+