Fix a number of mingw compile errors.

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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index 13f981ebf2c7bd7f97fe8b55b6ec289d06b46d20..322689db99e61c7ae036dfe379279152bc5c9afe 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -1,242 +1,187 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

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

 // Purpose:
 // Author:      Robert Roebling
 // 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

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

+// 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"

 
 

-#ifdef wxUSE_GDK_IMLIB
-#include "../gdk_imlib/gdk_imlib.h"
-#endif
+#include <gdk/gdk.h>

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

-class wxColourRefData: public wxObjectRefData
+class wxColourRefData : public wxGDIRefData

 {
 {

-  public:
-  
-    wxColourRefData(void);
-    ~wxColourRefData(void);
-    void FreeColour(void);
-  
+public:
+    wxColourRefData(guint16 red, guint16 green, guint16 blue, wxByte alpha = 0xff)
+    {
+        m_color.red =
+        m_red = red;
+        m_color.green =
+        m_green = green;
+        m_color.blue =
+        m_blue = blue;
+        m_alpha = alpha;
+        m_color.pixel = 0;
+        m_colormap = NULL;
+    }
+
+    virtual ~wxColourRefData()
+    {
+        FreeColour();
+    }
+
+    void FreeColour();
+    void AllocColour( GdkColormap* cmap );
+

     GdkColor     m_color;
     GdkColormap *m_colormap;
     GdkColor     m_color;
     GdkColormap *m_colormap;

-    bool         m_hasPixel;
-    
-    friend wxColour;
-};
+    // gdk_colormap_alloc_color may change the RGB values in m_color, so we need separate copies
+    guint16 m_red;
+    guint16 m_green;
+    guint16 m_blue;
+    wxByte m_alpha;

 
 

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

 
 

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

 {
 {

-  FreeColour();
+    if (m_colormap)
+    {
+        gdk_colormap_free_colors(m_colormap, &m_color, 1);
+        m_colormap = NULL;
+        m_color.pixel = 0;
+    }

 }
 
 }
 

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

 {
 {

-//  if (m_hasPixel) gdk_colors_free( m_colormap, &m_color, 1, 0 );
+    if (m_colormap != cmap)
+    {
+        FreeColour();
+
+        m_color.red = m_red;
+        m_color.green = m_green;
+        m_color.blue = m_blue;
+        if (gdk_colormap_alloc_color(cmap, &m_color, FALSE, TRUE))
+        {
+            m_colormap = cmap;
+        }
+    }

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

-#define M_COLDATA ((wxColourRefData *)m_refData)
-
-#define SHIFT (8*(sizeof(short int)-sizeof(char)))
+#define M_COLDATA static_cast<wxColourRefData*>(m_refData)

 
 

-IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
+// GDK's values are in 0..65535 range, ours are in 0..255
+#define SHIFT  8

 
 

-wxColour::wxColour(void)
+wxColour::wxColour(const GdkColor& gdkColor)

 {
 {

+    m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue);

 }
 
 }
 

-wxColour::wxColour( char red, char green, char blue )
+wxColour::~wxColour()

 {
 {

-  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 )
+
+bool wxColour::operator == ( const wxColour& col ) const

 {
 {

-  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 ))
-    {
-      wxFAIL_MSG( "wxColour: couldn't find colour" );
-      delete m_refData;
-      m_refData = (wxObjectRefData *) NULL;
-    }
-  }
-}
+    if (m_refData == col.m_refData)
+        return true;

 
 

-wxColour::wxColour( const wxColour& col )
-{ 
-  Ref( col ); 
-}
+    if (!m_refData || !col.m_refData)
+        return false;

 
 

-wxColour::wxColour( const wxColour* col ) 
-{ 
-  if (col) Ref( *col ); 
+    wxColourRefData* refData = M_COLDATA;
+    wxColourRefData* that_refData = static_cast<wxColourRefData*>(col.m_refData);
+    return refData->m_red == that_refData->m_red &&
+           refData->m_green == that_refData->m_green &&
+           refData->m_blue == that_refData->m_blue &&
+           refData->m_alpha == that_refData->m_alpha;

 }
 
 }
 

