Removed redundant wxUniv setup.h

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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index 5c3e41d0153a4aca42c4ffe5be934dd8c3d2bf57..21d852e55d51f658d7a45ae4d15044008b0384ec 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -13,6 +13,7 @@
 #endif
 
 #include "wx/gdicmn.h"
 #endif
 
 #include "wx/gdicmn.h"

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

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


@@ -25,13 +26,42 @@
 class wxColourRefData: public wxObjectRefData
 {
 public:
 class wxColourRefData: public wxObjectRefData
 {
 public:

-    wxColourRefData();
-    ~wxColourRefData();
+    wxColourRefData()
+    {
+        m_color.red = 0;
+        m_color.green = 0;
+        m_color.blue = 0;
+        m_color.pixel = 0;
+        m_colormap = (GdkColormap *) NULL;
+        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();
+    }
+
+    bool operator == (const wxColourRefData& data) const
+    {
+        return (m_colormap == data.m_colormap &&
+                m_hasPixel == data.m_hasPixel &&
+                m_color.red == data.m_color.red &&
+                m_color.green == data.m_color.green &&
+                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 );
 

-public:

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


@@ -59,21 +89,6 @@ 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
 };
 

-wxColourRefData::wxColourRefData()
-{
-    m_color.red = 0;
-    m_color.green = 0;
-    m_color.blue = 0;
-    m_color.pixel = 0;
-    m_colormap = (GdkColormap *) NULL;
-    m_hasPixel = FALSE;
-}
-
-wxColourRefData::~wxColourRefData()
-{
-    FreeColour();
-}
-

 void wxColourRefData::FreeColour()
 {
     if (m_colormap)
 void wxColourRefData::FreeColour()
 {
     if (m_colormap)


@@ -104,8 +119,8 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
     FreeColour();
     
 #ifdef __WXGTK20__
     FreeColour();
     
 #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) ||


@@ -131,11 +146,6 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
 
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
 

-wxColour::wxColour()
-{
-    m_refData = new wxColourRefData();
-}
-

 wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
 {
     m_refData = new wxColourRefData();
 wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
 {
     m_refData = new wxColourRefData();


@@ -157,7 +167,8 @@ void wxColour::InitFromName( const wxString &colourName )
     else
     {
         m_refData = new wxColourRefData();
     else
     {
         m_refData = new wxColourRefData();

-        if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color ))
+        
+        if (!gdk_color_parse( wxGTK_CONV( colourName ), &M_COLDATA->m_color ))

         {
             // VZ: asserts are good in general but this one is triggered by
             //     calling wxColourDatabase::FindColour() with an
         {
             // VZ: asserts are good in general but this one is triggered by
             //     calling wxColourDatabase::FindColour() with an


@@ -174,28 +185,15 @@ void wxColour::InitFromName( const wxString &colourName )
     }
 }
 
     }
 }
 

-wxColour::wxColour( const wxColour& col )
-{
-    Ref( col );
-}
-

 wxColour::~wxColour()
 {
 }
 
 wxColour::~wxColour()
 {
 }
 

-wxColour& wxColour::operator = ( const wxColour& col )
-{
-    if (*this == col) return (*this);
-    Ref( col );
-    return *this;
-}
-

 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 || !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);


@@ -206,19 +204,27 @@ bool wxColour::operator == ( const wxColour& col ) const
     return TRUE;
 }
 
     return TRUE;
 }
 

-bool wxColour::operator != ( const wxColour& col) const
+wxObjectRefData *wxColour::CreateRefData() const

 {
 {

-    return !(*this == col);
+    return new wxColourRefData;
+}
+
+wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const
+{
+    return new wxColourRefData(*(wxColourRefData *)data);

 }
 
 void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
 {
 }
 
 void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
 {

-    UnRef();
-    m_refData = new wxColourRefData();
+    AllocExclusive();
+    

     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


@@ -242,11 +248,6 @@ unsigned char wxColour::Blue() const
     return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
 }
 
     return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
 }
 

-bool wxColour::Ok() const
-{
-    return (m_refData != NULL);
-}
-

 void wxColour::CalcPixel( GdkColormap *cmap )
 {
     if (!Ok()) return;
 void wxColour::CalcPixel( GdkColormap *cmap )
 {
     if (!Ok()) return;