X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3bbc1d95a1186dffdc1229299c9aaf8bdf57ebe9..46405e36bf9962b251e77e5048e96bf6a54edb15:/src/gtk/colour.cpp diff --git a/src/gtk/colour.cpp b/src/gtk/colour.cpp index 484ba9bbd6..6a226d4d0b 100644 --- a/src/gtk/colour.cpp +++ b/src/gtk/colour.cpp @@ -52,7 +52,7 @@ public: guint16 m_blue; wxByte m_alpha; - DECLARE_NO_COPY_CLASS(wxColourRefData) + wxDECLARE_NO_COPY_CLASS(wxColourRefData); }; void wxColourRefData::FreeColour() @@ -83,7 +83,7 @@ void wxColourRefData::AllocColour( GdkColormap *cmap ) //----------------------------------------------------------------------------- -#define M_COLDATA wx_static_cast(wxColourRefData*, m_refData) +#define M_COLDATA static_cast(m_refData) // GDK's values are in 0..65535 range, ours are in 0..255 #define SHIFT 8 @@ -108,7 +108,7 @@ 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(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 &&