X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/aea95b1c3a8ae221cc3aade5ce49a3cf848fd56a..99d21c0e1f8d87570702c52dccd3ad698f0a0931:/src/x11/colour.cpp?ds=sidebyside diff --git a/src/x11/colour.cpp b/src/x11/colour.cpp index 6000924c83..26dfeded95 100644 --- a/src/x11/colour.cpp +++ b/src/x11/colour.cpp @@ -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();