X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c40627e9b3c0a4bbf048d059190d11d711386c83..09981ba7981297056da49ceb0eb85d3ac9fc5f6f:/src/osx/core/colour.cpp

diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp
index c196590923..8191379762 100644
--- a/src/osx/core/colour.cpp
+++ b/src/osx/core/colour.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        src/mac/carbon/colour.cpp
+// Name:        src/osx/carbon/colour.cpp
 // Purpose:     wxColour class
 // Author:      Stefan Csomor
 // Modified by:
@@ -21,7 +21,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
-#if wxOSX_USE_CARBON
+#if wxOSX_USE_COCOA_OR_CARBON
 wxColour::wxColour(const RGBColor& col)
 {
     InitRGBColor(col);
@@ -33,7 +33,7 @@ wxColour::wxColour(CGColorRef col)
     InitCGColorRef(col);
 }
 
-#if wxOSX_USE_CARBON
+#if wxOSX_USE_COCOA_OR_CARBON
 void wxColour::GetRGBColor( RGBColor *col ) const
 {
     col->red = (m_red << 8) + m_red;
@@ -73,18 +73,18 @@ void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelTyp
 
     CGColorRef col = 0 ;
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-    if ( CGColorCreateGenericRGB )
+    if ( CGColorCreateGenericRGB != NULL )
         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) } ;    
+        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 );
 }
 
-#if wxOSX_USE_CARBON
+#if wxOSX_USE_COCOA_OR_CARBON
 void wxColour::InitRGBColor( const RGBColor& col )
 {
     m_red = col.red >> 8;
@@ -93,14 +93,14 @@ void wxColour::InitRGBColor( const RGBColor& col )
     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),  
+    if ( CGColorCreateGenericRGB != NULL )
+        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 } ;    
+        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 );