From: Ryan Norton <wxprojects@comcast.net> Date: Thu, 7 Oct 2004 17:45:04 +0000 (+0000) Subject: fix a bunch of warnings in unicode build X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/c58ae5f298f4f052e22bf544d1249cf9572770f8 fix a bunch of warnings in unicode build git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29705 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/cocoa/colour.h b/include/wx/cocoa/colour.h index 3b1fe9706a..8d8671f060 100644 --- a/include/wx/cocoa/colour.h +++ b/include/wx/cocoa/colour.h @@ -36,6 +36,9 @@ public: { InitFromName(colourName); } wxColour( const char *colourName ) { InitFromName(wxString::FromAscii(colourName)); } +#if wxUSE_UNICODE + wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); } +#endif // copy ctors and assignment operators wxColour( const wxColour& col );