CalcBoundingBox() added so that Max() works in wxDC

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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index b7c2dc11769cb2ecbe33d9cc1c42db048b32200b..09479c1230fb276307061b36be1391825c48cc39 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -2,9 +2,8 @@
 // Name:        colour.cpp
 // Purpose:
 // Author:      Robert Roebling
 // Name:        colour.cpp
 // Purpose:
 // Author:      Robert Roebling

-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling

 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:    wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -15,9 +14,7 @@
 
 #include "wx/gdicmn.h"
 
 
 #include "wx/gdicmn.h"
 

-#ifdef wxUSE_GDK_IMLIB
-#include "../gdk_imlib/gdk_imlib.h"
-#endif
+#include "gdk/gdkprivate.h"

 
 //-----------------------------------------------------------------------------
 // wxColour
 
 //-----------------------------------------------------------------------------
 // wxColour


@@ -70,7 +67,7 @@ wxColour::wxColour()
 {
 }
 
 {
 }
 

-wxColour::wxColour( char red, char green, char blue )
+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_refData = new wxColourRefData();
   M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;


@@ -131,7 +128,7 @@ bool wxColour::operator != ( const wxColour& col)
   return m_refData != col.m_refData; 
 }
 
   return m_refData != col.m_refData; 
 }
 

-void wxColour::Set( const unsigned char red, const unsigned char green, const unsigned char blue )
+void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )

 {
   UnRef();
   m_refData = new wxColourRefData();
 {
   UnRef();
   m_refData = new wxColourRefData();


@@ -186,19 +183,30 @@ void wxColour::CalcPixel( GdkColormap *cmap )
   if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
   M_COLDATA->FreeColour();
   
   if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
   M_COLDATA->FreeColour();
   

-#ifdef wxUSE_GDK_IMLIB
-
-  int r = M_COLDATA->m_color.red >> SHIFT;
-  int g = M_COLDATA->m_color.green >> SHIFT;
-  int b = M_COLDATA->m_color.blue >> SHIFT;
-  M_COLDATA->m_hasPixel = TRUE;
-  M_COLDATA->m_color.pixel = gdk_imlib_best_color_match( &r, &g, &b );
-
-#else
+  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;

 
 

-  M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );
-  
-#endif
+    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 );
+  }

   
   M_COLDATA->m_colormap = cmap;
 }
   
   M_COLDATA->m_colormap = cmap;
 }