X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..bb5b7285057aa71bd9d86aad6effb00dbfcd1f85:/src/x11/colour.cpp

diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp
index 84a183959b..2890656e0e 100644
--- a/src/x11/colour.cpp
+++ b/src/x11/colour.cpp
@@ -172,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();
 
@@ -249,7 +250,7 @@ bool wxColour::FromString(const wxChar *name)
     Display *dpy = wxGlobalDisplay();
     WXColormap colormap = wxTheApp->GetMainColormap( dpy );
     XColor xcol;
-    if ( XParseColor( dpy, (Colormap)colormap, name , &xcol ) )
+    if ( XParseColor( dpy, (Colormap)colormap, wxConvertWX2MB(name), &xcol ) )
     {
         UnRef();