more GetDefaultAttributesFromGTKWidget fixes

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

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index 8ee81076b50c2e2492ccbc76742f9b1dbad43892..ebb55bb7b01f4fbea09cc3cd74f146773699d6f9 100644 (file)
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -8,11 +8,16 @@
 /////////////////////////////////////////////////////////////////////////////
 
 
 /////////////////////////////////////////////////////////////////////////////
 
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #pragma implementation "colour.h"
 #endif
 
 #pragma implementation "colour.h"
 #endif
 

+// For compilers that support precompilation, includes "wx.h".
+#include "wx/wxprec.h"
+

 #include "wx/gdicmn.h"
 #include "wx/gdicmn.h"

+#include "wx/colour.h"
+#include "wx/gtk/private.h"

 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>


@@ -32,9 +37,17 @@ public:
         m_color.blue = 0;
         m_color.pixel = 0;
         m_colormap = (GdkColormap *) NULL;
         m_color.blue = 0;
         m_color.pixel = 0;
         m_colormap = (GdkColormap *) NULL;

-        m_hasPixel = FALSE;
+        m_hasPixel = false;
+    }
+
+    wxColourRefData(const wxColourRefData& data)
+        : wxObjectRefData()
+    {
+        m_color = data.m_color;
+        m_colormap = data.m_colormap;
+        m_hasPixel = data.m_hasPixel;

     }
     }

-    
+

     ~wxColourRefData()
     {
         FreeColour();
     ~wxColourRefData()
     {
         FreeColour();


@@ -49,7 +62,7 @@ public:
                 m_color.blue == data.m_color.blue &&
                 m_color.pixel == data.m_color.pixel);
     }
                 m_color.blue == data.m_color.blue &&
                 m_color.pixel == data.m_color.pixel);
     }

-    
+

     void FreeColour();
     void AllocColour( GdkColormap* cmap );
 
     void FreeColour();
     void AllocColour( GdkColormap* cmap );
 


@@ -63,8 +76,8 @@ public:
     static gushort colMapAllocCounter[ 256 ];
 };
 
     static gushort colMapAllocCounter[ 256 ];
 };
 

-gushort wxColourRefData::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,


@@ -95,7 +108,7 @@ void wxColourRefData::FreeColour()
         {
             int idx = m_color.pixel;
             colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1;
         {
             int idx = m_color.pixel;
             colMapAllocCounter[ idx ] = colMapAllocCounter[ idx ] - 1;

-        
+

             if (colMapAllocCounter[ idx ] == 0)
             gdk_colormap_free_colors( m_colormap, &m_color, 1 );
         }
             if (colMapAllocCounter[ idx ] == 0)
             gdk_colormap_free_colors( m_colormap, &m_color, 1 );
         }


@@ -108,10 +121,10 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
         return;
 
     FreeColour();
         return;
 
     FreeColour();

-    
+

 #ifdef __WXGTK20__
 #ifdef __WXGTK20__

-    if ((m_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||
-       (m_colormap->visual->type == GDK_VISUAL_PSEUDO_COLOR))
+    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) ||
 #else
     GdkColormapPrivate *private_colormap = (GdkColormapPrivate*) cmap;
     if ((private_colormap->visual->type == GDK_VISUAL_GRAYSCALE) ||


@@ -133,7 +146,8 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
 
 #define M_COLDATA ((wxColourRefData *)m_refData)
 
 
 #define M_COLDATA ((wxColourRefData *)m_refData)
 

-#define SHIFT (8*(sizeof(short int)-sizeof(char)))
+// GDK's values are in 0..65535 range, our are in 0..255
+#define SHIFT  8

 
 IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
 


@@ -146,32 +160,44 @@ wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
     M_COLDATA->m_color.pixel = 0;
 }
 
     M_COLDATA->m_color.pixel = 0;
 }
 

-void wxColour::InitFromName( const wxString &colourName )
+/* static */
+wxColour wxColour::CreateByName(const wxString& name)

 {
 {

-    wxNode *node = (wxNode *) NULL;
-    if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
+    wxColour col;
+
+    GdkColor colGDK;
+    if ( gdk_color_parse( wxGTK_CONV( name ), &colGDK ) )

     {
     {

-        wxColour *col = (wxColour*)node->Data();
-        UnRef();
-        if (col) Ref( *col );
+        wxColourRefData *refData = new wxColourRefData;
+        refData->m_color = colGDK;
+        col.m_refData = refData;

     }
     }

-    else
+
+    return col;
+}
+
+
+void wxColour::InitFromName( const wxString &colourName )
+{
+    // check the cache first
+    wxColour col;
+    if ( wxTheColourDatabase )

     {
     {

-        m_refData = new wxColourRefData();
-        if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color ))
-        {
-            // 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()
+        col = wxTheColourDatabase->Find(colourName);
+    }

 
 

-            //wxFAIL_MSG( wxT("wxColour: couldn't find colour") );
+    if ( !col.Ok() )
+    {
+        col = CreateByName(colourName);
+    }

 
 

-            delete m_refData;
-            m_refData = (wxObjectRefData *) NULL;
-        }
+    if ( col.Ok() )
+    {
+        *this = col;
+    }
+    else
+    {
+        wxFAIL_MSG( wxT("wxColour: couldn't find colour") );

     }
 }
 
     }
 }
 


@@ -181,17 +207,17 @@ wxColour::~wxColour()
 
 bool wxColour::operator == ( const wxColour& col ) const
 {
 
 bool wxColour::operator == ( const wxColour& col ) const
 {

-    if (m_refData == col.m_refData) return TRUE;
+    if (m_refData == col.m_refData)
+        return true;

 
 

-    if (!m_refData || !col.m_refData) return FALSE;
+    if (!m_refData || !col.m_refData)
+        return false;

 
     GdkColor *own = &(((wxColourRefData*)m_refData)->m_color);
     GdkColor *other = &(((wxColourRefData*)col.m_refData)->m_color);
 
     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 own->red == other->red &&
+                own->blue == other->blue &&
+                     own->green == other->green;

 }
 
 wxObjectRefData *wxColour::CreateRefData() const
 }
 
 wxObjectRefData *wxColour::CreateRefData() const


@@ -207,12 +233,14 @@ wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const
 void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
 {
     AllocExclusive();
 void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
 {
     AllocExclusive();

-    
-    m_refData = new wxColourRefData();
+

     M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
     M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
     M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
     M_COLDATA->m_color.pixel = 0;
     M_COLDATA->m_color.red = ((unsigned short)red) << SHIFT;
     M_COLDATA->m_color.green = ((unsigned short)green) << SHIFT;
     M_COLDATA->m_color.blue = ((unsigned short)blue) << SHIFT;
     M_COLDATA->m_color.pixel = 0;

+
+    M_COLDATA->m_colormap = (GdkColormap*) NULL;
+    M_COLDATA->m_hasPixel = false;

 }
 
 unsigned char wxColour::Red() const
 }
 
 unsigned char wxColour::Red() const