wxOSX/Carbon compilation fix after the changes of r72207.

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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index af912732579e32b16a574aba12d0ecba3bd349ed..a0e20540e44fe257994dc9e3a125a01c67261e7a 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -12,18 +12,49 @@
 
 #include "wx/colour.h"
 
 
 #include "wx/colour.h"
 

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

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

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

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

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

 {
 public:
 {
 public:

-    wxColourRefData(guint16 red, guint16 green, guint16 blue)
+#ifdef __WXGTK3__
+    wxColourRefData(const GdkRGBA& gdkRGBA)
+        : m_gdkRGBA(gdkRGBA)
+    {
+        m_gdkColor.red = guint16(gdkRGBA.red * 65535);
+        m_gdkColor.green = guint16(gdkRGBA.green * 65535);
+        m_gdkColor.blue = guint16(gdkRGBA.blue * 65535);
+        m_alpha = wxByte(gdkRGBA.alpha * 255 + 0.5);
+    }
+    wxColourRefData(const GdkColor& gdkColor)
+        : m_gdkColor(gdkColor)
+    {
+        m_gdkRGBA.red = gdkColor.red / 65535.0;
+        m_gdkRGBA.green = gdkColor.green / 65535.0;
+        m_gdkRGBA.blue = gdkColor.blue / 65535.0;
+        m_gdkRGBA.alpha = 1;
+        m_alpha = 255;
+    }
+    wxColourRefData(guchar red, guchar green, guchar blue, guchar alpha)
+    {
+        m_gdkRGBA.red = red / 255.0;
+        m_gdkRGBA.green = green / 255.0;
+        m_gdkRGBA.blue = blue / 255.0;
+        m_gdkRGBA.alpha = alpha / 255.0;
+        m_gdkColor.red = (guint16(red) << 8) + red;
+        m_gdkColor.green = (guint16(green) << 8) + green;
+        m_gdkColor.blue = (guint16(blue) << 8) + blue;
+        m_alpha = alpha;
+    }
+    GdkRGBA m_gdkRGBA;
+    GdkColor m_gdkColor;
+#else
+    wxColourRefData(guint16 red, guint16 green, guint16 blue, wxByte alpha = 0xff)

     {
         m_color.red =
         m_red = red;
     {
         m_color.red =
         m_red = red;


@@ -31,6 +62,7 @@ public:
         m_green = green;
         m_color.blue =
         m_blue = blue;
         m_green = green;
         m_color.blue =
         m_blue = blue;

+        m_alpha = alpha;

         m_color.pixel = 0;
         m_colormap = NULL;
     }
         m_color.pixel = 0;
         m_colormap = NULL;
     }


@@ -49,10 +81,13 @@ public:
     guint16 m_red;
     guint16 m_green;
     guint16 m_blue;
     guint16 m_red;
     guint16 m_green;
     guint16 m_blue;

+#endif
+    wxByte m_alpha;

 
 

-    DECLARE_NO_COPY_CLASS(wxColourRefData)
+    wxDECLARE_NO_COPY_CLASS(wxColourRefData);

 };
 
 };
 

+#ifndef __WXGTK3__

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


@@ -78,20 +113,31 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
         }
     }
 }
         }
     }
 }

+#endif

 
 //-----------------------------------------------------------------------------
 
 
 //-----------------------------------------------------------------------------
 

-#define M_COLDATA wx_static_cast(wxColourRefData*, m_refData)
+#define M_COLDATA static_cast<wxColourRefData*>(m_refData)

 
 // GDK's values are in 0..65535 range, ours are in 0..255
 #define SHIFT  8
 
 
 // GDK's values are in 0..65535 range, ours are in 0..255
 #define SHIFT  8
 

-IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject)
+#ifdef __WXGTK3__
+wxColour::wxColour(const GdkRGBA& gdkRGBA)
+{
+    m_refData = new wxColourRefData(gdkRGBA);
+}

 
 

+wxColour::wxColour(const GdkColor& gdkColor)
+{
+    m_refData = new wxColourRefData(gdkColor);
+}
+#else

 wxColour::wxColour(const GdkColor& gdkColor)
 {
     m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue);
 }
 wxColour::wxColour(const GdkColor& gdkColor)
 {
     m_refData = new wxColourRefData(gdkColor.red, gdkColor.green, gdkColor.blue);
 }

+#endif

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


@@ -106,76 +152,129 @@ bool wxColour::operator == ( const wxColour& col ) const
         return false;
 
     wxColourRefData* refData = M_COLDATA;
         return false;
 
     wxColourRefData* refData = M_COLDATA;

