X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c67daf87774c71ae9f73af9969008af220e52a11..c10f20703e5b4e9c605b908f480b863c89ca31ee:/src/gtk1/colour.cpp?ds=sidebyside

diff --git a/src/gtk1/colour.cpp b/src/gtk1/colour.cpp
index f9d2fa62a2..a54ca5fdac 100644
--- a/src/gtk1/colour.cpp
+++ b/src/gtk1/colour.cpp
@@ -2,10 +2,9 @@
 // Name:        colour.cpp
 // Purpose:
 // Author:      Robert Roebling
-// Created:     01/02/97
-// Id:
-// Copyright:   (c) 1998 Robert Roebling, Julian Smart and Markus Holzem
-// Licence:   	wxWindows licence
+// Id:          $Id$
+// Copyright:   (c) 1998 Robert Roebling
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 
@@ -15,9 +14,9 @@
 
 #include "wx/gdicmn.h"
 
-#ifdef USE_GDK_IMLIB
-#include "../gdk_imlib/gdk_imlib.h"
-#endif
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <gdk/gdkprivate.h>
 
 //-----------------------------------------------------------------------------
 // wxColour
@@ -25,37 +24,53 @@
 
 class wxColourRefData: public wxObjectRefData
 {
-  public:
-  
-    wxColourRefData(void);
-    ~wxColourRefData(void);
-    void FreeColour(void);
-  
+public:
+    wxColourRefData();
+    ~wxColourRefData();
+    
+    void FreeColour();
+
+public:
     GdkColor     m_color;
     GdkColormap *m_colormap;
     bool         m_hasPixel;
-    
-    friend wxColour;
+
+    friend class wxColour;
 };
 
-wxColourRefData::wxColourRefData(void)
+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;
+    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(void)
+wxColourRefData::~wxColourRefData()
 {
-  FreeColour();
+    FreeColour();
 }
 
-void wxColourRefData::FreeColour(void)
+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 );
+        }
+    }
 }
 
 //-----------------------------------------------------------------------------
@@ -66,162 +81,153 @@ void wxColourRefData::FreeColour(void)
 
 IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
 
-wxColour::wxColour(void)
+wxColour::wxColour()
 {
 }
 
-wxColour::wxColour( char red, char green, char blue )
+wxColour::wxColour( unsigned char red, unsigned char green, unsigned char blue )
 {
-  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_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;
 }
-  
-wxColour::wxColour( const wxString &colourName )
+
+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, &M_COLDATA->m_color ))
+    wxNode *node = (wxNode *) NULL;
+    if ( (wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) )
     {
-      wxFAIL_MSG( "wxColour: couldn't find colour" );
-      delete m_refData;
-      m_refData = (wxObjectRefData *) NULL;
+        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( wxT("wxColour: couldn't find colour") );
+      
+            delete m_refData;
+            m_refData = (wxObjectRefData *) NULL;
+        }
     }
-  }
 }
 
 wxColour::wxColour( const wxColour& col )
-{ 
-  Ref( col ); 
-}
-
-wxColour::wxColour( const wxColour* col ) 
-{ 
-  if (col) Ref( *col ); 
-}
-
-wxColour::~wxColour(void)
 {
+    Ref( col );
 }
 
-wxColour& wxColour::operator = ( const wxColour& col ) 
-{ 
-  if (*this == col) return (*this); 
-  Ref( col ); 
-  return *this; 
+wxColour::~wxColour()
+{
 }
 
-wxColour& wxColour::operator = ( const wxString& colourName ) 
-{ 
-  UnRef();
-  wxNode *node = (wxNode *) NULL;
-  if ((wxTheColourDatabase) && (node = wxTheColourDatabase->Find(colourName)) ) 
-  {
-    wxColour *col = (wxColour*)node->Data();
-    if (col) Ref( *col );
-  } 
-  else 
-  {
-    m_refData = new wxColourRefData();
-    if (!gdk_color_parse( colourName, &M_COLDATA->m_color ))
-    {
-      wxFAIL_MSG( "wxColour: couldn't find colour" );
-      delete m_refData;
-      m_refData = (wxObjectRefData *) NULL;
-    }
-  }
-  return *this; 
+wxColour& wxColour::operator = ( const wxColour& col )
+{
+    if (*this == col) return (*this);
+    Ref( col );
+    return *this;
 }
 
-bool wxColour::operator == ( const wxColour& col ) 
-{ 
-  return m_refData == col.m_refData; 
+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;
+    
+    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;
 }
 
-bool wxColour::operator != ( const wxColour& col) 
-{ 
-  return m_refData != col.m_refData; 
+bool wxColour::operator != ( const wxColour& col) const
+{
+    return !(*this == col);
 }
 
-void wxColour::Set( const unsigned char red, const unsigned char green, const unsigned char blue )
+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;
+    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;
 }
 
-unsigned char wxColour::Red(void) const
+unsigned char wxColour::Red() const
 {
-  if (!Ok()) return 0;
-  return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
+    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+
+    return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
 }
 
-unsigned char wxColour::Green(void) const
+unsigned char wxColour::Green() const
 {
-  if (!Ok()) return 0;
-  return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
+    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+
+    return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
 }
 
-unsigned char wxColour::Blue(void) const
+unsigned char wxColour::Blue() const
 {
-  if (!Ok()) return 0;
-  return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
+    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+
+    return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
 }
 
-bool wxColour::Ok(void) const
+bool wxColour::Ok() const
 {
-  return (m_refData);
+    return (m_refData != NULL);
 }
 
 void wxColour::CalcPixel( GdkColormap *cmap )
 {
-  if (!Ok()) return;
-  
-  if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
-  M_COLDATA->FreeColour();
-  
-#ifdef USE_GDK_IMLIB
+    if (!Ok()) return;
 
-  int r = M_COLDATA->m_color.red >> SHIFT;
-  int g = M_COLDATA->m_color.green >> SHIFT;
-  int b = M_COLDATA->m_color.blue >> SHIFT;
-  M_COLDATA->m_hasPixel = TRUE;
-  M_COLDATA->m_color.pixel = gdk_imlib_best_color_match( &r, &g, &b );
+    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
-
-  M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );
-  
+    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_colormap = cmap;
+    {
+        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;
 }
 
-int wxColour::GetPixel(void)
+int wxColour::GetPixel() const
 {
-  if (!Ok()) return 0;
-  
-  return M_COLDATA->m_color.pixel;
+    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+
+    return M_COLDATA->m_color.pixel;
 }
 
-GdkColor *wxColour::GetColor(void)
+GdkColor *wxColour::GetColor() const
 {
-  if (!Ok()) return (GdkColor *) NULL;
-  
-  return &M_COLDATA->m_color;
+    wxCHECK_MSG( Ok(), (GdkColor *) NULL, wxT("invalid colour") );
+
+    return &M_COLDATA->m_color;
 }