X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2b5f62a0b2db198609b45dec622a018dae37008e..c72b1ad70a0dda5a3fe5086e0c80ae12402e405d:/src/gtk1/colour.cpp?ds=sidebyside diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp index 21d852e55d..c84141bd0a 100644 --- a/src/gtk1/colour.cpp +++ b/src/gtk1/colour.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.cpp +// Name: src/gtk1/colour.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,13 +7,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" -#ifdef __GNUG__ -#pragma implementation "colour.h" -#endif - +#include "wx/colour.h" #include "wx/gdicmn.h" -#include "wx/gtk/private.h" +#include "wx/gtk1/private.h" #include #include @@ -33,9 +32,9 @@ public: m_color.blue = 0; m_color.pixel = 0; m_colormap = (GdkColormap *) NULL; - m_hasPixel = FALSE; + m_hasPixel = false; } - + wxColourRefData(const wxColourRefData& data) : wxObjectRefData() { @@ -58,7 +57,7 @@ public: m_color.blue == data.m_color.blue && m_color.pixel == data.m_color.pixel); } - + void FreeColour(); void AllocColour( GdkColormap* cmap ); @@ -72,8 +71,8 @@ public: static gushort colMapAllocCounter[ 256 ]; }; -gushort wxColourRefData::colMapAllocCounter[ 256 ] = -{ +gushort wxColourRefData::colMapAllocCounter[ 256 ] = +{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -93,20 +92,15 @@ 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 { int idx = m_color.pixel; colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1; - + if (colMapAllocCounter[ idx ] == 0) - gdk_colormap_free_colors( m_colormap, &m_color, 1 ); + gdk_colormap_free_colors( m_colormap, &m_color, 1 ); } } } @@ -117,15 +111,10 @@ void wxColourRefData::AllocColour( GdkColormap *cmap ) return; 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_hasPixel = gdk_colormap_alloc_color( cmap, &m_color, FALSE, TRUE ); int idx = m_color.pixel; @@ -142,7 +131,8 @@ void wxColourRefData::AllocColour( GdkColormap *cmap ) #define M_COLDATA ((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) @@ -155,33 +145,44 @@ wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue ) M_COLDATA->m_color.pixel = 0; } -void wxColour::InitFromName( const wxString &colourName ) +/* static */ +wxColour wxColour::CreateByName(const wxString& name) { - wxNode *node = (wxNode *) NULL; - if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) ) + wxColour col; + + GdkColor colGDK; + if ( gdk_color_parse( wxGTK_CONV( name ), &colGDK ) ) { - wxColour *col = (wxColour*)node->Data(); - UnRef(); - if (col) Ref( *col ); + wxColourRefData *refData = new wxColourRefData; + refData->m_color = colGDK; + col.m_refData = refData; } - else + + return col; +} + + +void wxColour::InitFromName( const wxString &colourName ) +{ + // check the cache first + wxColour col; + if ( wxTheColourDatabase ) { - m_refData = new wxColourRefData(); - - if (!gdk_color_parse( wxGTK_CONV( colourName ), &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() + col = wxTheColourDatabase->Find(colourName); + } - //wxFAIL_MSG( wxT("wxColour: couldn't find colour") ); + if ( !col.Ok() ) + { + col = CreateByName(colourName); + } - delete m_refData; - m_refData = (wxObjectRefData *) NULL; - } + if ( col.Ok() ) + { + *this = col; + } + else + { + wxFAIL_MSG( wxT("wxColour: couldn't find colour") ); } } @@ -191,17 +192,17 @@ wxColour::~wxColour() 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 || !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; - - return TRUE; + return own->red == other->red && + own->blue == other->blue && + own->green == other->green; } wxObjectRefData *wxColour::CreateRefData() const @@ -217,14 +218,14 @@ wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue ) { 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 = (GdkColormap*) NULL; - M_COLDATA->m_hasPixel = FALSE; + M_COLDATA->m_hasPixel = false; } unsigned char wxColour::Red() const @@ -268,5 +269,3 @@ GdkColor *wxColour::GetColor() const return &M_COLDATA->m_color; } - -