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
This commit is contained in:
parent
c7cf729fe4
commit
ccfc71271d
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user