X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/222ed1d678dff2f5c3c4164321dd05e8f47de487..cf4a8b2698fb853ac4b638d08d95cc8e5794d1aa:/src/x11/colour.cpp?ds=sidebyside diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp index 24b56a9ebf..26dfeded95 100644 --- a/src/x11/colour.cpp +++ b/src/x11/colour.cpp @@ -1,21 +1,23 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.cpp +// Name: src/x11/colour.cpp // Purpose: wxColour class // Author: Julian Smart, Robert Roebling // Modified by: // Created: 17/09/98 // RCS-ID: $Id$ // Copyright: (c) Julian Smart, Robert Roebling -// Licence: wxWindows licence +// 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/app.h" +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/gdicmn.h" +#endif #include "wx/x11/private.h" @@ -33,7 +35,7 @@ public: m_color.blue = 0; m_color.pixel = 0; m_colormap = (WXColormap *) NULL; - m_hasPixel = FALSE; + m_hasPixel = false; } wxColourRefData(const wxColourRefData& data): wxObjectRefData() @@ -42,8 +44,8 @@ public: m_colormap = data.m_colormap; m_hasPixel = data.m_hasPixel; } - - ~wxColourRefData() + + virtual ~wxColourRefData() { FreeColour(); } @@ -57,7 +59,7 @@ public: m_color.blue == data.m_color.blue && m_color.pixel == data.m_color.pixel); } - + void FreeColour(); void AllocColour( WXColormap cmap ); @@ -71,8 +73,8 @@ public: static unsigned short colMapAllocCounter[ 256 ]; }; -unsigned short wxColourRefData::colMapAllocCounter[ 256 ] = -{ +unsigned short 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, @@ -92,13 +94,14 @@ void wxColourRefData::FreeColour() { if (!m_colormap) return; -#if !wxUSE_NANOX - if ((wxTheApp->m_visualInfo->m_visualType == GrayScale) || - (wxTheApp->m_visualInfo->m_visualType == PseudoColor)) +#if !wxUSE_NANOX + if ( wxTheApp && + (wxTheApp->m_visualInfo->m_visualType == GrayScale || + wxTheApp->m_visualInfo->m_visualType == PseudoColor) ) { int idx = m_color.pixel; colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1; - + if (colMapAllocCounter[ idx ] == 0) { unsigned long pixel = m_color.pixel; @@ -128,7 +131,7 @@ void wxColourRefData::AllocColour( WXColormap cmap ) { m_hasPixel = XAllocColor( wxGlobalDisplay(), (Colormap) cmap, &m_color ); } - + m_colormap = cmap; } @@ -140,70 +143,23 @@ void wxColourRefData::AllocColour( WXColormap cmap ) IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject) -wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue ) -{ - m_refData = new wxColourRefData(); -#if wxUSE_NANOX - M_COLDATA->m_color.red = ((unsigned short)red) ; - M_COLDATA->m_color.green = ((unsigned short)green) ; - M_COLDATA->m_color.blue = ((unsigned short)blue) ; -#else - 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; -#endif - M_COLDATA->m_color.pixel = 0; -} - -void wxColour::InitFromName( const wxString &colourName ) -{ - wxNode *node = (wxNode *) NULL; - wxColour* col; - if ( (wxTheColourDatabase) && (col = wxTheColourDatabase->FindColourNoAdd(colourName)) ) - { - UnRef(); - if (col) Ref( *col ); - } - else - { - m_refData = new wxColourRefData(); - - M_COLDATA->m_colormap = wxTheApp->GetMainColormap( wxGlobalDisplay() ); - - if (!XParseColor( wxGlobalDisplay(), (Colormap) M_COLDATA->m_colormap, 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; - } - } -} - 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; XColor *own = &(((wxColourRefData*)m_refData)->m_color); XColor *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->green == other->green) + && (own->blue == other->blue) ; + } wxObjectRefData *wxColour::CreateRefData() const @@ -216,11 +172,11 @@ wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const return new wxColourRefData(*(wxColourRefData *)data); } -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 WXUNUSED(alpha)) { AllocExclusive(); - - m_refData = new wxColourRefData(); + #if wxUSE_NANOX M_COLDATA->m_color.red = ((unsigned short)red) ; M_COLDATA->m_color.green = ((unsigned short)green) ; @@ -288,3 +244,21 @@ WXColor *wxColour::GetColor() const return (WXColor*) &M_COLDATA->m_color; } + +bool wxColour::FromString(const wxString& name) +{ + Display *dpy = wxGlobalDisplay(); + WXColormap colormap = wxTheApp->GetMainColormap( dpy ); + XColor xcol; + if ( XParseColor( dpy, (Colormap)colormap, name.mbc_str(), &xcol ) ) + { + UnRef(); + + m_refData = new wxColourRefData; + M_COLDATA->m_colormap = colormap; + M_COLDATA->m_color = xcol; + return true; + } + + return wxColourBase::FromString(name); +}