X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/289532452089421ddadbd4726a8469511a19ab76..93be446f3a957d9347ebb8b65f2a124c76f4bf68:/src/osx/core/colour.cpp?ds=inline diff --git a/src/osx/core/colour.cpp b/src/osx/core/colour.cpp index 92bddd08be..cb148d9db4 100644 --- a/src/osx/core/colour.cpp +++ b/src/osx/core/colour.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: src/osx/carbon/colour.cpp +// Name: src/osx/core/colour.cpp // Purpose: wxColour class // Author: Stefan Csomor // Modified by: @@ -79,6 +79,7 @@ void wxColour::InitRGBA (ChannelType r, ChannelType g, ChannelType b, ChannelTyp CGFloat components[4] = { (CGFloat)(r / 255.0), (CGFloat) (g / 255.0), (CGFloat) (b / 255.0), (CGFloat) (a / 255.0) } ; col = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ; } + wxASSERT_MSG(col != NULL, "Invalid CoreGraphics Color"); m_cgColour.reset( col ); } @@ -101,12 +102,14 @@ void wxColour::InitRGBColor( const RGBColor& col ) (CGFloat)(col.blue / 65535.0), (CGFloat) 1.0 } ; cfcol = CGColorCreate( wxMacGetGenericRGBColorSpace() , components ) ; } + wxASSERT_MSG(cfcol != NULL, "Invalid CoreGraphics Color"); m_cgColour.reset( cfcol ); } #endif void wxColour::InitCGColorRef( CGColorRef col ) { + wxASSERT_MSG(col != NULL, "Invalid CoreGraphics Color"); m_cgColour.reset( col ); size_t noComp = CGColorGetNumberOfComponents( col );