X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7760051f27b3f96f5dccd07c3509d27abefb0bc9..2562c82329113d43b0de122c86ac23f0dca0e669:/src/x11/colour.cpp diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp index ba921cda9d..6000924c83 100644 --- a/src/x11/colour.cpp +++ b/src/x11/colour.cpp @@ -14,8 +14,10 @@ #include "wx/colour.h" -#include "wx/gdicmn.h" -#include "wx/app.h" +#ifndef WX_PRECOMP + #include "wx/app.h" + #include "wx/gdicmn.h" +#endif #include "wx/x11/private.h" @@ -43,7 +45,7 @@ public: m_hasPixel = data.m_hasPixel; } - ~wxColourRefData() + virtual ~wxColourRefData() { FreeColour(); } @@ -170,7 +172,8 @@ wxObjectRefData *wxColour::CloneRefData(const wxObjectRefData *data) const return new wxColourRefData(*(wxColourRefData *)data); } -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 WXUNUSED(alpha)) { AllocExclusive();