Anim doesn't depend on GIF, remove wxUSE_GIF.

[wxWidgets.git] / src / mac / carbon / colour.cpp

diff --git a/src/mac/carbon/colour.cpp b/src/mac/carbon/colour.cpp
index 9fcb7c04fb9ed620a995b91f202665a0e0958286..9d1435aa82a0581129e7576c0365224bd6a365f7 100644 (file)
--- a/src/mac/carbon/colour.cpp
+++ b/src/mac/carbon/colour.cpp
@@ -11,9 +11,12 @@
 
 #include "wx/wxprec.h"
 
 
 #include "wx/wxprec.h"
 

-#include "wx/gdicmn.h"

 #include "wx/colour.h"
 
 #include "wx/colour.h"
 

+#ifndef WX_PRECOMP
+    #include "wx/gdicmn.h"
+#endif
+

 #include "wx/mac/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)
 #include "wx/mac/private.h"
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour, wxObject)


@@ -37,60 +40,22 @@ void wxColour::Init()
     wxComposeRGBColor( &m_pixel, m_red, m_blue, m_green );
 }
 
     wxComposeRGBColor( &m_pixel, m_red, m_blue, m_green );
 }
 

-wxColour::wxColour (const wxColour& col)
-    : wxObject()
-{
-    m_red = col.m_red;
-    m_green = col.m_green;
-    m_blue = col.m_blue;
-    m_isInit = col.m_isInit;
-
-    memcpy( &m_pixel, &col.m_pixel, 6 );
-}
-
-wxColour& wxColour::operator =(const wxColour& col)
-{
-    m_red = col.m_red;
-    m_green = col.m_green;
-    m_blue = col.m_blue;
-    m_isInit = col.m_isInit;
-
-    memcpy( &m_pixel, &col.m_pixel, 6 );
-
-    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 ()
 {
 }
 
 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_red = r;
     m_green = g;
     m_blue = b;

+    m_alpha = a ;

     m_isInit = true;
 
     wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green );
 }
 
     m_isInit = true;
 
     wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green );
 }
 

-void wxColour::Set( const WXCOLORREF* color )
+void wxColour::FromRGBColor( const WXCOLORREF* color )

 {
     RGBColor* col = (RGBColor*) color;
     memcpy( &m_pixel, color, 6 );
 {
     RGBColor* col = (RGBColor*) color;
     memcpy( &m_pixel, color, 6 );