X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/670f9935630beb2123a5ca62894ae92a3f0efa4f..950905affdfa9041316f82308e1a11e82c783070:/src/x11/colour.cpp diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp index 32d69c30a0..26dfeded95 100644 --- a/src/x11/colour.cpp +++ b/src/x11/colour.cpp @@ -16,10 +16,9 @@ #ifndef WX_PRECOMP #include "wx/app.h" + #include "wx/gdicmn.h" #endif -#include "wx/gdicmn.h" - #include "wx/x11/private.h" //----------------------------------------------------------------------------- @@ -46,7 +45,7 @@ public: m_hasPixel = data.m_hasPixel; } - ~wxColourRefData() + virtual ~wxColourRefData() { FreeColour(); } @@ -173,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(); @@ -245,12 +245,12 @@ WXColor *wxColour::GetColor() const return (WXColor*) &M_COLDATA->m_color; } -bool wxColour::FromString(const wxChar *name) +bool wxColour::FromString(const wxString& name) { Display *dpy = wxGlobalDisplay(); WXColormap colormap = wxTheApp->GetMainColormap( dpy ); XColor xcol; - if ( XParseColor( dpy, (Colormap)colormap, name , &xcol ) ) + if ( XParseColor( dpy, (Colormap)colormap, name.mbc_str(), &xcol ) ) { UnRef();