/////////////////////////////////////////////////////////////////////////////
-// Name: colour.cpp
+// Name: src/gtk1/colour.cpp
// Purpose:
// Author: Robert Roebling
// Id: $Id$
// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
-#ifdef __GNUG__
-#pragma implementation "colour.h"
+#include "wx/colour.h"
+
+#ifndef WX_PRECOMP
+ #include "wx/gdicmn.h"
#endif
-#include "wx/gdicmn.h"
-#include "wx/colour.h"
-#include "wx/gtk/private.h"
+#include "wx/gtk1/private.h"
#include <gdk/gdk.h>
#include <gdk/gdkx.h>
m_color.blue = 0;
m_color.pixel = 0;
m_colormap = (GdkColormap *) NULL;
- m_hasPixel = FALSE;
+ m_hasPixel = false;
}
-
+
wxColourRefData(const wxColourRefData& data)
: wxObjectRefData()
{
m_hasPixel = data.m_hasPixel;
}
- ~wxColourRefData()
+ virtual ~wxColourRefData()
{
FreeColour();
}
m_color.blue == data.m_color.blue &&
m_color.pixel == data.m_color.pixel);
}
-
+
void FreeColour();
void AllocColour( GdkColormap* cmap );
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,
{
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
{
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 );
}
}
}
return;
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_hasPixel = gdk_colormap_alloc_color( cmap, &m_color, FALSE, TRUE );
int idx = m_color.pixel;
#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( 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 )
-{
- wxColour* col = NULL;
- if ( (wxTheColourDatabase) && (col = wxTheColourDatabase->FindColourNoAdd(colourName)) )
- {
- UnRef();
- if (col) Ref( *col );
- }
- 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") );
-
- 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;
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
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_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;
+ M_COLDATA->m_hasPixel = false;
}
unsigned char wxColour::Red() const
return &M_COLDATA->m_color;
}
+bool wxColour::FromString(const wxChar *str)
+{
+ GdkColor colGDK;
+ if ( gdk_color_parse( str, &colGDK ) )
+ {
+ UnRef();
+
+ m_refData = new wxColourRefData;
+ M_COLDATA->m_color = colGDK;
+ return true;
+ }
+ return wxColourBase::FromString(str);
+}
projects / wxWidgets.git / blobdiff