X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b4819fcaeabd1a53c3ce7d62a13f30bf9333a5e2..9894cc01c98b0d6fa960d57e9a6155bbb07ed67b:/src/gtk/colour.cpp?ds=sidebyside diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index 9ac38bff4b..a39f2af429 100644 --- a/src/gtk/colour.cpp +++ b/src/gtk/colour.cpp @@ -8,11 +8,16 @@ ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma implementation "colour.h" #endif +// For compilers that support precompilation, includes "wx.h". +#include "wx/wxprec.h" + +#include "wx/colour.h" #include "wx/gdicmn.h" +#include "wx/gtk/private.h" #include #include @@ -25,13 +30,42 @@ 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 = (GdkColormap *) 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(); + } + + bool operator == (const wxColourRefData& data) const + { + return (m_colormap == data.m_colormap && + m_hasPixel == data.m_hasPixel && + m_color.red == data.m_color.red && + m_color.green == data.m_color.green && + m_color.blue == data.m_color.blue && + m_color.pixel == data.m_color.pixel); + } void FreeColour(); void AllocColour( GdkColormap* cmap ); -public: GdkColor m_color; GdkColormap *m_colormap; bool m_hasPixel; @@ -42,8 +76,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, @@ -59,21 +93,6 @@ gushort wxColourRefData::colMapAllocCounter[ 256 ] = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }; -wxColourRefData::wxColourRefData() -{ - m_color.red = 0; - m_color.green = 0; - m_color.blue = 0; - m_color.pixel = 0; - m_colormap = (GdkColormap *) NULL; - m_hasPixel = FALSE; -} - -wxColourRefData::~wxColourRefData() -{ - FreeColour(); -} - void wxColourRefData::FreeColour() { if (m_colormap) @@ -89,9 +108,9 @@ void wxColourRefData::FreeColour() { 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 ); } } } @@ -102,10 +121,10 @@ void wxColourRefData::AllocColour( GdkColormap *cmap ) return; FreeColour(); - + #ifdef __WXGTK20__ - if ((m_colormap->visual->type == GDK_VISUAL_GRAYSCALE) || - (m_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR)) + 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) || @@ -127,14 +146,11 @@ 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) -wxColour::wxColour() -{ -} - wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue ) { m_refData = new wxColourRefData(); @@ -144,80 +160,87 @@ 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 - { - 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; - } - } + return col; } -wxColour::wxColour( const wxColour& col ) -{ - Ref( col ); -} -wxColour::~wxColour() +void wxColour::InitFromName( const wxString &colourName ) { + // check the cache first + wxColour col; + if ( wxTheColourDatabase ) + { + col = wxTheColourDatabase->Find(colourName); + } + + if ( !col.Ok() ) + { + col = CreateByName(colourName); + } + + if ( col.Ok() ) + { + *this = col; + } + else + { + wxFAIL_MSG( wxT("wxColour: couldn't find colour") ); + } } -wxColour& wxColour::operator = ( const wxColour& col ) +wxColour::~wxColour() { - 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; + 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 = (GdkColormap*) NULL; + M_COLDATA->m_hasPixel = false; } unsigned char wxColour::Red() const @@ -241,11 +264,6 @@ 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; @@ -266,5 +284,3 @@ GdkColor *wxColour::GetColor() const return &M_COLDATA->m_color; } - -