#include "wx/wxprec.h"
#include "wx/colour.h"
+
#include "wx/gtk/private.h"
#include <gdk/gdk.h>
class wxColourRefData: public wxObjectRefData
{
public:
- wxColourRefData()
+ wxColourRefData(guint16 red, guint16 green, guint16 blue, guint16 alpha)
{
- m_color.red = 0;
- m_color.green = 0;
- m_color.blue = 0;
+ 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;
- m_hasPixel = false;
- }
-
- wxColourRefData(const wxColourRefData& data)
- : wxObjectRefData()
- {
- m_color = data.m_color;
- m_colormap = data.m_colormap;
- m_hasPixel = data.m_hasPixel;
}
- ~wxColourRefData()
+ virtual ~wxColourRefData()
{
FreeColour();
}
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;
+ guint16 m_alpha;
+
+ DECLARE_NO_COPY_CLASS(wxColourRefData)
};
void wxColourRefData::FreeColour()
{
- if (m_hasPixel)
+ if (m_colormap)
{
gdk_colormap_free_colors(m_colormap, &m_color, 1);
+ m_colormap = NULL;
+ m_color.pixel = 0;
}
}
void wxColourRefData::AllocColour( GdkColormap *cmap )
{
- if (m_hasPixel && (m_colormap == cmap))
- return;
-
- FreeColour();
+ if (m_colormap != cmap)
+ {
+ FreeColour();
- m_hasPixel = gdk_colormap_alloc_color(cmap, &m_color, FALSE, TRUE);
- m_colormap = cmap;
+ 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))
+ {
+ m_colormap = cmap;
+ }
+ }
}
//-----------------------------------------------------------------------------
#define M_COLDATA wx_static_cast(wxColourRefData*, m_refData)
-// GDK's values are in 0..65535 range, our are in 0..255
+// GDK's values are in 0..65535 range, ours are in 0..255
#define SHIFT 8
IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
-wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
+wxColour::wxColour(const GdkColor& gdkColor)
{
- 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;
-}
-
-/* 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 )
-{
- // check the cache first
- if ( wxTheColourDatabase )
- {
- *this = wxTheColourDatabase->Find(colourName);
- }
-
- if ( !Ok() )
- {
- *this = CreateByName(colourName);
- }
-
- if ( !Ok() )
- {
- wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
- }
+ m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue, 0xFFFF /*opaque alpha in 16 bit*/);
}
wxColour::~wxColour()
if (!m_refData || !col.m_refData)
return false;
- const GdkColor& own = M_COLDATA->m_color;
- const GdkColor& other = wx_static_cast(wxColourRefData*, col.m_refData)->m_color;
- return own.red == other.red &&
- own.blue == other.blue &&
- own.green == other.green;
+ wxColourRefData* refData = M_COLDATA;
+ wxColourRefData* that_refData = wx_static_cast(wxColourRefData*, 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;
}
-wxObjectRefData *wxColour::CreateRefData() const
+void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char blue,
+ unsigned char alpha)
{
- return new wxColourRefData;
-}
+ UnRef();
-wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const
-{
- return new wxColourRefData(*(wxColourRefData *)data);
+ m_refData = new wxColourRefData(
+ (guint16(red) << SHIFT) + red,
+ (guint16(green) << SHIFT) + green,
+ (guint16(blue) << SHIFT) + blue,
+ (guint16(alpha) << SHIFT) + alpha);
}
-void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
+unsigned char wxColour::Red() const
{
- 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;
+ wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
- M_COLDATA->m_colormap = NULL;
- M_COLDATA->m_hasPixel = false;
+ return wxByte(M_COLDATA->m_red >> SHIFT);
}
-unsigned char wxColour::Red() const
+unsigned char wxColour::Green() const
{
wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
- return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
+ return wxByte(M_COLDATA->m_green >> SHIFT);
}
-unsigned char wxColour::Green() const
+unsigned char wxColour::Blue() const
{
wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
- return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
+ return wxByte(M_COLDATA->m_blue >> SHIFT);
}
-unsigned char wxColour::Blue() const
+unsigned char wxColour::Alpha() const
{
wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
- return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
+ return wxByte(M_COLDATA->m_alpha >> SHIFT);
}
void wxColour::CalcPixel( GdkColormap *cmap )
return M_COLDATA->m_color.pixel;
}
-GdkColor *wxColour::GetColor() const
+#ifdef __WXGTK24__
+const GdkColor *wxColour::GetColor() const
+#else
+ GdkColor *wxColour::GetColor() const
+#endif
{
wxCHECK_MSG( Ok(), 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);
+}
projects / wxWidgets.git / blobdiff