X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f234c60c4aac2e077b16b8fbb3009ad45a84c73b..bf7945cef10c0844a32e95695c544d829da9293a:/src/gtk1/colour.cpp diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp index 88a76bba56..a54ca5fdac 100644 --- a/src/gtk1/colour.cpp +++ b/src/gtk1/colour.cpp @@ -14,8 +14,9 @@ #include "wx/gdicmn.h" -#include "gdk/gdk.h" -#include "gdk/gdkprivate.h" +#include +#include +#include //----------------------------------------------------------------------------- // wxColour @@ -23,17 +24,18 @@ class wxColourRefData: public wxObjectRefData { - public: - +public: wxColourRefData(); ~wxColourRefData(); + void FreeColour(); +public: GdkColor m_color; GdkColormap *m_colormap; bool m_hasPixel; - friend wxColour; + friend class wxColour; }; wxColourRefData::wxColourRefData() @@ -53,7 +55,22 @@ wxColourRefData::~wxColourRefData() 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 ); + } + } } //----------------------------------------------------------------------------- @@ -89,10 +106,9 @@ 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( wxT("wxColour: couldn't find colour") ); delete m_refData; m_refData = (wxObjectRefData *) NULL; @@ -116,14 +132,25 @@ 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; + return !(*this == col); } void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue ) @@ -138,21 +165,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, wxT("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, wxT("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, wxT("invalid colour") ); return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT); } @@ -170,25 +197,16 @@ void wxColour::CalcPixel( GdkColormap *cmap ) M_COLDATA->FreeColour(); +#ifdef __WXGTK20__ + if ((cmap->visual->type == GDK_VISUAL_GRAYSCALE) || + (cmap->visual->type == GDK_VISUAL_PSEUDO_COLOR)) +#else GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap; if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) || (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 { @@ -200,14 +218,14 @@ void wxColour::CalcPixel( GdkColormap *cmap ) int wxColour::GetPixel() const { - wxCHECK_MSG( Ok(), 0, "invalid colour" ); + wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); return M_COLDATA->m_color.pixel; } GdkColor *wxColour::GetColor() const { - wxCHECK_MSG( Ok(), (GdkColor *) NULL, "invalid colour" ); + wxCHECK_MSG( Ok(), (GdkColor *) NULL, wxT("invalid colour") ); return &M_COLDATA->m_color; }