X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/15248e43a93d885f3202554202f529bd1b1e10a4..01c54165d1182cc74d8e5d43cdb1985902af0b2f:/src/gtk/colour.cpp?ds=sidebyside diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index 4ce15385f7..ff7c526c45 100644 --- a/src/gtk/colour.cpp +++ b/src/gtk/colour.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.cpp +// Name: src/gtk/colour.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,16 +7,13 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#ifdef __GNUG__ -#pragma implementation "colour.h" -#endif - -#include "wx/gdicmn.h" +#include "wx/colour.h" +#include "wx/gtk/private.h" #include -#include -#include //----------------------------------------------------------------------------- // wxColour @@ -25,149 +22,150 @@ class wxColourRefData: public wxObjectRefData { public: - wxColourRefData(); - ~wxColourRefData(); + wxColourRefData() + { + m_color.red = 0; + m_color.green = 0; + m_color.blue = 0; + m_color.pixel = 0; + m_colormap = NULL; + m_hasPixel = false; + } + + wxColourRefData(const wxColourRefData& data) + : wxObjectRefData() + { + m_color = data.m_color; + m_colormap = data.m_colormap; + m_hasPixel = data.m_hasPixel; + } + + ~wxColourRefData() + { + FreeColour(); + } void FreeColour(); + void AllocColour( GdkColormap* cmap ); -public: GdkColor m_color; GdkColormap *m_colormap; bool m_hasPixel; - - friend class wxColour; }; -wxColourRefData::wxColourRefData() +void wxColourRefData::FreeColour() { - m_color.red = 0; - m_color.green = 0; - m_color.blue = 0; - m_color.pixel = 0; - m_colormap = (GdkColormap *) NULL; - m_hasPixel = FALSE; + if (m_hasPixel) + { + gdk_colormap_free_colors(m_colormap, &m_color, 1); + } } -wxColourRefData::~wxColourRefData() +void wxColourRefData::AllocColour( GdkColormap *cmap ) { + if (m_hasPixel && (m_colormap == cmap)) + return; + FreeColour(); -} -void wxColourRefData::FreeColour() -{ - 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_hasPixel = gdk_colormap_alloc_color(cmap, &m_color, FALSE, TRUE); + m_colormap = cmap; } //----------------------------------------------------------------------------- -#define M_COLDATA ((wxColourRefData *)m_refData) +#define M_COLDATA wx_static_cast(wxColourRefData*, m_refData) -#define SHIFT (8*(sizeof(short int)-sizeof(char))) +// GDK's values are in 0..65535 range, our are in 0..255 +#define SHIFT 8 IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject) -wxColour::wxColour() -{ -} - wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue ) { - m_refData = new wxColourRefData(); + 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; } +/* static */ +wxColour wxColour::CreateByName(const wxString& name) +{ + wxColour col; + + GdkColor colGDK; + if ( gdk_color_parse( wxGTK_CONV( name ), &colGDK ) ) + { + wxColourRefData *refData = new wxColourRefData; + refData->m_color = colGDK; + col.m_refData = refData; + } + + return col; +} + + void wxColour::InitFromName( const wxString &colourName ) { - wxNode *node = (wxNode *) NULL; - if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) ) + // check the cache first + if ( wxTheColourDatabase ) { - wxColour *col = (wxColour*)node->Data(); - UnRef(); - if (col) Ref( *col ); + *this = wxTheColourDatabase->Find(colourName); } - else + + if ( !Ok() ) { - m_refData = new wxColourRefData(); - if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color )) - { - // 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; - } + *this = CreateByName(colourName); } -} -wxColour::wxColour( const wxColour& col ) -{ - Ref( col ); + if ( !Ok() ) + { + wxFAIL_MSG( wxT("wxColour: couldn't find colour") ); + } } wxColour::~wxColour() { } -wxColour& wxColour::operator = ( const wxColour& col ) -{ - if (*this == col) return (*this); - Ref( col ); - return *this; -} - bool wxColour::operator == ( const wxColour& col ) const { - if (m_refData == col.m_refData) return TRUE; + if (m_refData == col.m_refData) + return true; - if (!m_refData) return FALSE; - if (!col.m_refData) return FALSE; + if (!m_refData || !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; + const GdkColor& own = M_COLDATA->m_color; + const GdkColor& other = wx_static_cast(wxColourRefData*, col.m_refData)->m_color; + return own.red == other.red && + own.blue == other.blue && + own.green == other.green; +} - return TRUE; +wxObjectRefData *wxColour::CreateRefData() const +{ + return new wxColourRefData; } -bool wxColour::operator != ( const wxColour& col) const +wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const { - return !(*this == col); + return new wxColourRefData(*(wxColourRefData *)data); } void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue ) { - UnRef(); - m_refData = new wxColourRefData(); + AllocExclusive(); + 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_COLDATA->m_colormap = NULL; + M_COLDATA->m_hasPixel = false; } unsigned char wxColour::Red() const @@ -191,36 +189,11 @@ unsigned char wxColour::Blue() const return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT); } -bool wxColour::Ok() const -{ - 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(); - -#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 - { - 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 ); - } - - M_COLDATA->m_colormap = cmap; + M_COLDATA->AllocColour( cmap ); } int wxColour::GetPixel() const @@ -232,9 +205,7 @@ int wxColour::GetPixel() const GdkColor *wxColour::GetColor() const { - wxCHECK_MSG( Ok(), (GdkColor *) NULL, wxT("invalid colour") ); + wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") ); return &M_COLDATA->m_color; } - -