Performance optimization

[wxWidgets.git] / src / mac / carbon / colour.cpp

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index f472cbff8f554143b9d5b7d30ad67342af94b45a..4d91726650dd40ab9e8a7005eece2e38710899b7 100644 (file)
--- a/src/mac/carbon/colour.cpp
+++ b/src/mac/carbon/colour.cpp
@@ -38,10 +38,6 @@ void wxColour::GetRGBColor( RGBColor *col ) const
     col->green = (m_green << 8) + m_green;
 }
 
     col->green = (m_green << 8) + m_green;
 }
 

-wxColour::~wxColour ()
-{
-}
-

 wxColour& wxColour::operator=(const RGBColor& col)
 {
     InitRGBColor(col);
 wxColour& wxColour::operator=(const RGBColor& col)
 {
     InitRGBColor(col);


@@ -54,9 +50,14 @@ wxColour& wxColour::operator=(CGColorRef col)
     return *this;
 }
 
     return *this;
 }
 

-bool wxColour::IsOk() const 
+wxColour& wxColour::operator=(const wxColour& col)

 {
 {

-    return m_cgColour.get() != NULL; 
+    m_red = col.m_red;
+    m_green = col.m_green;
+    m_blue = col.m_blue;
+    m_alpha = col.m_alpha;
+    m_cgColour = col.m_cgColour;
+    return *this;

 }
 
 void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelType a)
 }
 
 void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelType a)


@@ -67,7 +68,7 @@ void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelTyp
     m_alpha = a ;
 
     CGColorRef col = 0 ;
     m_alpha = a ;
 
     CGColorRef col = 0 ;

-#if MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_5
+#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
     if ( CGColorCreateGenericRGB )
         col = CGColorCreateGenericRGB( r / 255.0, g / 255.0, b / 255.0, a / 255.0 );
     else


@@ -86,7 +87,7 @@ void wxColour::InitRGBColor( const RGBColor& col )
     m_green = col.green >> 8;
     m_alpha = wxALPHA_OPAQUE;
     CGColorRef cfcol;
     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 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
     if ( CGColorCreateGenericRGB )
         cfcol = CGColorCreateGenericRGB( col.red / 65535.0, col.green / 65535.0, col.blue / 65535.0, 1.0 );
     else