Include wx/gauge.h according to precompiled headers of wx/wx.h (with other minor...

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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index 51fde80c114a5e9e1743c5170f3a5764fd1b57d0..bc76dbfe65f7e13c8b8e637953fd6efd2c1c8597 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        colour.cpp
+// Name:        src/gtk/colour.cpp

 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$
 // Purpose:
 // Author:      Robert Roebling
 // Id:          $Id$


@@ -7,15 +7,14 @@
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

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

 
 

-#ifdef __GNUG__
-#pragma implementation "colour.h"
-#endif
+#include "wx/colour.h"

 
 

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

 
 

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

 
 //-----------------------------------------------------------------------------
 // wxColour
 
 //-----------------------------------------------------------------------------
 // wxColour


@@ -23,204 +22,161 @@
 
 class wxColourRefData: public wxObjectRefData
 {
 
 class wxColourRefData: public wxObjectRefData
 {

-  public:
+public:
+    wxColourRefData()
+    {
+        m_color.red = 0;
+        m_color.green = 0;
+        m_color.blue = 0;
+        m_color.pixel = 0;
+        m_colormap = 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();
+    }

 
 

-    wxColourRefData();
-    ~wxColourRefData();

     void FreeColour();
     void FreeColour();

+    void AllocColour( GdkColormap* cmap );

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

-
-    friend wxColour;

 };
 
 };
 

-wxColourRefData::wxColourRefData()
+void wxColourRefData::FreeColour()

 {
 {

-    m_color.red = 0;
-    m_color.green = 0;
-    m_color.blue = 0;
-    m_color.pixel = 0;
-    m_colormap = (GdkColormap *) NULL;
-    m_hasPixel = FALSE;
+    if (m_hasPixel)
+    {
+        gdk_colormap_free_colors(m_colormap, &m_color, 1);
+    }

 }
 
 }
 

-wxColourRefData::~wxColourRefData()
+void wxColourRefData::AllocColour( GdkColormap *cmap )

 {
 {

+    if (m_hasPixel && (m_colormap == cmap))
+        return;
+

     FreeColour();
     FreeColour();

-}

 
 

-void wxColourRefData::FreeColour()
-{
-//  if (m_hasPixel) gdk_colors_free( m_colormap, &m_color, 1, 0 );
+    m_hasPixel = gdk_colormap_alloc_color(cmap, &m_color, FALSE, TRUE);
+    m_colormap = cmap;

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

-#define M_COLDATA ((wxColourRefData *)m_refData)
+#define M_COLDATA wx_static_cast(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)
 

-wxColour::wxColour()
+wxColour::~wxColour()

 {
 }
 
 {
 }
 

-wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
+bool wxColour::operator == ( const wxColour& col ) const

 {
 {

-    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;
-}
+    if (m_refData == col.m_refData)
+        return true;

 
 

-void wxColour::InitFromName( const wxString &colourName )
-{
-    wxNode *node = (wxNode *) NULL;
-    if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
-    {
-        wxColour *col = (wxColour*)node->Data();
-        UnRef();
-        if (col) Ref( *col );
-    }
-    else
-    {
-        m_refData = new wxColourRefData();
-        if (!gdk_color_parse( colourName.mb_str(), &M_COLDATA->m_color ))
-        {
-            wxFAIL_MSG( _T("wxColour: couldn't find colour") );
-           wxPrintf( _T("Colourname %s.\n"), WXSTRINGCAST colourName );
-      
-            delete m_refData;
-            m_refData = (wxObjectRefData *) NULL;
-        }
-    }
-}
+    if (!m_refData || !col.m_refData)
+        return false;

 
 

-wxColour::wxColour( const wxColour& col )
-{
-    Ref( col );
+    const GdkColor& own = M_COLDATA->m_color;
+    const GdkColor& other = wx_static_cast(wxColourRefData*, col.m_refData)->m_color;
+    return own.red == other.red &&
+           own.blue == other.blue &&
+           own.green == other.green;

 }
 
 }
 

-wxColour::~wxColour()
+wxObjectRefData *wxColour::CreateRefData() const

 {
 {

+    return new wxColourRefData;

 }
 
 }
 

-wxColour& wxColour::operator = ( const wxColour& col )
+wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const

 {
 {

-    if (*this == col) return (*this);
-    Ref( col );
-    return *this;
+    return new wxColourRefData(*(wxColourRefData *)data);

 }
 
 }
 

-bool wxColour::operator == ( const wxColour& col ) const
+void wxColour::InitWith( unsigned char red, unsigned char green, unsigned char blue )

 {
 {

-    if (m_refData == col.m_refData) return TRUE;
-    
-    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;
-    
-    return TRUE;
-}
+    AllocExclusive();

 
 

-bool wxColour::operator != ( const wxColour& col) const
-{
-    return m_refData != col.m_refData;
-}
-
-void wxColour::Set( unsigned char red, unsigned char green, unsigned char blue )
-{
-    UnRef();
-    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 = NULL;
+    M_COLDATA->m_hasPixel = false;

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

-    wxCHECK_MSG( Ok(), 0, _T("invalid colour") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );

 
     return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
 }
 
 unsigned char wxColour::Green() const
 {
 
     return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
 }
 
 unsigned char wxColour::Green() const
 {

-    wxCHECK_MSG( Ok(), 0, _T("invalid colour") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );

 
     return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
 }
 
 unsigned char wxColour::Blue() const
 {
 
     return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
 }
 
 unsigned char wxColour::Blue() const
 {

-    wxCHECK_MSG( Ok(), 0, _T("invalid colour") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );

 
     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;
 

-    if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
-    
-    M_COLDATA->FreeColour();
-
-    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;
-
-        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;
+    M_COLDATA->AllocColour( cmap );

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

-    wxCHECK_MSG( Ok(), 0, _T("invalid colour") );
+    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );

 
     return M_COLDATA->m_color.pixel;
 }
 
 GdkColor *wxColour::GetColor() const
 {
 
     return M_COLDATA->m_color.pixel;
 }
 
 GdkColor *wxColour::GetColor() const
 {

-    wxCHECK_MSG( Ok(), (GdkColor *) NULL, _T("invalid colour") );
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") );

 
     return &M_COLDATA->m_color;
 }
 
 
     return &M_COLDATA->m_color;
 }
 

+bool wxColour::FromString(const wxChar *str)
+{
+    GdkColor colGDK;
+    if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) )
+    {
+        UnRef();

 
 

+        m_refData = new wxColourRefData;
+        M_COLDATA->m_color = colGDK;
+        return true;
+    }
+
+    return wxColourBase::FromString(str);
+}