Add wxDataViewCtrl::ExpandAncestors() and call it from both EnsureVisible() and Select()

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

diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp
index e09ef66effa636aae85e286748284c3e98149736..ff2b953c97ce14b07ddba8b44d25100162b393e4 100644 (file)
--- a/src/gtk/colour.cpp
+++ b/src/gtk/colour.cpp
@@ -20,10 +20,10 @@
 // wxColour
 //-----------------------------------------------------------------------------
 
-class wxColourRefData: public wxObjectRefData
+class wxColourRefData : public wxGDIRefData
 {
 public:
-    wxColourRefData(guint16 red, guint16 green, guint16 blue)
+    wxColourRefData(guint16 red, guint16 green, guint16 blue, wxByte alpha = 0xff)
     {
         m_color.red =
         m_red = red;
@@ -31,6 +31,7 @@ public:
         m_green = green;
         m_color.blue =
         m_blue = blue;
+        m_alpha = alpha;
         m_color.pixel = 0;
         m_colormap = NULL;
     }
@@ -49,6 +50,7 @@ public:
     guint16 m_red;
     guint16 m_green;
     guint16 m_blue;
+    wxByte m_alpha;
 
     DECLARE_NO_COPY_CLASS(wxColourRefData)
 };
@@ -81,7 +83,7 @@ void wxColourRefData::AllocColour( GdkColormap *cmap )
 
 //-----------------------------------------------------------------------------
 
-#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
@@ -106,21 +108,23 @@ bool wxColour::operator == ( const wxColour& col ) const
         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);
     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 &&
+           refData->m_alpha == that_refData->m_alpha;
 }
 
 void wxColour::InitRGBA(unsigned char red, unsigned char green, unsigned char blue,
-                        unsigned char WXUNUSED(alpha))
+                        unsigned char alpha)
 {
     UnRef();
 
     m_refData = new wxColourRefData(
         (guint16(red) << SHIFT) + red,
         (guint16(green) << SHIFT) + green,
-        (guint16(blue) << SHIFT) + blue);
+        (guint16(blue) << SHIFT) + blue,
+        alpha);
 }
 
 unsigned char wxColour::Red() const
@@ -144,6 +148,13 @@ unsigned char wxColour::Blue() const
     return wxByte(M_COLDATA->m_blue >> SHIFT);
 }
 
+unsigned char wxColour::Alpha() const
+{
+    wxCHECK_MSG( Ok(), 0, wxT("invalid colour") );
+
+    return M_COLDATA->m_alpha;
+}
+
 void wxColour::CalcPixel( GdkColormap *cmap )
 {
     if (!Ok()) return;
@@ -158,18 +169,14 @@ int wxColour::GetPixel() const
     return M_COLDATA->m_color.pixel;
 }
 
-#ifdef __WXGTK24__
 const GdkColor *wxColour::GetColor() const
-#else
-      GdkColor *wxColour::GetColor() const
-#endif
 {
     wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") );
 
     return &M_COLDATA->m_color;
 }
 
-bool wxColour::FromString(const wxChar *str)
+bool wxColour::FromString(const wxString& str)
 {
     GdkColor colGDK;
     if ( gdk_color_parse( wxGTK_CONV_SYS( str ), &colGDK ) )