X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1ecc4d808e6100aefda0f4097beeefeeab475ddd..9f3362c440ef4c780d9a4bc8089de60a21d108bd:/src/gtk1/colour.cpp diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp index 74e414ef03..a3292d450d 100644 --- a/src/gtk1/colour.cpp +++ b/src/gtk1/colour.cpp @@ -14,6 +14,7 @@ #include "wx/gdicmn.h" +#include "gdk/gdk.h" #include "gdk/gdkprivate.h" //----------------------------------------------------------------------------- @@ -168,26 +169,26 @@ void wxColour::CalcPixel( GdkColormap *cmap ) if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return; M_COLDATA->FreeColour(); - GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap; - if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) || - (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR)) - { - GdkColor *colors = cmap->colors; - int max = 3 * (65536); - int index = -1; - - for (int i = 0; i < cmap->size; i++) + GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap; + if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) || + (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR)) { - int rdiff = (M_COLDATA->m_color.red - colors[i].red); - int gdiff = (M_COLDATA->m_color.green - colors[i].green); - int bdiff = (M_COLDATA->m_color.blue - colors[i].blue); - int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff); - if (sum < max) { index = i; max = sum; } - } + GdkColor *colors = cmap->colors; + int max = 3 * (65536); + int index = -1; + + for (int i = 0; i < cmap->size; i++) + { + int rdiff = (M_COLDATA->m_color.red - colors[i].red); + int gdiff = (M_COLDATA->m_color.green - colors[i].green); + int bdiff = (M_COLDATA->m_color.blue - colors[i].blue); + int sum = ABS (rdiff) + ABS (gdiff) + ABS (bdiff); + if (sum < max) { index = i; max = sum; } + } - M_COLDATA->m_hasPixel = TRUE; - M_COLDATA->m_color.pixel = index; - } + M_COLDATA->m_hasPixel = TRUE; + M_COLDATA->m_color.pixel = index; + } else { M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );