workaroung for handling problems because groupboxes are not included in the parent...

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

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index a54ca5fdac5109e3721a738e5ee42e117d4f1353..9ac38bff4b5822e4d2410677ece6a46eea99ed84 100644 (file)
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -27,8 +27,9 @@ class wxColourRefData: public wxObjectRefData
 public:
     wxColourRefData();
     ~wxColourRefData();
 public:
     wxColourRefData();
     ~wxColourRefData();

-    
+

     void FreeColour();
     void FreeColour();

+    void AllocColour( GdkColormap* cmap );

 
 public:
     GdkColor     m_color;
 
 public:
     GdkColor     m_color;


@@ -36,6 +37,26 @@ public:
     bool         m_hasPixel;
 
     friend class wxColour;
     bool         m_hasPixel;
 
     friend class wxColour;

+
+    // reference counter for systems with <= 8-Bit display
+    static gushort colMapAllocCounter[ 256 ];
+};
+
+gushort wxColourRefData::colMapAllocCounter[ 256 ] = 
+{  
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0

 };
 
 wxColourRefData::wxColourRefData()
 };
 
 wxColourRefData::wxColourRefData()


@@ -66,13 +87,42 @@ void wxColourRefData::FreeColour()
             (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
 #endif
         {
             (private_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
 #endif
         {

-            // What happens if the colour has not been allocated
-            // anew but has been found? RR.
+            int idx = m_color.pixel;
+            colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1;
+        
+            if (colMapAllocCounter[ idx ] == 0)

             gdk_colormap_free_colors( m_colormap, &m_color, 1 );
         }
     }
 }
 
             gdk_colormap_free_colors( m_colormap, &m_color, 1 );
         }
     }
 }
 

+void wxColourRefData::AllocColour( GdkColormap *cmap )
+{
+    if (m_hasPixel && (m_colormap == cmap))
+        return;
+
+    FreeColour();
+    
+#ifdef __WXGTK20__
+    if ((m_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
+       (m_colormap->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))
+#endif
+    {
+        m_hasPixel = gdk_colormap_alloc_color( cmap, &m_color, FALSE, TRUE );
+        int idx = m_color.pixel;
+        colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] + 1;
+    }
+    else
+    {
+        m_hasPixel = gdk_color_alloc( cmap, &m_color );
+    }
+    m_colormap = cmap;
+}
+

 //-----------------------------------------------------------------------------
 
 #define M_COLDATA ((wxColourRefData *)m_refData)
 //-----------------------------------------------------------------------------
 
 #define M_COLDATA ((wxColourRefData *)m_refData)


@@ -108,8 +158,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;
         }


@@ -135,16 +192,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;
 }
 


@@ -193,27 +250,7 @@ void wxColour::CalcPixel( GdkColormap *cmap )
 {
     if (!Ok()) return;
 
 {
     if (!Ok()) return;
 

-    if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
-    
-    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))
-#endif
-    {
-        M_COLDATA->m_hasPixel = gdk_colormap_alloc_color( cmap, &M_COLDATA->m_color, FALSE, TRUE );
-    }
-    else
-    { 
-        M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );
-    }
-
-    M_COLDATA->m_colormap = cmap;
+    M_COLDATA->AllocColour( cmap );

 }
 
 int wxColour::GetPixel() const
 }
 
 int wxColour::GetPixel() const