X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/065e208ec09e3d08d51d9604497f92f53c210f93..09d350c0bc105653e7cd59a8290684a3c4e70d7e:/src/cocoa/colour.mm?ds=sidebyside diff --git a/src/cocoa/colour.mm b/src/cocoa/colour.mm index 598fad8e00..b191ab9a96 100644 --- a/src/cocoa/colour.mm +++ b/src/cocoa/colour.mm @@ -39,6 +39,12 @@ wxColour::wxColour (const wxColour& col) [m_cocoaNSColor retain]; } +wxColour::wxColour( WX_NSColor aColor ) +: m_cocoaNSColor(nil) +{ + Set(aColor); +} + wxColour& wxColour::operator =(const wxColour& col) { m_cocoaNSColor = col.m_cocoaNSColor; @@ -80,3 +86,18 @@ void wxColour::Set (unsigned char r, unsigned char g, unsigned char b) m_blue = b; } +void wxColour::Set( WX_NSColor aColor ) +{ + [aColor retain]; + [m_cocoaNSColor release]; + m_cocoaNSColor = aColor; + + /* Make a temporary color in RGB format and get the values. Note that + unless the color was actually RGB to begin with it's likely that + these will be fairly bogus. Particulary if the color is a pattern. */ + NSColor *rgbColor = [m_cocoaNSColor colorUsingColorSpaceName:NSCalibratedRGBColorSpace]; + m_red = (wxUint8) ([rgbColor redComponent] * 255.0); + m_green = (wxUint8) ([rgbColor greenComponent] * 255.0); + m_blue = (wxUint8) ([rgbColor blueComponent] * 255.0); +} +