X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/17d65207577120738396979bf7931fc5e11ba2cd..94734b4e51431d4d4d5bccaf011b28e82515091e:/include/wx/osx/core/colour.h diff --git a/include/wx/osx/core/colour.h b/include/wx/osx/core/colour.h index c24aedc939..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: @@ -30,33 +30,37 @@ public: // default copy ctor and dtor are ok // accessors - virtual bool IsOk() const { return m_cgColour; } + virtual bool IsOk() const { return m_cgColour != NULL; } - ChannelType Red() const { return m_red; } - ChannelType Green() const { return m_green; } - ChannelType Blue() const { return m_blue; } - ChannelType Alpha() const { return m_alpha; } + virtual WXDLLIMPEXP_INLINE_CORE ChannelType Red() const { return m_red; } + virtual WXDLLIMPEXP_INLINE_CORE ChannelType Green() const { return m_green; } + virtual WXDLLIMPEXP_INLINE_CORE ChannelType Blue() const { return m_blue; } + virtual WXDLLIMPEXP_INLINE_CORE ChannelType Alpha() const { return m_alpha; } // comparison bool operator == (const wxColour& colour) const; 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_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 +#if wxOSX_USE_COCOA + wxColour(WX_NSColor color); + WX_NSColor OSXGetNSColor() const; #endif wxColour& operator=(CGColorRef col); wxColour& operator=(const wxColour& col); @@ -64,10 +68,11 @@ 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 ); + void InitFromComponents(const CGFloat* components, size_t numComponents ); private: wxCFRef m_cgColour;