Finally corrected drawing of wxListCtrl selection rect for GTK+

[wxWidgets.git] / src / osx / core / colour.cpp

diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp
index c1965909233739874b08889f17ef983d37176fb2..d8746577b0e2518a51a07b03c813e1cd6dabddb5 100644 (file)
--- 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:
 // Purpose:     wxColour class
 // Author:      Stefan Csomor
 // Modified by:


@@ -21,7 +21,7 @@
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 

-#if wxOSX_USE_CARBON
+#if wxOSX_USE_COCOA_OR_CARBON

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


@@ -33,7 +33,7 @@ wxColour::wxColour(CGColorRef col)
     InitCGColorRef(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;
 void wxColour::GetRGBColor( RGBColor *col ) const
 {
     col->red = (m_red << 8) + m_red;


@@ -73,7 +73,7 @@ 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
 
     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
         col = CGColorCreateGenericRGB( (CGFloat)(r / 255.0), (CGFloat) (g / 255.0), (CGFloat) (b / 255.0), (CGFloat) (a / 255.0) );
     else
 #endif


@@ -84,7 +84,7 @@ void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelTyp
     m_cgColour.reset( col );
 }
 
     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;
 void wxColour::InitRGBColor( const RGBColor& col )
 {
     m_red = col.red >> 8;


@@ -93,7 +93,7 @@ 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
     m_alpha = wxALPHA_OPAQUE;
     CGColorRef cfcol;
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5

-    if ( CGColorCreateGenericRGB )
+    if ( CGColorCreateGenericRGB != NULL )

         cfcol = CGColorCreateGenericRGB((CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0),  
                                         (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 );
     else
         cfcol = CGColorCreateGenericRGB((CGFloat)(col.red / 65535.0), (CGFloat)(col.green / 65535.0),  
                                         (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 );
     else