-wxColour::~wxColour(void)
+void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char blue,
+                        unsigned char alpha)

 {
 {

-}
+    UnRef();

 
 

-wxColour& wxColour::operator = ( const wxColour& col ) 
-{ 
-  if (*this == col) return (*this); 
-  Ref( col ); 
-  return *this; 
+    m_refData = new wxColourRefData(
+        (guint16(red) << SHIFT) + red,
+        (guint16(green) << SHIFT) + green,
+        (guint16(blue) << SHIFT) + blue,
+        alpha);

 }
 
 }
 

-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; 
-}
-
-bool wxColour::operator == ( const wxColour& col ) 
-{ 
-  return m_refData == col.m_refData; 
-}
+unsigned char wxColour::Red() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );

 
 

-bool wxColour::operator != ( const wxColour& col) 
-{ 
-  return m_refData != col.m_refData; 
+    return wxByte(M_COLDATA->m_red >> SHIFT);

 }
 
 }
 

-void wxColour::Set( const unsigned char red, const unsigned char green, const unsigned char blue )
+unsigned char wxColour::Green() const

 {
 {

-  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;
-}
+    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );

 
 

-unsigned char wxColour::Red(void) const
-{
-  if (!Ok())
-  {
-     wxFAIL_MSG( "invalid colour" );
-     return 0;
-  }
-  
-  return (unsigned char)(M_COLDATA->m_color.red >> SHIFT);
+    return wxByte(M_COLDATA->m_green >> SHIFT);

 }
 
 }
 

-unsigned char wxColour::Green(void) const
+unsigned char wxColour::Blue() const

 {
 {

-  if (!Ok())
-  {
-     wxFAIL_MSG( "invalid colour" );
-     return 0;
-  }
-  
-  return (unsigned char)(M_COLDATA->m_color.green >> SHIFT);
-}
+    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );

 
 

-unsigned char wxColour::Blue(void) const
-{
-  if (!Ok())
-  {
-     wxFAIL_MSG( "invalid colour" );
-     return 0;
-  }
-  
-  return (unsigned char)(M_COLDATA->m_color.blue >> SHIFT);
+    return wxByte(M_COLDATA->m_blue >> SHIFT);

 }
 
 }
 

-bool wxColour::Ok(void) const
+unsigned char wxColour::Alpha() const

 {
 {

-  return (m_refData != NULL);
+    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+
+    return M_COLDATA->m_alpha;

 }
 
 void wxColour::CalcPixel( GdkColormap *cmap )
 {
 }
 
 void wxColour::CalcPixel( GdkColormap *cmap )
 {

-  if (!Ok()) return;
-  
-  if ((M_COLDATA->m_hasPixel) && (M_COLDATA->m_colormap == cmap)) return;
-  M_COLDATA->FreeColour();
-  
-#ifdef wxUSE_GDK_IMLIB
-
-  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 );
-
-#else
-
-  M_COLDATA->m_hasPixel = gdk_color_alloc( cmap, &M_COLDATA->m_color );
-  
-#endif
-  
-  M_COLDATA->m_colormap = cmap;
+    if (!Ok()) return;
+
+    M_COLDATA->AllocColour( 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)
+const GdkColor *wxColour::GetColor() const

 {
 {

-  if (!Ok()) return (GdkColor *) NULL;
-  
-  return &M_COLDATA->m_color;
+    wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") );
+
+    return &M_COLDATA->m_color;

 }
 
 }
 

+bool wxColour::FromString(const wxString& str)
+{
+    GdkColor colGDK;
+    if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) )
+    {
+        *this = wxColour(colGDK);
+        return true;
+    }

 
 

+    return wxColourBase::FromString(str);
+}