The usual amount of trash over my telephone fixed

[wxWidgets.git] / src / gtk / colour.cpp

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index c9a925530156af4cb0b983bed9609ba1c904bb0c..a3292d450daafb1ba65df6aeddad52eacd5a3c63 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -169,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;
 
-    M_COLDATA->m_hasPixel = TRUE;
-    M_COLDATA->m_color.pixel = index;
-  }
+        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;
+    }
     else
     { 
         M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );