X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/276ee5334d28762520abad9653d51f8e81812ebc..7a7697aafe33e958d60547c50b30d50fe3d3a454:/src/mac/carbon/colour.cpp

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index f472cbff8f..225e31e179 100644
--- a/src/mac/carbon/colour.cpp
+++ b/src/mac/carbon/colour.cpp
@@ -56,7 +56,7 @@ wxColour& wxColour::operator=(CGColorRef col)
 
 bool wxColour::IsOk() const 
 {
-    return m_cgColour.get() != NULL; 
+    return m_cgColour; 
 }
 
 void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelType a)
@@ -67,7 +67,7 @@ void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelTyp
     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
@@ -86,7 +86,7 @@ void wxColour::InitRGBColor( const RGBColor& col )
     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