X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c40627e9b3c0a4bbf048d059190d11d711386c83..51725fc0c294f3c3f636710745539cd2041d8d8b:/src/osx/core/colour.cpp diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp index c196590923..7e388aee4e 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; @@ -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;