X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c4021a7920ab9f41b1553e28f1177b6e39a6d901..c7cbe308f6273245493ee0da52dc80385805cb40:/include/wx/osx/core/colour.h diff --git a/include/wx/osx/core/colour.h b/include/wx/osx/core/colour.h index 1cf694140c..f5357bcb70 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: @@ -57,6 +57,10 @@ public: #if wxOSX_USE_COCOA_OR_CARBON wxColour(const RGBColor& col); wxColour& operator=(const RGBColor& col); +#endif +#if wxOSX_USE_COCOA + wxColour(WX_NSColor color); + WX_NSColor OSXGetNSColor() const; #endif wxColour& operator=(CGColorRef col); wxColour& operator=(const wxColour& col); @@ -68,6 +72,7 @@ protected : void InitRGBColor( const RGBColor& col ); #endif void InitCGColorRef( CGColorRef col ); + void InitFromComponents(const CGFloat* components, size_t numComponents ); private: wxCFRef m_cgColour;