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
This commit is contained in:
parent
207bc66c38
commit
c58ae5f298
@ -36,6 +36,9 @@ public:
|
|||||||
{ InitFromName(colourName); }
|
{ InitFromName(colourName); }
|
||||||
wxColour( const char *colourName )
|
wxColour( const char *colourName )
|
||||||
{ InitFromName(wxString::FromAscii(colourName)); }
|
{ InitFromName(wxString::FromAscii(colourName)); }
|
||||||
|
#if wxUSE_UNICODE
|
||||||
|
wxColour( const wxChar *colourName ) { InitFromName( wxString(colourName) ); }
|
||||||
|
#endif
|
||||||
|
|
||||||
// copy ctors and assignment operators
|
// copy ctors and assignment operators
|
||||||
wxColour( const wxColour& col );
|
wxColour( const wxColour& col );
|
||||||
|
Loading…
Reference in New Issue
Block a user