move Ellipsize() to wxControl so it can be easily used by other controls

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

diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp
index 81348d24bd90b57374235c93c2d8234a89d4678b..7e388aee4e3344d53c574aa535a1b2b87f644cc6 100644 (file)
--- 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;