-    wxColourRefData* that_refData = wx_static_cast(wxColourRefData*, col.m_refData);
+    wxColourRefData* that_refData = static_cast<wxColourRefData*>(col.m_refData);
+#ifdef __WXGTK3__
+    return refData->m_gdkColor.red == that_refData->m_gdkColor.red &&
+           refData->m_gdkColor.green == that_refData->m_gdkColor.green &&
+           refData->m_gdkColor.blue == that_refData->m_gdkColor.blue &&
+#else

     return refData->m_red == that_refData->m_red &&
            refData->m_green == that_refData->m_green &&
     return refData->m_red == that_refData->m_red &&
            refData->m_green == that_refData->m_green &&

-           refData->m_blue == that_refData->m_blue;
+           refData->m_blue == that_refData->m_blue &&
+#endif
+           refData->m_alpha == that_refData->m_alpha;

 }
 
 }
 

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

 {
     UnRef();
 
 {
     UnRef();
 

+#ifdef __WXGTK3__
+    m_refData = new wxColourRefData(red, green, blue, alpha);
+#else

     m_refData = new wxColourRefData(
         (guint16(red) << SHIFT) + red,
         (guint16(green) << SHIFT) + green,
     m_refData = new wxColourRefData(
         (guint16(red) << SHIFT) + red,
         (guint16(green) << SHIFT) + green,

-        (guint16(blue) << SHIFT) + blue);
+        (guint16(blue) << SHIFT) + blue,
+        alpha);
+#endif

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

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

 
 

+#ifdef __WXGTK3__
+    return wxByte(M_COLDATA->m_gdkColor.red >> 8);
+#else

     return wxByte(M_COLDATA->m_red >> SHIFT);
     return wxByte(M_COLDATA->m_red >> SHIFT);

+#endif

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

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

 
 

+#ifdef __WXGTK3__
+    return wxByte(M_COLDATA->m_gdkColor.green >> 8);
+#else

     return wxByte(M_COLDATA->m_green >> SHIFT);
     return wxByte(M_COLDATA->m_green >> SHIFT);

+#endif

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

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

 
 

+#ifdef __WXGTK3__
+    return wxByte(M_COLDATA->m_gdkColor.blue >> 8);
+#else

     return wxByte(M_COLDATA->m_blue >> SHIFT);
     return wxByte(M_COLDATA->m_blue >> SHIFT);

+#endif
+}
+
+unsigned char wxColour::Alpha() const
+{
+    wxCHECK_MSG( IsOk(), 0, wxT("invalid colour") );
+
+    return M_COLDATA->m_alpha;

 }
 
 }
 

+#ifndef __WXGTK3__

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

-    if (!Ok()) return;
+    if (!IsOk()) return;

 
     M_COLDATA->AllocColour( cmap );
 }
 
 int wxColour::GetPixel() const
 {
 
     M_COLDATA->AllocColour( cmap );
 }
 
 int wxColour::GetPixel() const
 {

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

 
     return M_COLDATA->m_color.pixel;
 }
 
     return M_COLDATA->m_color.pixel;
 }

+#endif

 
 

-#ifdef __WXGTK24__

 const GdkColor *wxColour::GetColor() const
 const GdkColor *wxColour::GetColor() const

-#else
-      GdkColor *wxColour::GetColor() const
-#endif

 {
 {

-    wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") );
+    wxCHECK_MSG( IsOk(), NULL, wxT("invalid colour") );

 
 

+#ifdef __WXGTK3__
+    return &M_COLDATA->m_gdkColor;
+#else

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

+#endif
+}
+
+#ifdef __WXGTK3__
+wxColour::operator const GdkRGBA*() const
+{
+    const GdkRGBA* c = NULL;
+    if (IsOk())
+        c = &M_COLDATA->m_gdkRGBA;
+    return c;

 }
 }

+#endif

 
 

-bool wxColour::FromString(const wxChar *str)
+bool wxColour::FromString(const wxString& str)

 {
 {

+#ifdef __WXGTK3__
+    GdkRGBA gdkRGBA;
+    if (gdk_rgba_parse(&gdkRGBA, wxGTK_CONV_SYS(str)))
+    {
+        *this = wxColour(gdkRGBA);
+        return true;
+    }
+#else

     GdkColor colGDK;
     if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) )
     {
         *this = wxColour(colGDK);
         return true;
     }
     GdkColor colGDK;
     if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) )
     {
         *this = wxColour(colGDK);
         return true;
     }

+#endif

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