X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3cd0b8c5b5a320bba065c4da306be3687d144157..138618acb91e2a879a735c5806f9f728220f14df:/include/wx/x11/colour.h diff --git a/include/wx/x11/colour.h b/include/wx/x11/colour.h index 884b849c57..9002149bda 100644 --- a/include/wx/x11/colour.h +++ b/include/wx/x11/colour.h @@ -48,7 +48,10 @@ public: // Implicit conversion from the colour name wxColour( const wxString &colourName ) { InitFromName(colourName); } - wxColour( const char *colourName ) { InitFromName(colourName); } + wxColour( const char *colourName ) { InitFromName( wxString::FromAscii(colourName) ); } +#if wxUSE_UNICODE + wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); } +#endif wxColour( const wxColour& col ) { Ref(col); } wxColour& operator = ( const wxColour& col ) { Ref(col); return *this; } @@ -94,4 +97,5 @@ private: #endif -// _WX_COLOUR_H_ \ No newline at end of file +// _WX_COLOUR_H_ +