X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3b9faf4c54ca224459491845be8af3edddd7e00e..89c831801467203372b6964a785823f19e8063dd:/src/gtk/colour.cpp diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index ebb55bb7b0..2b63a69a0c 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,16 +7,11 @@ // 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/gdicmn.h" #include "wx/gtk/private.h" #include @@ -110,7 +105,7 @@ void wxColourRefData::FreeColour() 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 ); } } } @@ -124,7 +119,7 @@ void wxColourRefData::AllocColour( GdkColormap *cmap ) #ifdef __WXGTK20__ if ( (cmap->visual->type == GDK_VISUAL_GRAYSCALE) || - (cmap->visual->type == GDK_VISUAL_PSEUDO_COLOR) ) + (cmap->visual->type == GDK_VISUAL_PSEUDO_COLOR) ) #else GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap; if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) || @@ -284,5 +279,3 @@ GdkColor *wxColour::GetColor() const return &M_COLDATA->m_color; } - -