From 4e6b83091a1ef0114a3b45af43ee66832f1876bb Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 17 Oct 2003 17:39:28 +0000 Subject: [PATCH] added CreateByName(), use it in wxColourDatabase git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24212 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/gtk/colour.h | 3 ++ include/wx/gtk1/colour.h | 3 ++ src/common/gdicmn.cpp | 9 ++--- src/gtk/colour.cpp | 80 ++++++++++++++++++++++------------------ src/gtk1/colour.cpp | 80 ++++++++++++++++++++++------------------ 5 files changed, 100 insertions(+), 75 deletions(-) diff --git a/include/wx/gtk/colour.h b/include/wx/gtk/colour.h index 0ae6594930..87b7e7a3b0 100644 --- a/include/wx/gtk/colour.h +++ b/include/wx/gtk/colour.h @@ -80,6 +80,9 @@ public: unsigned char Blue() const; + // Get colour from name or wxNullColour + static wxColour CreateByName(const wxString& name); + // Implementation part void CalcPixel( GdkColormap *cmap ); int GetPixel() const; diff --git a/include/wx/gtk1/colour.h b/include/wx/gtk1/colour.h index 0ae6594930..87b7e7a3b0 100644 --- a/include/wx/gtk1/colour.h +++ b/include/wx/gtk1/colour.h @@ -80,6 +80,9 @@ public: unsigned char Blue() const; + // Get colour from name or wxNullColour + static wxColour CreateByName(const wxString& name); + // Implementation part void CalcPixel( GdkColormap *cmap ); int GetPixel() const; diff --git a/src/common/gdicmn.cpp b/src/common/gdicmn.cpp index bed3f972eb..29b3549a9a 100644 --- a/src/common/gdicmn.cpp +++ b/src/common/gdicmn.cpp @@ -408,11 +408,9 @@ wxColour wxColourDatabase::Find(const wxString& colour) const if ( it != m_map->end() ) return *(it->second); - // if we didn't find it,query the system, maybe it knows about it - // - // TODO: move this into platform-specific files -#ifdef __WXGTK__ - wxColour col( colour ); + // if we didn't find it, query the system, maybe it knows about it +#if defined(__WXGTK__) || defined(__X__) + wxColour col = wxColour::CreateByName(colour); if ( col.Ok() ) { @@ -422,6 +420,7 @@ wxColour wxColourDatabase::Find(const wxString& colour) const return col; #elif defined(__X__) + // TODO: move this to wxColour::CreateByName() XColor xcolour; #ifdef __WXMOTIF__ diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index 3b148e7bd3..bf2fa2a342 100644 --- a/src/gtk/colour.cpp +++ b/src/gtk/colour.cpp @@ -39,7 +39,7 @@ public: m_colormap = (GdkColormap *) NULL; m_hasPixel = FALSE; } - + wxColourRefData(const wxColourRefData& data) : wxObjectRefData() { @@ -62,7 +62,7 @@ public: m_color.blue == data.m_color.blue && m_color.pixel == data.m_color.pixel); } - + void FreeColour(); void AllocColour( GdkColormap* cmap ); @@ -76,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, @@ -108,7 +108,7 @@ 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 ); } @@ -121,7 +121,7 @@ void wxColourRefData::AllocColour( GdkColormap *cmap ) return; FreeColour(); - + #ifdef __WXGTK20__ if ( (cmap->visual->type == GDK_VISUAL_GRAYSCALE) || (cmap->visual->type == GDK_VISUAL_PSEUDO_COLOR) ) @@ -159,34 +159,44 @@ wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue ) 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 ) { - wxColour* col = NULL; - if ( (wxTheColourDatabase) && (col = wxTheColourDatabase->FindColourNoAdd(colourName)) ) + // check the cache first + wxColour col; + if ( wxTheColourDatabase ) { - UnRef(); - if (col) Ref( *col ); + col = wxTheColourDatabase->Find(colourName); } - else - { - 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() - //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") ); } } @@ -196,17 +206,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 @@ -222,12 +232,12 @@ 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; } diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp index 3b148e7bd3..bf2fa2a342 100644 --- a/src/gtk1/colour.cpp +++ b/src/gtk1/colour.cpp @@ -39,7 +39,7 @@ public: m_colormap = (GdkColormap *) NULL; m_hasPixel = FALSE; } - + wxColourRefData(const wxColourRefData& data) : wxObjectRefData() { @@ -62,7 +62,7 @@ public: m_color.blue == data.m_color.blue && m_color.pixel == data.m_color.pixel); } - + void FreeColour(); void AllocColour( GdkColormap* cmap ); @@ -76,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, @@ -108,7 +108,7 @@ 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 ); } @@ -121,7 +121,7 @@ void wxColourRefData::AllocColour( GdkColormap *cmap ) return; FreeColour(); - + #ifdef __WXGTK20__ if ( (cmap->visual->type == GDK_VISUAL_GRAYSCALE) || (cmap->visual->type == GDK_VISUAL_PSEUDO_COLOR) ) @@ -159,34 +159,44 @@ wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue ) 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 ) { - wxColour* col = NULL; - if ( (wxTheColourDatabase) && (col = wxTheColourDatabase->FindColourNoAdd(colourName)) ) + // check the cache first + wxColour col; + if ( wxTheColourDatabase ) { - UnRef(); - if (col) Ref( *col ); + col = wxTheColourDatabase->Find(colourName); } - else - { - 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() - //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") ); } } @@ -196,17 +206,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 @@ -222,12 +232,12 @@ 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; } -- 2.45.2