X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/40989e46b86777dd211faeb3e5d2366cdcc6d8cd..f53c8638250a66a3721eff864fbc89ab6e9dfd35:/src/mac/carbon/colour.cpp

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index 081bc24957..4af845a7e4 100644
--- a/src/mac/carbon/colour.cpp
+++ b/src/mac/carbon/colour.cpp
@@ -13,13 +13,19 @@
 
 #include "wx/colour.h"
 
-#include "wx/gdicmn.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;
@@ -42,21 +48,35 @@ wxColour::~wxColour ()
 {
 }
 
-void wxColour::InitWith (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 );
     m_red = col->red >> 8;
     m_blue = col->blue >> 8;
     m_green = col->green >> 8;
+    m_alpha = 255;
+}
+
+wxColour& wxColour::operator=(const RGBColor& col)
+{
+    FromRGBColor((WXCOLORREF *)&col);
+    return *this;
 }
+
+bool wxColour::IsOk() const 
+{
+    return m_isInit; 
+}
+