class wxColourRefData: public wxObjectRefData
{
- public:
-
+public:
wxColourRefData();
~wxColourRefData();
+
void FreeColour();
+public:
GdkColor m_color;
GdkColormap *m_colormap;
bool m_hasPixel;
void wxColourRefData::FreeColour()
{
-// if (m_hasPixel) gdk_colors_free( m_colormap, &m_color, 1, 0 );
+ if (m_colormap)
+ {
+#ifdef __WXGTK20__
+ if ((m_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
+ (m_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
+#else
+ GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) m_colormap;
+ if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
+ (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
+#endif
+ {
+ // What happens if the colour has not been allocated
+ // anew but has been found? RR.
+ gdk_colormap_free_colors( m_colormap, &m_color, 1 );
+ }
+ }
}
//-----------------------------------------------------------------------------
m_refData = new wxColourRefData();
if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color ))
{
- wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
-
+ // VZ: asserts are good in general but this one is triggered by
+ // calling wxColourDatabase::FindColour() with an
+ // unrecognized colour name and this can't be avoided from the
+ // user code, so don't give it here
+ //
+ // a better solution would be to changed code in FindColour()
+
+ //wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
+
delete m_refData;
m_refData = (wxObjectRefData *) NULL;
}
bool wxColour::operator == ( const wxColour& col ) const
{
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;
}
if (!Ok()) return;
if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
-
+
M_COLDATA->FreeColour();
#ifdef __WXGTK20__
(private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
#endif
{
- 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;
+ M_COLDATA->m_hasPixel = gdk_colormap_alloc_color( cmap, &M_COLDATA->m_color, FALSE, TRUE );
}
else
- {
+ {
M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );
}