From e630b0f0249c80d96c59c6f05bf1cfb24da4885e Mon Sep 17 00:00:00 2001
From: Stefan Csomor <csomor@advancedconcepts.ch>
Date: Sat, 6 Sep 2008 16:32:00 +0000
Subject: [PATCH] RGBColor is part of ApplicationServices also under Cocoa

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55499 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 include/wx/osx/core/colour.h | 6 +++---
 src/osx/core/colour.cpp      | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/wx/osx/core/colour.h b/include/wx/osx/core/colour.h
index c24aedc939..582d36ec3e 100644
--- a/include/wx/osx/core/colour.h
+++ b/include/wx/osx/core/colour.h
@@ -47,14 +47,14 @@ public:
     CGColorRef GetCGColor() const { return m_cgColour; };
     CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); };
 
-#if wxOSX_USE_CARBON
+#if wxOSX_USE_COCOA_OR_CARBON
     void GetRGBColor( RGBColor *col ) const;
 #endif
 
     // Mac-specific ctor and assignment operator from the native colour
     // assumes ownership of CGColorRef
     wxColour( CGColorRef col );
-#if wxOSX_USE_CARBON
+#if wxOSX_USE_COCOA_OR_CARBON
     wxColour(const RGBColor& col);
     wxColour& operator=(const RGBColor& col);
 #endif
@@ -64,7 +64,7 @@ public:
 protected :
     virtual void
     InitRGBA(ChannelType r, ChannelType g, ChannelType b, ChannelType a);
-#if wxOSX_USE_CARBON
+#if wxOSX_USE_COCOA_OR_CARBON
     void InitRGBColor( const RGBColor& col );
 #endif
     void InitCGColorRef( CGColorRef col );
diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp
index 81348d24bd..7e388aee4e 100644
--- a/src/osx/core/colour.cpp
+++ b/src/osx/core/colour.cpp
@@ -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;
@@ -84,7 +84,7 @@ void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelTyp
     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;
-- 
2.47.2