From ccfc71271d9110a3f9ff68232b0536624efaeccc Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Wed, 30 May 2007 11:57:40 +0000 Subject: [PATCH] restored wxColour ctor taking C string (now in both char* and wchar_t* versions): it is needed e.g. when doing wxPen("blue",1,wxSOLID) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/colour.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/include/wx/colour.h b/include/wx/colour.h index b66b9b3608..14020d84f3 100644 --- a/include/wx/colour.h +++ b/include/wx/colour.h @@ -27,7 +27,9 @@ class WXDLLEXPORT wxColour; ChannelType alpha = wxALPHA_OPAQUE ) \ { Set(red, green, blue, alpha); } \ wxColour( unsigned long colRGB ) { Set(colRGB); } \ - wxColour(const wxString& colourName) { Set(colourName); } + wxColour(const wxString& colourName) { Set(colourName); } \ + wxColour(const char *colourName) { Set(colourName); } \ + wxColour(const wchar_t *colourName) { Set(colourName); } // flags for wxColour -> wxString conversion (see wxColour::GetAsString) -- 2.49.0