X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f8855e47254a28f5141524b3aaaac03c2944e997..6a4cbac17af82fdf6b8220b309da74b735d616fb:/src/mac/carbon/colour.cpp?ds=sidebyside diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp index 864bd6f749..d752b70530 100644 --- a/src/mac/carbon/colour.cpp +++ b/src/mac/carbon/colour.cpp @@ -11,14 +11,21 @@ #include "wx/wxprec.h" -#include "wx/gdicmn.h" #include "wx/colour.h" +#ifndef WX_PRECOMP + #include "wx/gdicmn.h" +#endif + #include "wx/mac/private.h" IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject) -static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green ); +wxColour::wxColour(const RGBColor& col) +{ + FromRGBColor((WXCOLORREF *)&col); +} + static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green ) { RGBColor* col = (RGBColor*) color; @@ -37,37 +44,22 @@ void wxColour::Init() wxComposeRGBColor( &m_pixel, m_red, m_blue, m_green ); } -void wxColour::InitFromName(const wxString& name) -{ - if ( wxTheColourDatabase ) - { - wxColour col = wxTheColourDatabase->Find( name ); - if ( col.Ok() ) - { - *this = col; - return; - } - } - - // leave invalid - Init(); -} - wxColour::~wxColour () { } -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) { m_red = r; m_green = g; m_blue = b; + m_alpha = a ; m_isInit = true; wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ); } -void wxColour::Set( const WXCOLORREF* color ) +void wxColour::FromRGBColor( WXCOLORREF* color ) { RGBColor* col = (RGBColor*) color; memcpy( &m_pixel, color, 6 ); @@ -75,3 +67,15 @@ void wxColour::Set( const WXCOLORREF* color ) m_blue = col->blue >> 8; m_green = col->green >> 8; } + +wxColour& wxColour::operator=(const RGBColor& col) +{ + FromRGBColor((WXCOLORREF *)&col); + return *this; +} + +bool wxColour::IsOk() const +{ + return m_isInit; +} +