/////////////////////////////////////////////////////////////////////////////
-// Name: colour.cpp
+// Name: src/mac/carbon/colour.cpp
// Purpose: wxColour class
-// Author: AUTHOR
+// Author: Stefan Csomor
// Modified by:
-// Created: ??/??/98
+// Created: 1998-01-01
// RCS-ID: $Id$
-// Copyright: (c) AUTHOR
-// Licence: wxWindows licence
+// Copyright: (c) Stefan Csomor
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "colour.h"
-#endif
+#include "wx/wxprec.h"
#include "wx/gdicmn.h"
#include "wx/colour.h"
// Colour
-static void wxComposeRGBColor( RGBColor * col , int red, int blue, int green ) ;
-static void wxComposeRGBColor( RGBColor * col , int red, int blue, int green )
-{
- col->red = (red << 8) + red;
- col->blue = (blue << 8) + blue;
- col->green = (green << 8) + green;
-}
+#include "wx/mac/private.h"
-wxColour::wxColour ()
+static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green ) ;
+static void wxComposeRGBColor( WXCOLORREF* color , int red, int blue, int green )
{
- m_isInit = FALSE;
- m_red = m_blue = m_green = 0;
-
- wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
+ RGBColor* col = (RGBColor*) color ;
+ col->red = (red << 8) + red;
+ col->blue = (blue << 8) + blue;
+ col->green = (green << 8) + green;
}
-wxColour::wxColour (unsigned char r, unsigned char g, unsigned char b)
+void wxColour::Init()
{
- m_red = r;
- m_green = g;
- m_blue = b;
- m_isInit = TRUE;
+ m_isInit = false;
+ m_red =
+ m_blue =
+ m_green = 0;
- 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;
- m_pixel = col.m_pixel;
+ memcpy( &m_pixel , &col.m_pixel , 6 ) ;
}
-wxColour::wxColour (const wxColour* col)
+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;
+ m_red = col.m_red;
+ m_green = col.m_green;
+ m_blue = col.m_blue;
+ m_isInit = col.m_isInit;
- m_pixel = col->m_pixel;
-}
+ 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;
-
- m_pixel = col.m_pixel;
-
- return *this;
+ return *this;
}
-void wxColour::InitFromName(const wxString& col)
+void wxColour::InitFromName(const wxString& name)
{
- wxColour *the_colour = wxTheColourDatabase->FindColour (col);
- if (the_colour)
+ if ( wxTheColourDatabase )
{
- m_red = the_colour->Red ();
- m_green = the_colour->Green ();
- m_blue = the_colour->Blue ();
- m_isInit = TRUE;
- }
- else
- {
- m_red = 0;
- m_green = 0;
- m_blue = 0;
- m_isInit = FALSE;
+ wxColour col = wxTheColourDatabase->Find(name);
+ if ( col.Ok() )
+ {
+ *this = col;
+ return;
+ }
}
- wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
+ // leave invalid
+ Init();
}
wxColour::~wxColour ()
m_red = r;
m_green = g;
m_blue = b;
- m_isInit = TRUE;
+ m_isInit = true;
+
+ wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
+}
- wxComposeRGBColor( &m_pixel , m_red , m_blue , m_green ) ;
+void wxColour::Set( const 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 ;
}