fixes

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

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index f9d2fa62a28677e473058f23fbc4892e7051c3c0..09479c1230fb276307061b36be1391825c48cc39 100644 (file)
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -2,9 +2,8 @@
 // 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
 /////////////////////////////////////////////////////////////////////////////
 
@@ -15,9 +14,7 @@
 
 #include "wx/gdicmn.h"
 
-#ifdef USE_GDK_IMLIB
-#include "../gdk_imlib/gdk_imlib.h"
-#endif
+#include "gdk/gdkprivate.h"
 
 //-----------------------------------------------------------------------------
 // wxColour
@@ -27,9 +24,9 @@ class wxColourRefData: public wxObjectRefData
 {
   public:
   
-    wxColourRefData(void);
-    ~wxColourRefData(void);
-    void FreeColour(void);
+    wxColourRefData();
+    ~wxColourRefData();
+    void FreeColour();
   
     GdkColor     m_color;
     GdkColormap *m_colormap;
@@ -38,7 +35,7 @@ class wxColourRefData: public wxObjectRefData
     friend wxColour;
 };
 
-wxColourRefData::wxColourRefData(void)
+wxColourRefData::wxColourRefData()
 {
   m_color.red = 0;
   m_color.green = 0;
@@ -48,12 +45,12 @@ wxColourRefData::wxColourRefData(void)
   m_hasPixel = FALSE;
 }
 
-wxColourRefData::~wxColourRefData(void)
+wxColourRefData::~wxColourRefData()
 {
   FreeColour();
 }
 
-void wxColourRefData::FreeColour(void)
+void wxColourRefData::FreeColour()
 {
 //  if (m_hasPixel) gdk_colors_free( m_colormap, &m_color, 1, 0 );
 }
@@ -66,11 +63,11 @@ void wxColourRefData::FreeColour(void)
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
 
-wxColour::wxColour(void)
+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;
@@ -79,7 +76,7 @@ wxColour::wxColour( char red, char green, char blue )
   M_COLDATA->m_color.pixel = 0;
 }
   
-wxColour::wxColour( const wxString &colourName )
+void wxColour::InitFromName( const wxString &colourName )
 {
   wxNode *node = (wxNode *) NULL;
   if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) ) 
@@ -110,7 +107,7 @@ wxColour::wxColour( const wxColour* col )
   if (col) Ref( *col ); 
 }
 
-wxColour::~wxColour(void)
+wxColour::~wxColour()
 {
 }
 
@@ -121,28 +118,6 @@ wxColour& wxColour::operator = ( const wxColour& col )
   return *this; 
 }
 
-wxColour& wxColour::operator = ( const wxString& colourName ) 
-{ 
-  UnRef();
-  wxNode *node = (wxNode *) NULL;
-  if ((wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) ) 
-  {
-    wxColour *col = (wxColour*)node->Data();
-    if (col) Ref( *col );
-  } 
-  else 
-  {
-    m_refData = new wxColourRefData();
-    if (!gdk_color_parse( colourName, &M_COLDATA->m_color ))
-    {
-      wxFAIL_MSG( "wxColour: couldn't find colour" );
-      delete m_refData;
-      m_refData = (wxObjectRefData *) NULL;
-    }
-  }
-  return *this; 
-}
-
 bool wxColour::operator == ( const wxColour& col ) 
 { 
   return m_refData == col.m_refData; 
@@ -153,7 +128,7 @@ 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();
@@ -163,27 +138,42 @@ void wxColour::Set( const unsigned char red, const unsigned char green, const un
   M_COLDATA->m_color.pixel = 0;
 }
 
-unsigned char wxColour::Red(void) const
+unsigned char wxColour::Red() const
 {
-  if (!Ok()) return 0;
+  if (!Ok())
+  {
+     wxFAIL_MSG( "invalid colour" );
+     return 0;
+  }
+  
   return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
 }
 
-unsigned char wxColour::Green(void) const
+unsigned char wxColour::Green() const
 {
-  if (!Ok()) return 0;
+  if (!Ok())
+  {
+     wxFAIL_MSG( "invalid colour" );
+     return 0;
+  }
+  
   return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
 }
 
-unsigned char wxColour::Blue(void) const
+unsigned char wxColour::Blue() const
 {
-  if (!Ok()) return 0;
+  if (!Ok())
+  {
+     wxFAIL_MSG( "invalid colour" );
+     return 0;
+  }
+  
   return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
 }
 
-bool wxColour::Ok(void) const
+bool wxColour::Ok() const
 {
-  return (m_refData);
+  return (m_refData != NULL);
 }
 
 void wxColour::CalcPixel( GdkColormap *cmap )
@@ -193,31 +183,42 @@ void wxColour::CalcPixel( GdkColormap *cmap )
   if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
   M_COLDATA->FreeColour();
   
-#ifdef USE_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;
 }
 
-int wxColour::GetPixel(void)
+int wxColour::GetPixel() const
 {
   if (!Ok()) return 0;
   
   return M_COLDATA->m_color.pixel;
 }
 
-GdkColor *wxColour::GetColor(void)
+GdkColor *wxColour::GetColor() const
 {
   if (!Ok()) return (GdkColor *) NULL;