X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/83624f79609f0d5e240c1f7d77d044bfff9702fc..866592d872daa1f4e3d44948d7d3a6c90b0af9d0:/src/gtk/colour.cpp?ds=inline diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index c9a9255301..51fde80c11 100644 --- a/src/gtk/colour.cpp +++ b/src/gtk/colour.cpp @@ -89,10 +89,10 @@ void wxColour::InitFromName( const wxString &colourName ) else { m_refData = new wxColourRefData(); - if (!gdk_color_parse( colourName, &M_COLDATA->m_color )) + if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color )) { - wxFAIL_MSG( "wxColour: couldn't find colour" ); - printf( "Colourname %s.\n", WXSTRINGCAST colourName ); + wxFAIL_MSG( _T("wxColour: couldn't find colour") ); + wxPrintf( _T("Colourname %s.\n"), WXSTRINGCAST colourName ); delete m_refData; m_refData = (wxObjectRefData *) NULL; @@ -116,12 +116,23 @@ wxColour& wxColour::operator = ( const wxColour& 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; } @@ -138,21 +149,21 @@ void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue ) unsigned char wxColour::Red() const { - wxCHECK_MSG( Ok(), 0, "invalid colour" ); + wxCHECK_MSG( Ok(), 0, _T("invalid colour") ); return (unsigned char)(M_COLDATA->m_color.red >> SHIFT); } unsigned char wxColour::Green() const { - wxCHECK_MSG( Ok(), 0, "invalid colour" ); + wxCHECK_MSG( Ok(), 0, _T("invalid colour") ); return (unsigned char)(M_COLDATA->m_color.green >> SHIFT); } unsigned char wxColour::Blue() const { - wxCHECK_MSG( Ok(), 0, "invalid colour" ); + wxCHECK_MSG( Ok(), 0, _T("invalid colour") ); return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT); } @@ -167,28 +178,29 @@ void wxColour::CalcPixel( GdkColormap *cmap ) if (!Ok()) return; if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return; + M_COLDATA->FreeColour(); - 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; - - 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; - } + M_COLDATA->m_hasPixel = TRUE; + M_COLDATA->m_color.pixel = index; + } else { M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color ); @@ -199,14 +211,14 @@ void wxColour::CalcPixel( GdkColormap *cmap ) int wxColour::GetPixel() const { - wxCHECK_MSG( Ok(), 0, "invalid colour" ); + wxCHECK_MSG( Ok(), 0, _T("invalid colour") ); return M_COLDATA->m_color.pixel; } GdkColor *wxColour::GetColor() const { - wxCHECK_MSG( Ok(), (GdkColor *) NULL, "invalid colour" ); + wxCHECK_MSG( Ok(), (GdkColor *) NULL, _T("invalid colour") ); return &M_COLDATA->m_color; }