removed extra wxSTD

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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index 1d004de25f1b19ed1cf4392cb24781b01d54467f..4ce15385f763b66c2a5bccd84f6bd8d8219a95fa 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -15,6 +15,7 @@
 #include "wx/gdicmn.h"
 
 #include <gdk/gdk.h>
 #include "wx/gdicmn.h"
 
 #include <gdk/gdk.h>

+#include <gdk/gdkx.h>

 #include <gdk/gdkprivate.h>
 
 //-----------------------------------------------------------------------------
 #include <gdk/gdkprivate.h>
 
 //-----------------------------------------------------------------------------


@@ -23,12 +24,13 @@
 
 class wxColourRefData: public wxObjectRefData
 {
 
 class wxColourRefData: public wxObjectRefData
 {

-  public:
-
+public:

     wxColourRefData();
     ~wxColourRefData();
     wxColourRefData();
     ~wxColourRefData();

+

     void FreeColour();
 
     void FreeColour();
 

+public:

     GdkColor     m_color;
     GdkColormap *m_colormap;
     bool         m_hasPixel;
     GdkColor     m_color;
     GdkColormap *m_colormap;
     bool         m_hasPixel;


@@ -53,7 +55,22 @@ wxColourRefData::~wxColourRefData()
 
 void wxColourRefData::FreeColour()
 {
 
 void wxColourRefData::FreeColour()
 {

-//  if (m_hasPixel) gdk_colors_free( m_colormap, &m_color, 1, 0 );
+    if (m_colormap)
+    {
+#ifdef __WXGTK20__
+        if ((m_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
+            (m_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
+#else
+        GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) m_colormap;
+        if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
+            (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
+#endif
+        {
+            // What happens if the colour has not been allocated
+            // anew but has been found? RR.
+            gdk_colormap_free_colors( m_colormap, &m_color, 1 );
+        }
+    }

 }
 
 //-----------------------------------------------------------------------------
 }
 
 //-----------------------------------------------------------------------------


@@ -91,8 +108,15 @@ void wxColour::InitFromName( const wxString &colourName )
         m_refData = new wxColourRefData();
         if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color ))
         {
         m_refData = new wxColourRefData();
         if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color ))
         {

-            wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
-      
+            // VZ: asserts are good in general but this one is triggered by
+            //     calling wxColourDatabase::FindColour() with an
+            //     unrecognized colour name and this can't be avoided from the
+            //     user code, so don't give it here
+            //
+            //     a better solution would be to changed code in FindColour()
+
+            //wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
+

             delete m_refData;
             m_refData = (wxObjectRefData *) NULL;
         }
             delete m_refData;
             m_refData = (wxObjectRefData *) NULL;
         }


@@ -118,16 +142,16 @@ wxColour& wxColour::operator = ( const wxColour& col )
 bool wxColour::operator == ( const wxColour& col ) const
 {
     if (m_refData == col.m_refData) return TRUE;
 bool wxColour::operator == ( const wxColour& col ) const
 {
     if (m_refData == col.m_refData) return TRUE;

-    
+

     if (!m_refData) return FALSE;
     if (!col.m_refData) return FALSE;
     if (!m_refData) return FALSE;
     if (!col.m_refData) return FALSE;

-    
+

     GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
     GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
     if (own->red != other->red) return FALSE;
     if (own->blue != other->blue) return FALSE;
     if (own->green != other->green) return FALSE;
     GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
     GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
     if (own->red != other->red) return FALSE;
     if (own->blue != other->blue) return FALSE;
     if (own->green != other->green) return FALSE;

-    
+

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -177,31 +201,22 @@ void wxColour::CalcPixel( GdkColormap *cmap )
     if (!Ok()) return;
 
     if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
     if (!Ok()) return;
 
     if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;

-    
+

     M_COLDATA->FreeColour();
 
     M_COLDATA->FreeColour();
 

+#ifdef __WXGTK20__
+    if ((cmap->visual->type == GDK_VISUAL_GRAYSCALE) ||
+        (cmap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
+#else

     GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
     if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
         (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
     GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
     if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
         (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))

+#endif

     {
     {

-        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 = gdk_colormap_alloc_color( cmap, &M_COLDATA->m_color, FALSE, TRUE );

     }
     else
     }
     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 );
     }