X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aad6765cbd8916ddeb0362b091663138c2e74df3..122d1d563a3b2c797e00dd1032d178735e84f300:/src/gtk1/colour.cpp diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp index 98946e1649..c84141bd0a 100644 --- a/src/gtk1/colour.cpp +++ b/src/gtk1/colour.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: colour.cpp +// Name: src/gtk1/colour.cpp // Purpose: // Author: Robert Roebling // Id: $Id$ @@ -7,17 +7,12 @@ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// - -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma implementation "colour.h" -#endif - // For compilers that support precompilation, includes "wx.h". #include "wx/wxprec.h" -#include "wx/gdicmn.h" #include "wx/colour.h" -#include "wx/gtk/private.h" +#include "wx/gdicmn.h" +#include "wx/gtk1/private.h" #include #include @@ -97,20 +92,15 @@ 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 { 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 ); } } } @@ -122,14 +112,9 @@ void wxColourRefData::AllocColour( GdkColormap *cmap ) 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; @@ -146,7 +131,8 @@ void wxColourRefData::AllocColour( GdkColormap *cmap ) #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) @@ -283,5 +269,3 @@ GdkColor *wxColour::GetColor() const return &M_COLDATA->m_color; } - -