X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/19b409860202ab9bdc27dab3d17f388c1a1d9717..880d76dfb12d4e8466df30d641bb25c6f71bd398:/include/wx/osx/core/colour.h diff --git a/include/wx/osx/core/colour.h b/include/wx/osx/core/colour.h index bbc7201222..cefae9a881 100644 --- a/include/wx/osx/core/colour.h +++ b/include/wx/osx/core/colour.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: wx/mac/carbon/colour.h +// Name: wx/osx/core/colour.h // Purpose: wxColour class // Author: Stefan Csomor // Modified by: @@ -42,10 +42,10 @@ public: bool operator != (const wxColour& colour) const { return !(*this == colour); } - CGColorRef GetPixel() const { return m_cgColour; }; + CGColorRef GetPixel() const { return m_cgColour; } - CGColorRef GetCGColor() const { return m_cgColour; }; - CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); }; + CGColorRef GetCGColor() const { return m_cgColour; } + CGColorRef CreateCGColor() const { return wxCFRetain( (CGColorRef)m_cgColour ); } #if wxOSX_USE_COCOA_OR_CARBON void GetRGBColor( RGBColor *col ) const; @@ -60,7 +60,7 @@ public: #endif #if wxOSX_USE_COCOA wxColour(WX_NSColor color); - WX_NSColor OSXGetNSColor(); + WX_NSColor OSXGetNSColor() const; #endif wxColour& operator=(CGColorRef col); wxColour& operator=(const wxColour& col);