X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7fc77f30f423b59b826103bd28c57a437c1553ab..d4a724d4075418ccaea166925c33242a338249c7:/src/cocoa/colour.mm?ds=sidebyside diff --git a/src/cocoa/colour.mm b/src/cocoa/colour.mm index c6b73d70f1..94c1f4cc86 100644 --- a/src/cocoa/colour.mm +++ b/src/cocoa/colour.mm @@ -1,27 +1,34 @@ ///////////////////////////////////////////////////////////////////////////// -// 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: wxWindows licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// -#import +#include "wx/wxprec.h" -#include "wx/gdicmn.h" #include "wx/colour.h" +#ifndef WX_PRECOMP + #include "wx/gdicmn.h" +#endif //WX_PRECOMP + #include "wx/cocoa/autorelease.h" +#import + IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) -wxColour::wxColour () -: m_cocoaNSColor(NULL) +void wxColour::Init() { - m_red = m_blue = m_green = 0; + m_cocoaNSColor = NULL; + m_red = + m_blue = + m_green = 0; } wxColour::wxColour (const wxColour& col) @@ -33,6 +40,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; @@ -43,29 +56,12 @@ wxColour& wxColour::operator =(const wxColour& col) return *this; } -void wxColour::InitFromName(const wxString& col) -{ - wxColour *the_colour = wxTheColourDatabase->FindColour (col); - if (the_colour) - { - *this = *the_colour; - } - else - { - [m_cocoaNSColor release]; - m_cocoaNSColor = NULL; - m_red = 0; - m_green = 0; - m_blue = 0; - } -} - wxColour::~wxColour () { [m_cocoaNSColor release]; } -void wxColour::Set (unsigned char r, unsigned char g, unsigned char b) +void wxColour::InitWith (unsigned char r, unsigned char g, unsigned char b) { wxAutoNSAutoreleasePool pool; [m_cocoaNSColor release]; @@ -75,3 +71,17 @@ 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); +}