X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8f884a0dccd6b642f35c441ac9bfc87a6d5b4d35..4254f672164bdc7e171c33a5663facbe6afa0833:/src/x11/colour.cpp diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp index df120d904b..671c3b010f 100644 --- a/src/x11/colour.cpp +++ b/src/x11/colour.cpp @@ -34,7 +34,7 @@ public: m_color.green = 0; m_color.blue = 0; m_color.pixel = 0; - m_colormap = (WXColormap *) NULL; + m_colormap = NULL; m_hasPixel = false; } @@ -141,8 +141,6 @@ void wxColourRefData::AllocColour( WXColormap cmap ) #define SHIFT (8*(sizeof(short int)-sizeof(char))) -IMPLEMENT_DYNAMIC_CLASS(wxColour,wxGDIObject) - wxColour::~wxColour() { } @@ -240,7 +238,7 @@ unsigned long wxColour::GetPixel() const WXColor *wxColour::GetColor() const { - wxCHECK_MSG( Ok(), (WXColor *) NULL, wxT("invalid colour") ); + wxCHECK_MSG( Ok(), NULL, wxT("invalid colour") ); return (WXColor*) &M_COLDATA->m_color; }