Dialog Editor corrections for latest wxWin changes; removed wxProp files

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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index b7c2dc11769cb2ecbe33d9cc1c42db048b32200b..526ef176361539c5768e82964e55967ecc04cfe0 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -2,10 +2,9 @@
 // Name:        colour.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:    wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -15,9 +14,7 @@
 
 #include "wx/gdicmn.h"
 
-#ifdef wxUSE_GDK_IMLIB
-#include "../gdk_imlib/gdk_imlib.h"
-#endif
+#include "gdk/gdkprivate.h"
 
 //-----------------------------------------------------------------------------
 // wxColour
@@ -26,15 +23,15 @@
 class wxColourRefData: public wxObjectRefData
 {
   public:
-  
+
     wxColourRefData();
     ~wxColourRefData();
     void FreeColour();
-  
+
     GdkColor     m_color;
     GdkColormap *m_colormap;
     bool         m_hasPixel;
-    
+
     friend 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;
@@ -78,17 +75,17 @@ wxColour::wxColour( char red, char green, char blue )
   M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
   M_COLDATA->m_color.pixel = 0;
 }
-  
+
 void wxColour::InitFromName( const wxString &colourName )
 {
   wxNode *node = (wxNode *) NULL;
-  if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) ) 
+  if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
   {
     wxColour *col = (wxColour*)node->Data();
     UnRef();
     if (col) Ref( *col );
-  } 
-  else 
+  }
+  else
   {
     m_refData = new wxColourRefData();
     if (!gdk_color_parse( colourName, &M_COLDATA->m_color ))
@@ -101,37 +98,32 @@ void wxColour::InitFromName( const wxString &colourName )
 }
 
 wxColour::wxColour( const wxColour& col )
-{ 
-  Ref( col ); 
-}
-
-wxColour::wxColour( const wxColour* col ) 
-{ 
-  if (col) Ref( *col ); 
+{
+  Ref( col );
 }
 
 wxColour::~wxColour()
 {
 }
 
-wxColour& wxColour::operator = ( const wxColour& col ) 
-{ 
-  if (*this == col) return (*this); 
-  Ref( col ); 
-  return *this; 
+wxColour& wxColour::operator = ( const wxColour& col )
+{
+  if (*this == col) return (*this);
+  Ref( col );
+  return *this;
 }
 
-bool wxColour::operator == ( const wxColour& col ) 
-{ 
-  return m_refData == col.m_refData; 
+bool wxColour::operator == ( const wxColour& col )
+{
+  return m_refData == col.m_refData;
 }
 
-bool wxColour::operator != ( const wxColour& col) 
-{ 
-  return m_refData != col.m_refData; 
+bool wxColour::operator != ( const wxColour& col)
+{
+  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();
@@ -148,7 +140,7 @@ unsigned char wxColour::Red() const
      wxFAIL_MSG( "invalid colour" );
      return 0;
   }
-  
+
   return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
 }
 
@@ -159,7 +151,7 @@ unsigned char wxColour::Green() const
      wxFAIL_MSG( "invalid colour" );
      return 0;
   }
-  
+
   return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
 }
 
@@ -170,7 +162,7 @@ unsigned char wxColour::Blue() const
      wxFAIL_MSG( "invalid colour" );
      return 0;
   }
-  
+
   return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
 }
 
@@ -182,38 +174,49 @@ bool wxColour::Ok() const
 void wxColour::CalcPixel( GdkColormap *cmap )
 {
   if (!Ok()) return;
-  
+
   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 );
+  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;
 
-#else
+    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_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );
-  
-#endif
-  
   M_COLDATA->m_colormap = cmap;
 }
 
 int wxColour::GetPixel() const
 {
   if (!Ok()) return 0;
-  
+
   return M_COLDATA->m_color.pixel;
 }
 
 GdkColor *wxColour::GetColor() const
 {
   if (!Ok()) return (GdkColor *) NULL;
-  
+
   return &M_COLDATA->m_color;
 }