#include "wx/gdicmn.h"
+#include "gdk/gdk.h"
#include "gdk/gdkprivate.h"
//-----------------------------------------------------------------------------
wxColourRefData::wxColourRefData()
{
- m_color.red = 0;
- m_color.green = 0;
- m_color.blue = 0;
- m_color.pixel = 0;
- m_colormap = (GdkColormap *) NULL;
- m_hasPixel = FALSE;
+ m_color.red = 0;
+ m_color.green = 0;
+ m_color.blue = 0;
+ m_color.pixel = 0;
+ m_colormap = (GdkColormap *) NULL;
+ m_hasPixel = FALSE;
}
wxColourRefData::~wxColourRefData()
{
- FreeColour();
+ FreeColour();
}
void wxColourRefData::FreeColour()
wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
{
- m_refData = new wxColourRefData();
- M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
- M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
- M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
- M_COLDATA->m_color.pixel = 0;
+ m_refData = new wxColourRefData();
+ M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
+ M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
+ M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
+ M_COLDATA->m_color.pixel = 0;
}
void wxColour::InitFromName( const wxString &colourName )
{
- wxNode *node = (wxNode *) NULL;
- if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
- {
- wxColour *col = (wxColour*)node->Data();
- UnRef();
- if (col) Ref( *col );
- }
- else
- {
- m_refData = new wxColourRefData();
- if (!gdk_color_parse( colourName, &M_COLDATA->m_color ))
+ wxNode *node = (wxNode *) NULL;
+ if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
+ {
+ wxColour *col = (wxColour*)node->Data();
+ UnRef();
+ if (col) Ref( *col );
+ }
+ else
{
- wxFAIL_MSG( "wxColour: couldn't find colour" );
- delete m_refData;
- m_refData = (wxObjectRefData *) NULL;
+ m_refData = new wxColourRefData();
+ if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color ))
+ {
+ wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
+ wxPrintf( wxT("Colourname %s.\n"), WXSTRINGCAST colourName );
+
+ delete m_refData;
+ m_refData = (wxObjectRefData *) NULL;
+ }
}
- }
}
wxColour::wxColour( const wxColour& col )
{
- Ref( col );
+ Ref( col );
}
wxColour::~wxColour()
wxColour& wxColour::operator = ( const wxColour& col )
{
- if (*this == col) return (*this);
- Ref( col );
- return *this;
+ if (*this == col) return (*this);
+ Ref( col );
+ return *this;
}
-bool wxColour::operator == ( const wxColour& col )
+bool wxColour::operator == ( const wxColour& col ) const
{
- return m_refData == col.m_refData;
+ if (m_refData == col.m_refData) return TRUE;
+
+ if (!m_refData) return FALSE;
+ if (!col.m_refData) return FALSE;
+
+ GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
+ GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
+ if (own->red != other->red) return FALSE;
+ if (own->blue != other->blue) return FALSE;
+ if (own->green != other->green) return FALSE;
+
+ return TRUE;
}
-bool wxColour::operator != ( const wxColour& col)
+bool wxColour::operator != ( const wxColour& col) const
{
- return m_refData != col.m_refData;
+ return m_refData != col.m_refData;
}
void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
{
- UnRef();
- m_refData = new wxColourRefData();
- M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
- M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
- M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
- M_COLDATA->m_color.pixel = 0;
+ UnRef();
+ m_refData = new wxColourRefData();
+ M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
+ M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
+ M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
+ M_COLDATA->m_color.pixel = 0;
}
unsigned char wxColour::Red() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid colour" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
- return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
+ return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
}
unsigned char wxColour::Green() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid colour" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
- return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
+ return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
}
unsigned char wxColour::Blue() const
{
- if (!Ok())
- {
- wxFAIL_MSG( "invalid colour" );
- return 0;
- }
+ wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
- return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
+ return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
}
bool wxColour::Ok() const
{
- return (m_refData != NULL);
+ return (m_refData != NULL);
}
void wxColour::CalcPixel( GdkColormap *cmap )
{
- if (!Ok()) return;
-
- if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
- M_COLDATA->FreeColour();
+ if (!Ok()) return;
- GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
- if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
- (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
- {
- GdkColor *colors = cmap->colors;
- int max = 3 * (65536);
- int index = -1;
+ if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
+
+ M_COLDATA->FreeColour();
- for (int i = 0; i < cmap->size; i++)
+ GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
+ if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
+ (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
{
- int rdiff = (M_COLDATA->m_color.red - colors[i].red);
- int gdiff = (M_COLDATA->m_color.green - colors[i].green);
- int bdiff = (M_COLDATA->m_color.blue - colors[i].blue);
- int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
- if (sum < max) { index = i; max = sum; }
+ GdkColor *colors = cmap->colors;
+ int max = 3 * (65536);
+ int index = -1;
+
+ for (int i = 0; i < cmap->size; i++)
+ {
+ int rdiff = (M_COLDATA->m_color.red - colors[i].red);
+ int gdiff = (M_COLDATA->m_color.green - colors[i].green);
+ int bdiff = (M_COLDATA->m_color.blue - colors[i].blue);
+ int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff);
+ if (sum < max) { index = i; max = sum; }
+ }
+
+ M_COLDATA->m_hasPixel = TRUE;
+ M_COLDATA->m_color.pixel = index;
+ }
+ else
+ {
+ M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );
}
- M_COLDATA->m_hasPixel = TRUE;
- M_COLDATA->m_color.pixel = index;
- }
- else
- {
- M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );
- }
-
- M_COLDATA->m_colormap = cmap;
+ M_COLDATA->m_colormap = cmap;
}
int wxColour::GetPixel() const
{
- if (!Ok()) return 0;
+ wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
- return M_COLDATA->m_color.pixel;
+ return M_COLDATA->m_color.pixel;
}
GdkColor *wxColour::GetColor() const
{
- if (!Ok()) return (GdkColor *) NULL;
+ wxCHECK_MSG( Ok(), (GdkColor *) NULL, wxT("invalid colour") );
- return &M_COLDATA->m_color;
+ return &M_COLDATA->m_color;
}
projects / wxWidgets.git / blobdiff