X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47c93b637e9016ffcd3010b4d785d26f5b746b98..8a31648287be0ef976f133de2786b137f1e98340:/src/gtk/colour.cpp diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index a54ca5fdac..185cb5c1d4 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,227 +7,181 @@ // 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 -#include -#include //----------------------------------------------------------------------------- // wxColour //----------------------------------------------------------------------------- -class wxColourRefData: public wxObjectRefData +class wxColourRefData : public wxGDIRefData { public: - wxColourRefData(); - ~wxColourRefData(); - + wxColourRefData(guint16 red, guint16 green, guint16 blue, wxByte alpha = 0xff) + { + m_color.red = + m_red = red; + m_color.green = + m_green = green; + m_color.blue = + m_blue = blue; + m_alpha = alpha; + m_color.pixel = 0; + m_colormap = NULL; + } + + virtual ~wxColourRefData() + { + FreeColour(); + } + void FreeColour(); + void AllocColour( GdkColormap* cmap ); -public: GdkColor m_color; GdkColormap *m_colormap; - bool m_hasPixel; + // gdk_colormap_alloc_color may change the RGB values in m_color, so we need separate copies + guint16 m_red; + guint16 m_green; + guint16 m_blue; + wxByte m_alpha; - friend class wxColour; + wxDECLARE_NO_COPY_CLASS(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::~wxColourRefData() -{ - 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 ); - } + gdk_colormap_free_colors(m_colormap, &m_color, 1); + m_colormap = NULL; + m_color.pixel = 0; } } -//----------------------------------------------------------------------------- - -#define M_COLDATA ((wxColourRefData *)m_refData) - -#define SHIFT (8*(sizeof(short int)-sizeof(char))) - -IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject) - -wxColour::wxColour() -{ -} - -wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue ) -{ - 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; -} - -void wxColour::InitFromName( const wxString &colourName ) +void wxColourRefData::AllocColour( GdkColormap *cmap ) { - wxNode *node = (wxNode *) NULL; - if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) ) - { - wxColour *col = (wxColour*)node->Data(); - UnRef(); - if (col) Ref( *col ); - } - else + if (m_colormap != cmap) { - m_refData = new wxColourRefData(); - if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color )) + FreeColour(); + + m_color.red = m_red; + m_color.green = m_green; + m_color.blue = m_blue; + if (gdk_colormap_alloc_color(cmap, &m_color, FALSE, TRUE)) { - wxFAIL_MSG( wxT("wxColour: couldn't find colour") ); - - delete m_refData; - m_refData = (wxObjectRefData *) NULL; + m_colormap = cmap; } } } -wxColour::wxColour( const wxColour& col ) -{ - Ref( col ); -} +//----------------------------------------------------------------------------- -wxColour::~wxColour() +#define M_COLDATA static_cast(m_refData) + +// GDK's values are in 0..65535 range, ours are in 0..255 +#define SHIFT 8 + +wxColour::wxColour(const GdkColor& gdkColor) { + m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue); } -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) 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; -} + if (m_refData == col.m_refData) + return true; -bool wxColour::operator != ( const wxColour& col) const -{ - return !(*this == col); + if (!m_refData || !col.m_refData) + return false; + + wxColourRefData* refData = M_COLDATA; + wxColourRefData* that_refData = static_cast(col.m_refData); + return refData->m_red == that_refData->m_red && + refData->m_green == that_refData->m_green && + refData->m_blue == that_refData->m_blue && + refData->m_alpha == that_refData->m_alpha; } -void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue ) +void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char blue, + unsigned char alpha) { UnRef(); - 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; + + m_refData = new wxColourRefData( + (guint16(red) << SHIFT) + red, + (guint16(green) << SHIFT) + green, + (guint16(blue) << SHIFT) + blue, + alpha); } unsigned char wxColour::Red() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); - return (unsigned char)(M_COLDATA->m_color.red >> SHIFT); + return wxByte(M_COLDATA->m_red >> SHIFT); } unsigned char wxColour::Green() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); - return (unsigned char)(M_COLDATA->m_color.green >> SHIFT); + return wxByte(M_COLDATA->m_green >> SHIFT); } unsigned char wxColour::Blue() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); - return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT); + return wxByte(M_COLDATA->m_blue >> SHIFT); } -bool wxColour::Ok() const +unsigned char wxColour::Alpha() const { - return (m_refData != NULL); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); + + return M_COLDATA->m_alpha; } 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 ); - } + if (!IsOk()) return; - M_COLDATA->m_colormap = cmap; + M_COLDATA->AllocColour( cmap ); } int wxColour::GetPixel() const { - wxCHECK_MSG( Ok(), 0, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") ); return M_COLDATA->m_color.pixel; } -GdkColor *wxColour::GetColor() const +const GdkColor *wxColour::GetColor() const { - wxCHECK_MSG( Ok(), (GdkColor *) NULL, wxT("invalid colour") ); + wxCHECK_MSG( IsOk(), NULL, wxT("invalid colour") ); return &M_COLDATA->m_color; } +bool wxColour::FromString(const wxString& str) +{ + GdkColor colGDK; + if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) ) + { + *this = wxColour(colGDK); + return true; + } + return wxColourBase::FromString(str); +}