X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2692aef43b7e61e259a02f2d2087a96c3f0f5870..5a1e0e91a1ca5ec98b0eeb335cda757d1261ed08:/src/cocoa/colour.mm?ds=sidebyside diff --git a/src/cocoa/colour.mm b/src/cocoa/colour.mm index b191ab9a96..914408e291 100644 --- a/src/cocoa/colour.mm +++ b/src/cocoa/colour.mm @@ -1,21 +1,22 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.mm +// Name: src/cococa/colour.mm // Purpose: wxColour class // Author: David Elliott // Modified by: // Created: 2003/06/17 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" -#ifndef WX_PRECOMP -#endif //WX_PRECOMP -#include "wx/gdicmn.h" #include "wx/colour.h" +#ifndef WX_PRECOMP + #include "wx/gdicmn.h" +#endif //WX_PRECOMP + #include "wx/cocoa/autorelease.h" #import @@ -35,6 +36,7 @@ wxColour::wxColour (const wxColour& col) , m_red(col.m_red) , m_green(col.m_green) , m_blue(col.m_blue) +, m_alpha(col.m_alpha) { [m_cocoaNSColor retain]; } @@ -51,39 +53,28 @@ wxColour& wxColour::operator =(const wxColour& col) m_red = col.m_red; m_green = col.m_green; m_blue = col.m_blue; + m_alpha = col.m_alpha; [m_cocoaNSColor retain]; return *this; } -void wxColour::InitFromName(const wxString& name) -{ - if ( wxTheColourDatabase ) - { - wxColour col = wxTheColourDatabase->Find(name); - if ( col.Ok() ) - { - *this = col; - return; - } - } - - // leave invalid - Init(); -} - wxColour::~wxColour () { [m_cocoaNSColor release]; } -void wxColour::Set (unsigned char r, unsigned char g, unsigned char b) +void wxColour::InitRGBA(unsigned char r, + unsigned char g, + unsigned char b, + unsigned char a) { wxAutoNSAutoreleasePool pool; [m_cocoaNSColor release]; - m_cocoaNSColor = [[NSColor colorWithCalibratedRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:1.0] retain]; + m_cocoaNSColor = [[NSColor colorWithCalibratedRed:r/255.0 green:g/255.0 blue:b/255.0 alpha:a/255.0] retain]; m_red = r; m_green = g; m_blue = b; + m_alpha = a; } void wxColour::Set( WX_NSColor aColor ) @@ -96,8 +87,8 @@ void wxColour::Set( WX_NSColor aColor ) 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_red = (wxUint8) ([rgbColor redComponent] * 255.0); m_green = (wxUint8) ([rgbColor greenComponent] * 255.0); - m_blue = (wxUint8) ([rgbColor blueComponent] * 255.0); + m_blue = (wxUint8) ([rgbColor blueComponent] * 255.0); + m_alpha = (wxUint8) ([rgbColor alphaComponent] * 255.0); } -