From: Václav Slavík <vslavik@fastmail.fm>
Date: Wed, 30 May 2007 11:57:40 +0000 (+0000)
Subject: restored wxColour ctor taking C string (now in both char* and wchar_t* versions)... 
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/ccfc71271d9110a3f9ff68232b0536624efaeccc

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
---

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)