]> git.saurik.com Git - wxWidgets.git/commitdiff
restored wxColour ctor taking C string (now in both char* and wchar_t* versions)...
authorVáclav Slavík <vslavik@fastmail.fm>
Wed, 30 May 2007 11:57:40 +0000 (11:57 +0000)
committerVáclav Slavík <vslavik@fastmail.fm>
Wed, 30 May 2007 11:57:40 +0000 (11:57 +0000)
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@46241 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

include/wx/colour.h

index b66b9b3608a2185198424a5dbae3fdd72febbde2..14020d84f345033a2e3eb35ad788dd1a7f02724f 100644 (file)
@@ -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)